From 6c9bab335be919007250465efe81096e65143b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 1 Nov 2022 10:18:25 +0100 Subject: [PATCH 01/29] knot-dns: 3.2.1 -> 3.2.2 https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.2.2 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 286d2f2e93e0..8b0c066548f7 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "51efa36f92679b25d43dbf8ba543e9f26138559f0fa1ba5fae172f5400659c8f"; + sha256 = "cea9c1988cdce7752f88fbe37378f65e83c4e54048978b94fb21a9c92f88788f"; }; outputs = [ "bin" "out" "dev" ]; From 4d895fe6a2fd370298f7a48bb64b3bdcda65fcc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 1 Nov 2022 10:38:59 +0100 Subject: [PATCH 02/29] ngtcp2-gnutls: 0.9.0 -> 0.10.0 https://github.com/ngtcp2/ngtcp2/releases/tag/v0.10.0 Due to a minor incompatibility, this bump needs to be done together with the knot-dns bump, again. --- pkgs/development/libraries/ngtcp2/gnutls.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index ed0e3c9dfa12..6d623a308f0c 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - sha256 = "sha256-nfXEX1GxtmOcb0reRyO0OyQkSHeUWtQW+SZ8thxor+s="; + sha256 = "sha256-zDiJlwcDTLCU+WpJ6Jz6tve4oV+XMRYOtppC2fj/HgU="; }; outputs = [ "out" "dev" ]; From 1a2af00ada115a400d2ab243f069628b1973f0a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 14:05:50 +0000 Subject: [PATCH 03/29] bisq-desktop: 1.9.5 -> 1.9.6 --- pkgs/applications/blockchains/bisq-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 9ac34e61b238..05542ef4c24e 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -34,11 +34,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "1jmhngxyn2yf7k1dn98yr9d20jlvkmskbpzz5kbzci36v2wfmjrp"; + sha256 = "02j6n693lhfn9x8kaz253xm76zzsdz8h10rkyxnlqiwwbn1wnmsa"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ]; From c5837156f22137e122b7e3909bc9e52378fc0419 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 17:52:05 +0000 Subject: [PATCH 04/29] dehydrated: 0.7.0 -> 0.7.1 --- pkgs/tools/admin/dehydrated/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix index eda7b7ace5fb..e53141be7014 100644 --- a/pkgs/tools/admin/dehydrated/default.nix +++ b/pkgs/tools/admin/dehydrated/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub, installShellFiles }: stdenv.mkDerivation rec { pname = "dehydrated"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "lukas2511"; repo = "dehydrated"; rev = "v${version}"; - sha256 = "09jhmkjvnj98zbf92qwdr5rr7pc6v63xzyk2fbi177r7szb2yg09"; + sha256 = "sha256-K08eeruyT5vKzK3PzfCkubZiHbf9Yq7wzD1z69MeDtY="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From f75ed7fcef151ed01868472215799a551816451e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Nov 2022 18:43:56 +0000 Subject: [PATCH 05/29] element: 1.0.0 -> 1.0.1 --- pkgs/applications/science/chemistry/element/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/chemistry/element/default.nix b/pkgs/applications/science/chemistry/element/default.nix index 812272e2fb9b..c9c609f4b8f2 100644 --- a/pkgs/applications/science/chemistry/element/default.nix +++ b/pkgs/applications/science/chemistry/element/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "element"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = pname; rev = "v${version}"; - sha256 = "gjdcNvYNnxb6hOE/MQjTezZeYGBWTr4E8/Pt8YQv3lY="; + sha256 = "sha256-06RDZnie0Lv7i95AwnBGl6PPucuj8pIT6DHW3e3mu1o="; }; - vendorSha256 = "A4g2rQTaYrA4/0rqldUv7iuibzNINEvx9StUnaN2/Yg="; + vendorSha256 = "sha256-A4g2rQTaYrA4/0rqldUv7iuibzNINEvx9StUnaN2/Yg="; meta = with lib; { description = "The periodic table on the command line"; From 5e30a15bf0f1bf71460c7b2a11c02c540e27ef26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 06:16:23 +0000 Subject: [PATCH 06/29] rpcs3: 0.0.24-14337-5210df688 -> 0.0.25-14358-a00f9e421 --- pkgs/applications/emulators/rpcs3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index f1432d8db558..b88e5f264729 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14337-5210df688"; - rpcs3Version = "0.0.24-14337-5210df688"; - rpcs3Revision = "5210df688262ec7fd8c21230d30e568d98724c8f"; - rpcs3Sha256 = "1m0j53xl6g01s27bi2p9j23m724gq7a3hss7kqhc239a5m9akqdg"; + rpcs3GitVersion = "14358-a00f9e421"; + rpcs3Version = "0.0.25-14358-a00f9e421"; + rpcs3Revision = "a00f9e42115527aa9654870f194cf2c64329f2ef"; + rpcs3Sha256 = "0avajihbs02nbfqs4kzgckl0v2z4z8h8fgcjs5m4zxvkgj5701nv"; ittapi = fetchFromGitHub { owner = "intel"; From c58d913bcea18c413f39b879e3f8d1798f728bdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 09:18:34 +0000 Subject: [PATCH 07/29] ooniprobe-cli: 3.16.4 -> 3.16.5 --- pkgs/tools/networking/ooniprobe-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index 4fc33f8e03d1..615989399f20 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.16.4"; + version = "3.16.5"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-DXqHJCzRYRiFgDa/OTBxWoWzz8uAZAwE1xCwIm30VDM="; + hash = "sha256-53TFXrzeyEcd8WV7hdb+2VXlN2Iogw3bdCiejRIs8Yw="; }; vendorSha256 = "sha256-eH+PfclxqgffM/pzIkdl7x+6Ie6UPyUpWkJ7+G5eN/E="; From 3cb7318edf19bbe1b2b8cca5108249ecf50b32f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 10:41:46 +0000 Subject: [PATCH 08/29] yamlpath: 3.6.7 -> 3.6.8 --- pkgs/development/tools/yamlpath/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yamlpath/default.nix b/pkgs/development/tools/yamlpath/default.nix index 1197f7ce5c3e..60cb97511bbf 100644 --- a/pkgs/development/tools/yamlpath/default.nix +++ b/pkgs/development/tools/yamlpath/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "yamlpath"; - version = "3.6.7"; + version = "3.6.8"; format = "setuptools"; src = fetchFromGitHub { owner = "wwkimball"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-lz8n3c+NohZnkbAoF/9rHsGzXW5PWPOsJKUFqqenIRg="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-g4Pw0IWLY/9nG2eqbiknWCZjJNGbmV42KEviIENXYYA="; }; propagatedBuildInputs = with python3.pkgs; [ From da44bf129dcfbba27c5d12742db97f7f3ec367fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 11:52:45 +0000 Subject: [PATCH 09/29] babashka: 1.0.164 -> 1.0.165 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 5608cfd6be3b..22ec5806d5be 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.0.164"; + version = "1.0.165"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-ckC6QL8pCnenSWYCBKwEx0JrwOnmWAaQhFvw6qQFCv4="; + sha256 = "sha256-sFLJVNyx0IFfPjxbYzSthRdF77sRHeNGFXHzKH22HfY="; }; executable = "bb"; From b8e37121d4eeb329228d6d52d63ec12fd50b6847 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 2 Nov 2022 17:08:41 +0100 Subject: [PATCH 10/29] python3Packages.asyncpg: disable tests on darwin --- pkgs/development/python-modules/asyncpg/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 0a3ef8f119e0..adefd070f777 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -18,6 +18,9 @@ buildPythonPackage rec { hash = "sha256-d+aEok/uF7o+SHypgtAlntF7rhr2gAb0zyhLI7og6iw="; }; + # sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495 + doCheck = postgresql.doCheck; + checkInputs = [ uvloop postgresql From 09685474e92ceb43110263f1f7fdc3be84fe46e6 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 2 Nov 2022 17:38:11 +0100 Subject: [PATCH 11/29] quictls: only set `enable-ktls` flag on Linux --- pkgs/development/libraries/quictls/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index cd0ae4d3eef4..5676f54d4f35 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -102,7 +102,6 @@ stdenv.mkDerivation rec { "shared" # "shared" builds both shared and static libraries "--libdir=lib" "--openssldir=etc/ssl" - "enable-ktls" ] ++ lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" From 63d966ff8b44e99ae77bb26e75b9401d73c3034e Mon Sep 17 00:00:00 2001 From: "\"Marc Jakobi\"" <"marc.jakobi@tiko.energy"> Date: Fri, 28 Oct 2022 14:08:43 +0200 Subject: [PATCH 12/29] vimPlugins.neotest: init at 2022-10-27 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3282207ad797..444c3d818dab 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5086,6 +5086,18 @@ final: prev: meta.homepage = "https://github.com/kassio/neoterm/"; }; + neotest = buildVimPluginFrom2Nix { + pname = "neotest"; + version = "2022-10-27"; + src = fetchFromGitHub { + owner = "nvim-neotest"; + repo = "neotest"; + rev = "0be9899e859da147ad28c23a30a1df2081c16741"; + sha256 = "08f7d8w82jk5jd2w4wrh8x4gyw0msv7m82cpzd1ahijg917818pd"; + }; + meta.homepage = "https://github.com/nvim-neotest/neotest/"; + }; + neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; version = "2022-10-29"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a923677b7cfe..e75a8560d5a3 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -426,6 +426,7 @@ https://github.com/karb94/neoscroll.nvim/,, https://github.com/Shougo/neosnippet-snippets/,, https://github.com/Shougo/neosnippet.vim/,, https://github.com/kassio/neoterm/,, +https://github.com/nvim-neotest/neotest/,HEAD, https://github.com/MrcJkb/neotest-haskell/,HEAD, https://github.com/rose-pine/neovim/,main,rose-pine https://github.com/Shatur/neovim-ayu/,, From ac4d05daa2bc89291418d5352f35dbfd3df043d1 Mon Sep 17 00:00:00 2001 From: "\"Marc Jakobi\"" <"marc.jakobi@tiko.energy"> Date: Fri, 28 Oct 2022 14:09:00 +0200 Subject: [PATCH 13/29] vimPlugins.material-vim: init at 2022-09-14 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 444c3d818dab..50086a3311ba 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4558,6 +4558,18 @@ final: prev: meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; + material-vim = buildVimPluginFrom2Nix { + pname = "material.vim"; + version = "2022-09-14"; + src = fetchFromGitHub { + owner = "kaicataldo"; + repo = "material.vim"; + rev = "81d5d0bb30677b0846a2721a600f2f45db6d10a7"; + sha256 = "1j23wi0hh5h0pc0rk5dxvsc60k484h5haa2gfxzahjqd7kzil4y8"; + }; + meta.homepage = "https://github.com/kaicataldo/material.vim/"; + }; + mayansmoke = buildVimPluginFrom2Nix { pname = "mayansmoke"; version = "2010-10-18"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e75a8560d5a3..fe2726c29e74 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -381,6 +381,7 @@ https://github.com/iamcco/markdown-preview.nvim/,, https://github.com/chentoast/marks.nvim/,, https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, +https://github.com/kaicataldo/material.vim/,HEAD, https://github.com/vim-scripts/mayansmoke/,, https://github.com/echasnovski/mini.nvim/,, https://github.com/wfxr/minimap.vim/,, From ac9ce9fd81a55794390f0b8f2c49f9ff1c27924a Mon Sep 17 00:00:00 2001 From: "\"Marc Jakobi\"" <"marc.jakobi@tiko.energy"> Date: Fri, 28 Oct 2022 14:09:17 +0200 Subject: [PATCH 14/29] vimPlugins.telescope_hoogle: init at 2022-10-27 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 50086a3311ba..8e759e66e3d6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -7901,6 +7901,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; + telescope_hoogle = buildVimPluginFrom2Nix { + pname = "telescope_hoogle"; + version = "2022-10-27"; + src = fetchFromGitHub { + owner = "luc-tielen"; + repo = "telescope_hoogle"; + rev = "6322f74655a2773974377a8fc8d170c00f24938f"; + sha256 = "1pjq5bwnrxb3qhvvqd9v996hqfkbg5ah7qmbzrq1287h13m5jy2n"; + }; + meta.homepage = "https://github.com/luc-tielen/telescope_hoogle/"; + }; + template-string-nvim = buildVimPluginFrom2Nix { pname = "template-string.nvim"; version = "2022-08-18"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index fe2726c29e74..776e267e1e12 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -662,6 +662,7 @@ https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,, https://github.com/nvim-telescope/telescope-z.nvim/,, https://github.com/jvgrootveld/telescope-zoxide/,, https://github.com/nvim-telescope/telescope.nvim/,, +https://github.com/luc-tielen/telescope_hoogle/,HEAD, https://github.com/axelvc/template-string.nvim/,HEAD, https://github.com/jacoborus/tender.vim/,, https://github.com/wincent/terminus/,, From 050831ed4954a9ed097c337bdda7067ee3feab4b Mon Sep 17 00:00:00 2001 From: "\"Marc Jakobi\"" <"marc.jakobi@tiko.energy"> Date: Fri, 28 Oct 2022 14:09:34 +0200 Subject: [PATCH 15/29] vimPlugins.nvim-luadev: init at 2022-01-26 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8e759e66e3d6..7b4bb66cdf6e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5854,6 +5854,18 @@ final: prev: meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; + nvim-luadev = buildVimPluginFrom2Nix { + pname = "nvim-luadev"; + version = "2022-01-26"; + src = fetchFromGitHub { + owner = "bfredl"; + repo = "nvim-luadev"; + rev = "2a2c242bd751c289cfc1bc27f357925f68eba098"; + sha256 = "0prwzxgg6fqkfmqqs41c1c81lch2x4qrs7287l5b104rz3alcinn"; + }; + meta.homepage = "https://github.com/bfredl/nvim-luadev/"; + }; + nvim-luapad = buildVimPluginFrom2Nix { pname = "nvim-luapad"; version = "2022-10-26"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 776e267e1e12..6650e74ce48b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -492,6 +492,7 @@ https://github.com/mfussenegger/nvim-lint/,, https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,, https://github.com/neovim/nvim-lspconfig/,, https://github.com/RishabhRD/nvim-lsputils/,, +https://github.com/bfredl/nvim-luadev/,HEAD, https://github.com/rafcamlet/nvim-luapad/,, https://github.com/scalameta/nvim-metals/,, https://github.com/gpanders/nvim-moonwalk/,, From faaf43c36adbde5a0713c9f510a7f6516d4f9b2c Mon Sep 17 00:00:00 2001 From: "M. A" Date: Sat, 22 Oct 2022 13:42:32 +0000 Subject: [PATCH 16/29] gitlab: 15.4.2 -> 15.4.4 https://about.gitlab.com/releases/2022/11/02/security-release-gitlab-15-5-2-released/ Fixes CVE-2022-3767 Fixes CVE-2022-3265 Fixes CVE-2022-3483 Fixes CVE-2022-3818 Fixes CVE-2022-3726 Fixes CVE-2022-2251 Fixes CVE-2022-3486 Fixes CVE-2022-3793 Fixes CVE-2022-3413 Fixes CVE-2022-2761 Fixes CVE-2022-3819 Fixes CVE-2022-3280 Fixes CVE-2022-3706 --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index a5eb46d834af..693b7adf46b8 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "15.4.2", - "repo_hash": "sha256-KGVZrfrzfIn2ZQJ42FisLvjIGg0+QOnzfjCR6mQHjlM=", + "version": "15.4.4", + "repo_hash": "sha256-iIgN1j02Lr/RtNeopqs6ndFqw8YIU2F6c49RGWvpmgc=", "yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.4.2-ee", + "rev": "v15.4.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.4.2", + "GITALY_SERVER_VERSION": "15.4.4", "GITLAB_PAGES_VERSION": "1.62.0", "GITLAB_SHELL_VERSION": "14.10.0", - "GITLAB_WORKHORSE_VERSION": "15.4.2" + "GITLAB_WORKHORSE_VERSION": "15.4.4" }, "vendored_gems": [ "bundler-checksum", diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 32786117c213..44a8218e1fbc 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.4.2"; + version = "15.4.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-DBAQ1dJLQ+Xno4e/n1jvgKiHAol/uTMjx6RtZIBwM3w="; + sha256 = "sha256-b8ChQYaj+7snlrLP4P9FIUSIq/SNMh9hFlFajOPcBEU="; }; vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 5b6617e0ab70..2042b6c2bcef 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.4.2"; + version = "15.4.4"; src = fetchFromGitLab { owner = data.owner; From 92635588079534dde9c74109dee9850c89497bc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 18:48:57 +0000 Subject: [PATCH 17/29] zerotierone: 1.10.1 -> 1.10.2 --- pkgs/tools/networking/zerotierone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 05e9651bcb3c..10dc8a2a266f 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -15,13 +15,13 @@ let pname = "zerotierone"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-Y0klfE7ANQl1uYMkRg+AaIiJYSVPT6zME7tDMg2xbOk="; + sha256 = "sha256-p900bw+BGzyMwH91W9NRfYS1ZUW74YaALwr1Gv9BlvQ="; }; in stdenv.mkDerivation { inherit pname version src; From 6c041cb4970582916feacb396767893f0b47ddc5 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Wed, 2 Nov 2022 12:25:13 -0700 Subject: [PATCH 18/29] github-runner: 2.298.2 -> 2.299.0 --- .../tools/continuous-integration/github-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 928d52dd6bc8..a318ad48cdba 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -46,7 +46,7 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.298.2"; + version = "2.299.0"; inherit sdkSource; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-ejYNuaijUOG3czW+7i4UmR+ysDnZwXXmS3V8INqeeTg="; + hash = "sha256-/grYaWhpd6jZx/gkWC3L+BoZcB6WKVMZzMGfwDhBRr0="; }; nativeBuildInputs = [ From d869913e9c3e6b596dfc7b69d7bfdab32339512c Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 2 Nov 2022 23:33:16 +0300 Subject: [PATCH 19/29] pre-commit: skip tests broken with Git 2.38.1 --- pkgs/tools/misc/pre-commit/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 2e11679f4518..06efbbfff449 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -146,6 +146,17 @@ buildPythonPackage rec { # Expects `git commit` to fail when `pre-commit` is not in the `$PATH`, # but we use an absolute path so it's not an issue. "test_environment_not_sourced" + + # broken with Git 2.38.1, upstream issue filed at https://github.com/pre-commit/pre-commit/issues/2579 + "test_golang_with_recursive_submodule" + "test_install_in_submodule_and_run" + "test_is_in_merge_conflict_submodule" + "test_get_conflicted_files_in_submodule" + "test_sub_nothing_unstaged" + "test_sub_something_unstaged" + "test_sub_staged" + "test_submodule_does_not_discard_changes" + "test_submodule_does_not_discard_changes_recurse" ]; pythonImportsCheck = [ From 5017d4328837a80893252d3e0fbe2d26554bc7e6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Nov 2022 21:39:35 +0100 Subject: [PATCH 20/29] panoply: 5.2.1 -> 5.2.2 --- pkgs/tools/misc/panoply/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index 31a9e3a7f041..acb66e3dca63 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-ukIH6hiWg8GMq28chfxIb2uHZaaymL9x/BhbFnIzw0Y="; + sha256 = "sha256-RIjdNfX4jsMwpgbE1aTzT6bysIFGUi33o5m030fF6mg="; }; nativeBuildInputs = [ makeWrapper ]; From 74ddb2da471b8f3563bd71974b69456d1581817e Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 2 Nov 2022 17:29:29 +0100 Subject: [PATCH 21/29] fd: 8.5.0 -> 8.5.1 https://github.com/sharkdp/fd/releases/tag/v8.5.1 --- pkgs/tools/misc/fd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index d6482b58aa35..e0c5d6f50920 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.5.0"; + version = "8.5.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "sha256-FWnuV55xWL59lbLfs2IUi4QPolFGgsJDQdZCXx4PaKE="; + sha256 = "sha256-zS0AEGd+4YmwId6zJ08q3xYzXF+9K0XL8XWeXGaEJxA="; }; - cargoSha256 = "sha256-SD0olex4wDfdGHuuiNGQwjEV7AwmDIucLJbY+7E8hZg="; + cargoSha256 = "sha256-upI/cDtqe+P7PxoWZZddPqaic2pWclpTC/ATjR7sXx8="; nativeBuildInputs = [ installShellFiles ]; From d8075266e673d79c07cfbff4e9159bb5840ad8c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 20:57:29 +0000 Subject: [PATCH 22/29] cargo-release: 0.22.1 -> 0.22.2 --- pkgs/development/tools/rust/cargo-release/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index c85fff6656e2..2919d34b2573 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.22.1"; + version = "0.22.2"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-GKjEp0KX/YcEWo2ci6CwTpouPYHTymDx4hk3zO5pEcU="; + sha256 = "sha256-G235QKwwOFnHsfU26hc7d0mD/nwGyJRPs6BCctEqxJ8="; }; - cargoSha256 = "sha256-1iRHpEZ+FlZbc5SgovCYf5X1NTt4q+gigcX0sBwKM3s="; + cargoSha256 = "sha256-A3tzgLW+/GO4/kHRJH7Y7vtFUzI2Ow0nyfMfIuI5Sl4="; nativeBuildInputs = [ pkg-config ]; From eb0d0de69f30cef555340ef99517a4f96a976543 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 3 Nov 2022 06:49:34 +1000 Subject: [PATCH 23/29] terraform: 1.3.3 -> 1.3.4 https://github.com/hashicorp/terraform/releases/tag/v1.3.4 --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 77939cfe4284..661466951809 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,9 +168,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.3.3"; - sha256 = "sha256-Oqswfw/ZkBJKldRd916Jfaugz66C3wE8VU44kAkGmUA="; - vendorSha256 = "sha256-mXCtgB1MdMP2XlJBagaDtZURw5o0JudAB2koHmfM0f8="; + version = "1.3.4"; + sha256 = "sha256-UaMZTBmaLHbW1mNjDrMQSPMLKRIADlVvyP2qwuAv2Zo="; + vendorSha256 = "sha256-Wwf2EcqtlNqcGijR8WWcdSsayJrbZO68JEBPKWHXHuw="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; From a1826e78afb277ba1c5fbb54e796371eb664091e Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Wed, 2 Nov 2022 22:24:14 +0100 Subject: [PATCH 24/29] josm: 18570 -> 18583 --- pkgs/applications/misc/josm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index aecd7a4b0900..7b2973b5075e 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18570"; + version = "18583"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-EAEh/n7M56rzjtkIs8ZteDvOLuHxNsMyT7VGFyPre6s="; + hash = "sha256-6S6E7ngTCBXb0epPfYxIswLvfm9r2Ql0wgOs/PxpmIM="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-2xsHsaDxm/wjiCyS5tmD8uUlLrBdd3sS8JLal3pX3pA="; + hash = "sha256-3XEoSCXEpeqZj1y4nns5+0JR1SINYE1rsmQ4fMflxRQ="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; From 636051e353461f073ac55d5d42c1ed062a345046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 2 Nov 2022 23:02:43 +0100 Subject: [PATCH 25/29] linux: avoid NO_HZ_FULL on i686-linux This is just a stop-gap; seemed better than a real revert. The issue is from commit 8d3fe232e (PR #198666). --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4fb1e83917ae..d8841b2c9610 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -118,7 +118,7 @@ let timer = { # Enable Full Dynticks System. - NO_HZ_FULL = yes; + NO_HZ_FULL = mkIf stdenv.is64bit yes; # TODO: more precise condition? }; # Enable NUMA. From e1143fcfd72252b1abd11ecbb9d66e95fde7060e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 22:39:12 +0000 Subject: [PATCH 26/29] python310Packages.aioesphomeapi: 11.4.1 -> 11.4.2 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 571ecc9d2aca..4999d6282d54 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "11.4.1"; + version = "11.4.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2vECQFeHvCjU0Fxd/H5M+C5c5lxYE5Tg5u+01EchNO0="; + hash = "sha256-dYogEs9cU+h6oPu9PImHTLvyaJ3kNAOgKNdN44HeqWY="; }; postPatch = '' From f5a22e996359620fd9ca8971fef0400fc8c20ba4 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Wed, 2 Nov 2022 15:29:11 -0700 Subject: [PATCH 27/29] onlykey: synology-cloud-sync-decryption-tool init at 027 --- .../default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix diff --git a/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix b/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix new file mode 100644 index 000000000000..3ceb5c0e1afd --- /dev/null +++ b/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix @@ -0,0 +1,43 @@ +{ lib, writeScript, qt5, fetchurl, autoPatchelfHook }: + +qt5.mkDerivation rec { + pname = "synology-cloud-sync-decryption-tool"; + version = "027"; + + src = fetchurl { + url = "https://global.download.synology.com/download/Utility/SynologyCloudSyncDecryptionTool/${version}/Linux/x86_64/SynologyCloudSyncDecryptionTool-${version}_x64.tar.gz"; + sha256 = "sha256-EWxADvkfhnMwHIauJj3pH6SvSkkrc4cwAhsf1pWOOWQ="; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp $NIX_BUILD_TOP/SynologyCloudSyncDecryptionTool $out/bin + + runHook postInstall + ''; + + passthru.updateScript = writeScript "update-synology-cloud-sync-decryption-tool" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + + set -euo pipefail + + version="$(curl -s https://www.synology.com/en-uk/releaseNote/SynologyCloudSyncDecryptionTool \ + | grep -oP '(?<=data-version=")\d+' \ + | head -1)" + update-source-version synology-cloud-sync-decryption-tool "$version" + ''; + + meta = with lib; { + description = "A desktop tool to decrypt data encrypted by Cloud Sync."; + homepage = "https://kb.synology.com/en-global/DSM/help/SynologyCloudSyncDecryptionTool/synologycloudsyncdecryptiontool"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ kalbasit ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2241ecf0f600..7ca9088c229a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31800,6 +31800,8 @@ with pkgs; synology-drive-client = callPackage ../applications/networking/synology-drive-client { }; + synology-cloud-sync-decryption-tool = callPackage ../applications/networking/synology-cloud-sync-decryption-tool { }; + maestral = with python3Packages; toPythonApplication maestral; maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { }; From e0546f44a96794592bf7aceb53a4d0e8735435bc Mon Sep 17 00:00:00 2001 From: Iztok Fister Jr Date: Thu, 3 Nov 2022 00:10:49 +0100 Subject: [PATCH 28/29] python310Packages.niaaml: init at 1.1.11 (#196752) Co-authored-by: Sandro --- .../python-modules/niaaml/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/niaaml/default.nix diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix new file mode 100644 index 000000000000..39a4c485205b --- /dev/null +++ b/pkgs/development/python-modules/niaaml/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, niapy +, numpy +, pandas +, poetry-core +, scikit-learn +, toml-adapt +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "niaaml"; + version = "1.1.11"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "lukapecnik"; + repo = "NiaAML"; + rev = version; + sha256 = "sha256-B87pI1EpZj1xECrgTmzN5S35Cy1nPowBRyu1IDb5zCE="; + }; + + nativeBuildInputs = [ + poetry-core + toml-adapt + ]; + + propagatedBuildInputs = [ + niapy + numpy + pandas + scikit-learn + ]; + + # create scikit-learn dep version consistent + preBuild = '' + toml-adapt -path pyproject.toml -a change -dep scikit-learn -ver X + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "niaaml" + ]; + + meta = with lib; { + description = "Python automated machine learning framework"; + homepage = "https://github.com/lukapecnik/NiaAML"; + license = licenses.mit; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8043050ade6f..5248321ec871 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6111,6 +6111,8 @@ self: super: with self; { enablePython = true; # ... and its Python bindings })).python; + niaaml = callPackage ../development/python-modules/niaaml { }; + niaarm = callPackage ../development/python-modules/niaarm { }; niapy = callPackage ../development/python-modules/niapy { }; From 16ce3bc020b1d226f87cdf41b218989c814486cf Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Wed, 2 Nov 2022 16:46:34 -0700 Subject: [PATCH 29/29] Revert "onlykey: synology-cloud-sync-decryption-tool init at 027" --- .../default.nix | 43 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 45 deletions(-) delete mode 100644 pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix diff --git a/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix b/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix deleted file mode 100644 index 3ceb5c0e1afd..000000000000 --- a/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, writeScript, qt5, fetchurl, autoPatchelfHook }: - -qt5.mkDerivation rec { - pname = "synology-cloud-sync-decryption-tool"; - version = "027"; - - src = fetchurl { - url = "https://global.download.synology.com/download/Utility/SynologyCloudSyncDecryptionTool/${version}/Linux/x86_64/SynologyCloudSyncDecryptionTool-${version}_x64.tar.gz"; - sha256 = "sha256-EWxADvkfhnMwHIauJj3pH6SvSkkrc4cwAhsf1pWOOWQ="; - }; - - nativeBuildInputs = [ autoPatchelfHook ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp $NIX_BUILD_TOP/SynologyCloudSyncDecryptionTool $out/bin - - runHook postInstall - ''; - - passthru.updateScript = writeScript "update-synology-cloud-sync-decryption-tool" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl common-updater-scripts - - set -euo pipefail - - version="$(curl -s https://www.synology.com/en-uk/releaseNote/SynologyCloudSyncDecryptionTool \ - | grep -oP '(?<=data-version=")\d+' \ - | head -1)" - update-source-version synology-cloud-sync-decryption-tool "$version" - ''; - - meta = with lib; { - description = "A desktop tool to decrypt data encrypted by Cloud Sync."; - homepage = "https://kb.synology.com/en-global/DSM/help/SynologyCloudSyncDecryptionTool/synologycloudsyncdecryptiontool"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ kalbasit ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ca9088c229a..2241ecf0f600 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31800,8 +31800,6 @@ with pkgs; synology-drive-client = callPackage ../applications/networking/synology-drive-client { }; - synology-cloud-sync-decryption-tool = callPackage ../applications/networking/synology-cloud-sync-decryption-tool { }; - maestral = with python3Packages; toPythonApplication maestral; maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { };