diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-05 00:02:56 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-05 00:02:56 +0000 |
commit | 0c98bf3e85e5aa8137d9a7ae40468a3db53f0cdd (patch) | |
tree | 20ba2747ee022ad1afd33ec39052d4f9f8b54b42 /pkgs/applications | |
parent | ccb3146bf27b954399648f7d12c3af8efeab1f13 (diff) | |
parent | 817103a9a31549202114a542a6a626cc058dc407 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications')
8 files changed, 93 insertions, 13 deletions
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 263c0428ff149..72f2dd526867b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4665,6 +4665,43 @@ final: prev: meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; + mason-lspconfig-nvim = buildVimPluginFrom2Nix { + pname = "mason-lspconfig.nvim"; + version = "2022-07-25"; + src = fetchFromGitHub { + owner = "williamboman"; + repo = "mason-lspconfig.nvim"; + rev = "ad3b109cff22af979ab3d15564cd63dc3ae2f0f0"; + sha256 = "0jvnc9zlr5cazdrhjm1v0bjkrz5lb2z8dzlkq59b433f52qv9zrf"; + }; + meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; + }; + + mason-tool-installer-nvim = buildVimPluginFrom2Nix { + pname = "mason-tool-installer.nvim"; + version = "2022-07-26"; + src = fetchFromGitHub { + owner = "WhoIsSethDaniel"; + repo = "mason-tool-installer.nvim"; + rev = "6d9276655c09ef2358ddb105cac4a34cfa8853c0"; + sha256 = "0j5k9fhjffkx3b5asnwxzj22fvncs69vs0rkx13ii3gdvwczbc5w"; + }; + meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; + }; + + + mason-nvim = buildVimPluginFrom2Nix { + pname = "mason.nvim"; + version = "2022-07-27"; + src = fetchFromGitHub { + owner = "williamboman"; + repo = "mason.nvim"; + rev = "269ee222f76e705619da2c0130c0a06e76419b88"; + sha256 = "1bngr68gfv33p989dqhz6xmhips7i2yjni96qgnqwhdjczfw865v"; + }; + meta.homepage = "https://github.com/williamboman/mason.nvim/"; + }; + matchit-zip = buildVimPluginFrom2Nix { pname = "matchit.zip"; version = "2010-10-18"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e94ac82659d78..8d5f6bcd27d34 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -598,6 +598,14 @@ self: super: { ''; }); + mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs (old: { + dependencies = with self; [ mason-nvim nvim-lspconfig ]; + }); + + mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs (old: { + dependencies = with self; [ mason-nvim ]; + }); + meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index f729c240f5df7..4cfe4228ea9fd 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -391,6 +391,9 @@ https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, https://github.com/iamcco/markdown-preview.nvim/,, https://github.com/chentoast/marks.nvim/,, +https://github.com/williamboman/mason-lspconfig.nvim/,HEAD, +https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD, +https://github.com/williamboman/mason.nvim/,HEAD, https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, https://github.com/kaicataldo/material.vim/,HEAD, diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index 5ac3e9938fc3e..a40b253d4ba09 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "limesctl"; - version = "3.1.1"; + version = "3.1.3"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/CYZMuW5/YoZszTOaQZLRhJdZAGGMY+s7vMK01hyMvg="; + sha256 = "sha256-fi36jsQr/Mn1FyOlle/WSpREQgZU6+h4IJzd3ZfItvI="; }; - vendorSha256 = "sha256-BwhbvCUOOp5ZeY/22kIZ58e+iPH0pVgiNOyoD6O2zPo="; + vendorSha256 = "sha256-gcIPASIk4Zq8y+KppYNRkf/9guCsYv9XskFANrqOCts="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 74942ffd03f34..daf40e3aadfdb 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "109.0.5414.61", - "sha256": "1dk832ishjhba0rnf57w7vqrr8dyqga6zsgw9945i7zz997fpjyi", - "sha256bin64": "1s1d7h9ygzpa5b39pdivn5vvpm7fpnhw5p3lz8blrgn61m8h6jg6", + "version": "109.0.5414.74", + "sha256": "0pcfaj3n3rjk4va9g0ajlsv1719kdhqcnjdd4piinqxb4qy27vgd", + "sha256bin64": "1ihjjf8x5080p9bizhqrrr0rcjf0l1nps9xq9naa2f48y5zfshkd", "deps": { "gn": { "version": "2022-11-10", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index fe105fa3b71ab..4865ca4901cb8 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,8 +168,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.3.6"; - sha256 = "sha256-aETsvcHoHSwqWCAdn9JPJLcX1Wi1umUghSjkq37OYDU="; + version = "1.3.7"; + sha256 = "sha256-z49DXJ9oYObJQWHPeuKvQ6jJtAheYuy0+QmvZ74ZbTQ"; vendorSha256 = "sha256-fviukVGBkbxFs2fJpEp/tFMymXex7NRQdcGIIA9W88k="; patches = [ ./provider-path-0_15.patch ]; passthru = { diff --git a/pkgs/applications/networking/instant-messengers/keet/default.nix b/pkgs/applications/networking/instant-messengers/keet/default.nix new file mode 100644 index 0000000000000..557078cd8b508 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/keet/default.nix @@ -0,0 +1,32 @@ +{ lib, appimageTools, fetchurl }: + +let + pname = "keet"; + version = "1.2.1"; + + src = fetchurl { + url = "https://keet.io/downloads/${version}/Keet.AppImage"; + sha256 = "1f76ccfa16719a24f6d84b88e5ca49fab1c372de309ce74393461903c5c49d98"; + }; + + appimageContents = appimageTools.extract { inherit pname version src; }; +in appimageTools.wrapType2 { + inherit src pname version; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Peer-to-Peer Chat"; + homepage = "https://keet.io"; + license = licenses.unfree; + maintainers = with maintainers; [ extends ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index cf23d22087396..3757d57df8160 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.34"; + version = "3.38"; src = fetchFromGitHub { - owner = "chrislusf"; + owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-lOCZHkLJCDvaT3CcHUBbsybdy0H6BfKKGpd/73cxcWA="; + hash = "sha256-LYMGkv1rgUtA/TwulBhgw0w+8kbICtEgr7/K6exalxM="; }; - vendorHash = "sha256-1RUWONkXArXYg8gQogKUhMSGdIYyT3lq5qWuUQBsFig="; + vendorHash = "sha256-mwfs/tdq1Qq2auEwz24emf7pjpIJAncI78oxhAn2WkI="; subPackages = [ "weed" ]; @@ -49,7 +49,7 @@ buildGoModule rec { meta = with lib; { description = "Simple and highly scalable distributed file system"; homepage = "https://github.com/chrislusf/seaweedfs"; - maintainers = with maintainers; [ azahi cmacrae ]; + maintainers = with maintainers; [ azahi cmacrae wozeparrot ]; mainProgram = "weed"; license = licenses.asl20; }; |