From a4f8d5f1446d3ddafc65c2e99e729f6d116335c0 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Thu, 9 Dec 2021 17:33:09 +0100 Subject: [PATCH 01/24] commons-fileupload: 1.3.1 -> 1.4 --- .../libraries/java/commons/fileupload/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index 868f2da4e537..ebeeb39414c0 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -1,17 +1,17 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.4"; pname = "commons-fileupload"; src = fetchurl { url = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "1jy7w2j2ay56mpq4ij3331cf9zgpkm832ydr63svb35j0ymnky72"; + sha256 = "1avfv4gljp7flra767yzas54vfb6az9s1nhxfjv48jj2x0llxxkx"; }; installPhase = '' tar xf ${src} mkdir -p $out/share/java - cp lib/*.jar $out/share/java/ + cp commons-fileupload-*-bin/*.jar $out/share/java/ ''; meta = { From 63840cef0ea27353929255088cabadb79ce90b69 Mon Sep 17 00:00:00 2001 From: Joerie de Gram Date: Wed, 22 Dec 2021 16:49:42 +0100 Subject: [PATCH 02/24] flink: 1.14.0 -> 1.14.2 Fixes CVE-2021-44228 and CVE-2021-45046 (#150288). --- pkgs/applications/networking/cluster/flink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index 55f3e23ad6c3..8b93b88be55a 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.14.0"; + version = "1.14.2"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz"; - sha256 = "149b9ae774022acc0109dced893ca2d73430627a612be17ff12de8734464aff8"; + sha256 = "1rm2x66179ybfyc8v3va3svjxrnkslqn3dc84qkglqjaiqciadnr"; }; nativeBuildInputs = [ makeWrapper ]; From e5da53ba72361150931f369c5db0bffaf1068071 Mon Sep 17 00:00:00 2001 From: Lara Date: Sat, 29 Jan 2022 11:09:13 +0000 Subject: [PATCH 03/24] nextcloud21: 21.0.7 -> 21.0.8 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 5490b29090e0..63a888a14218 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,8 +46,8 @@ in { ''; nextcloud21 = generic { - version = "21.0.7"; - sha256 = "sha256-WZMhWW613q5c6grR/dzVSCKJKru7XPtRoxgBhi8VE7c="; + version = "21.0.8"; + sha256 = "00c37wp6fsnpm40bbhk6r6xycacfa5zk7arzc3i4xmhm89cyvm6z"; }; nextcloud22 = generic { From f6038cf1eed439b6e18da73746eb25367287ccc3 Mon Sep 17 00:00:00 2001 From: Lara Date: Sat, 29 Jan 2022 11:10:03 +0000 Subject: [PATCH 04/24] nextcloud22: 22.2.3 -> 22.2.4 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 63a888a14218..46e0fff37046 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -51,8 +51,8 @@ in { }; nextcloud22 = generic { - version = "22.2.3"; - sha256 = "sha256-ZqKaakkHOMCr7bZ3y2jHyR+rqz5kGaPJnYtAaJnrlCo="; + version = "22.2.4"; + sha256 = "0vnf2j1hz0d7lxby73r2mq2rjm72nq55xajzm8sipj6wlbys15zl"; }; nextcloud23 = generic { From 7d87529de990edce3a24f2ac5a86a85b6c3e0bb5 Mon Sep 17 00:00:00 2001 From: Lara Date: Sat, 29 Jan 2022 11:11:01 +0000 Subject: [PATCH 05/24] nextcloud23: 23.0.0 -> 23.0.1 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 46e0fff37046..a530a58e9000 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -56,8 +56,8 @@ in { }; nextcloud23 = generic { - version = "23.0.0"; - sha256 = "sha256-w3WSq8O2XI/ShFkoGiT0FLh69S/IwuqXm+P5vnXQGiw="; + version = "23.0.1"; + sha256 = "047pnkp49rf0a9gl03dwkkdgzmdsf88m79mzq04bwmgkb3a3qxay"; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' From bf042a0978e3f73ad9eff121e2d0058f93cf3b4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Jan 2022 18:11:27 +0000 Subject: [PATCH 06/24] python310Packages.azure-mgmt-compute: 24.0.1 -> 25.0.0 --- .../development/python-modules/azure-mgmt-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index c9de9f9f47b9..8e7d1b203097 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "24.0.1"; + version = "25.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "283195339ef6ba1181dbc866ebede8b06ffdfe09eb86c25a04e1c8059d654f6e"; + sha256 = "sha256-Y0WNBtQ9v0yhTVFfTvfcudWHOjzGagGB+/b++3Ie5Kk="; }; propagatedBuildInputs = [ From 7ae2be51548c68632bf8973439c311eae317637b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jan 2022 00:17:43 +0000 Subject: [PATCH 07/24] appthreat-depscan: 2.1.0 -> 2.1.2 --- pkgs/development/tools/appthreat-depscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index 2177c20a972b..e93dfe845436 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "v${version}"; - hash = "sha256-HCOS8/jn7BOzDwSpenVGo6QpI/1ey6L1zBucTyqsSY4="; + hash = "sha256-hRmTx0qs/QnDLl4KhGbKw5Mucq4wQCaCIkeObrZlJSI="; }; propagatedBuildInputs = with python3.pkgs; [ From 9690362f6270a66035e050fe1bda63ce0e751bdd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 30 Jan 2022 02:10:21 +0100 Subject: [PATCH 08/24] wiki-js: 2.5.272 -> 2.5.274 ChangeLog: https://github.com/Requarks/wiki/releases/tag/2.5.274 --- pkgs/servers/web-apps/wiki-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 3b4af1b86a84..8eb1a9e7a87f 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.272"; + version = "2.5.274"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz"; - sha256 = "sha256-30thDjmjc24tChgih0FZyIUU6/aKKl4MAD5yqn0yYa4="; + sha256 = "sha256-l3mvlC/DIJ2W3xLdwSV2gCRDdNGcg6OUW4e1IOihlyQ="; }; sourceRoot = "."; From 5627936df6d4e93b8c9eeaa7c6178f323ad89e53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jan 2022 04:42:54 +0000 Subject: [PATCH 09/24] python310Packages.youtube-search-python: 1.6.1 -> 1.6.2 --- .../python-modules/youtube-search-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 35f470e319f0..f7298f4b8c95 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.6.1"; + version = "1.6.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c7afe70e1ac8e871341d7fb15f5246aac35fd80fec10d7a96d46df2aad608bd0"; + sha256 = "sha256-PeWi1eygUSgUXZ68bUJ44IoffNDme06JNR9ns6njqMU="; }; propagatedBuildInputs = [ httpx ]; From e7746dccc12f96f2e5f3a75e46736b267a9c1e2e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 30 Jan 2022 13:25:30 +1000 Subject: [PATCH 10/24] dasel: update vendorSha256 --- pkgs/applications/misc/dasel/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 870d3cceb0ba..1741e9086695 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "091s3hyz9p892garanm9zmkbsn6hn3bnnrz7h3dqsyi58806d5yr"; }; - vendorSha256 = "1psyx8nqzpx3p1ya9y3q9h0hhfx4iqmix089b2h6bp9lgqbj5zn8"; + vendorSha256 = "1y0k03lg9dh3bpi10xzv03h7gq7h0hgggs304p78p3jkr8pmkqss"; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 087ba7839757..74e1c19b7ef6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2722,7 +2722,9 @@ with pkgs; dapr-cli = callPackage ../development/tools/dapr/cli {}; - dasel = callPackage ../applications/misc/dasel { }; + dasel = callPackage ../applications/misc/dasel { + buildGoModule = buildGo117Module; + }; dasher = callPackage ../applications/accessibility/dasher { }; From cf4b7813859fb53339cc7ce2282f8e6e232c5fc0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 30 Jan 2022 13:25:30 +1000 Subject: [PATCH 11/24] k0sctl: update vendorSha256 --- pkgs/applications/networking/cluster/k0sctl/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 689922515de5..256d7e642255 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-Fk1aYSa3LqzxiHtlzH5pcNtodOprjfnCFh4UMqCa6Rc="; }; - vendorSha256 = "sha256-N4cU9wzBRZn71mZHkNDXKgSXvlN2QFS6K4MtlR25DJc="; + vendorSha256 = "sha256-21C6wZ8lKQnbUg3aD0ZFVOgopblXyWk4WP/ubZVk3Yk="; ldflags = [ "-s" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74e1c19b7ef6..e3a27dffbc62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14992,7 +14992,9 @@ with pkgs; jpexs = callPackage ../development/tools/jpexs { }; - k0sctl = callPackage ../applications/networking/cluster/k0sctl { }; + k0sctl = callPackage ../applications/networking/cluster/k0sctl { + buildGoModule = buildGo117Module; + }; k2tf = callPackage ../development/tools/misc/k2tf { }; From e35f5180e39538e3493dc2ceb3650bb885fea0d5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 30 Jan 2022 13:25:31 +1000 Subject: [PATCH 12/24] k9s: update vendorSha256 --- pkgs/applications/networking/cluster/k9s/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 27514303a15f..a844f2216754 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/derailed/k9s/cmd.commit=${src.rev}" ]; - vendorSha256 = "sha256-jWZ1N1A8VECBQvkXyuzMUkI4u2NLr5/gSvJUfK5VgzM="; + vendorSha256 = "sha256-mMob7M9RQlqaVK0DgHpaAK9d1btzfQetnliUqFTvjJQ="; preCheck = "export HOME=$(mktemp -d)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3a27dffbc62..f75737d00898 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26801,7 +26801,9 @@ with pkgs; kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { }; - k9s = callPackage ../applications/networking/cluster/k9s { }; + k9s = callPackage ../applications/networking/cluster/k9s { + buildGoModule = buildGo117Module; + }; pgo-client = callPackage ../applications/networking/cluster/pgo-client { }; From 844082a3f97446714e153fd32ee72b3be889e6c2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 30 Jan 2022 13:25:31 +1000 Subject: [PATCH 13/24] nerdctl: update vendorSha256 --- pkgs/applications/networking/cluster/nerdctl/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 14a3675797ed..df7d2bea6343 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { sha256 = "sha256-ZnSDL1a4I3e7z2w5MdG6tFZH0PT4jCYX34f+mOmO0oA="; }; - vendorSha256 = "sha256-S0WRLln80pdGWCe6ub3bMZ6G2PbXwvCEGDDzez+nF9E="; + vendorSha256 = "sha256-Gk3KBHLux7d7olS16liPYO7yYL2wryWLX5bKgCLEhB8="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f75737d00898..c69e17df5341 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7232,7 +7232,9 @@ with pkgs; ncrack = callPackage ../tools/security/ncrack { }; - nerdctl = callPackage ../applications/networking/cluster/nerdctl { }; + nerdctl = callPackage ../applications/networking/cluster/nerdctl { + buildGoModule = buildGo117Module; + }; netdata = callPackage ../tools/system/netdata { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; From cf6720685a324fb58a420ac1ece3867e9dfcb0d9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 30 Jan 2022 13:25:31 +1000 Subject: [PATCH 14/24] datree: update vendorSha256 --- pkgs/development/tools/datree/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 2eb11b2ffc28..d8b99eb2870c 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-zoFWiqrKdTh6XDrKx2mQe3NqK03so6MqIX0sSQHQa5U="; }; - vendorSha256 = "sha256-SlU1lJcKCDkoihU19c8iky3Bj5ZZD9E9W0QQX9fBT1c="; + vendorSha256 = "sha256-HaOgRbF3gMsl6PufdB5IZ2sLunvPo4GeObLb7DRSD0o="; ldflags = [ "-s" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c69e17df5341..df770d04d3fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14619,7 +14619,9 @@ with pkgs; cli11 = callPackage ../development/tools/misc/cli11 { }; - datree = callPackage ../development/tools/datree { }; + datree = callPackage ../development/tools/datree { + buildGoModule = buildGo117Module; + }; dcadec = callPackage ../development/tools/dcadec { }; From 315f2325f11849e12a6ed14596b93d22bfaa47ec Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 30 Jan 2022 13:25:32 +1000 Subject: [PATCH 15/24] dyff: update vendorSha256 --- pkgs/development/tools/dyff/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index 3e228badbd5d..3edbc57ecdbc 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-0/pn+Ld7o4gBnddA+uMzBhrFnov1XoqpRGkTT/vNH3Y="; }; - vendorSha256 = "sha256-9FkRazgZlzwvimsbqWCYJLxwRRlHa0i/jPPuf+AGSOA="; + vendorSha256 = "sha256-ITg+qEdk4/mWytzBbybYEc2Tw4ibvGUOB/FMu475dSk="; subPackages = [ "cmd/dyff" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df770d04d3fa..3c6fe2a7f7a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25117,7 +25117,9 @@ with pkgs; inherit (gnome2) libgnomeui; }; - dyff = callPackage ../development/tools/dyff {}; + dyff = callPackage ../development/tools/dyff { + buildGoModule = buildGo117Module; + }; dwl = callPackage ../applications/window-managers/dwl { wlroots = wlroots_0_14; From 0d3014bcc1b95e4d08f789fd89faf5539cb70ec2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 30 Jan 2022 13:25:32 +1000 Subject: [PATCH 16/24] naabu: update vendorSha256 --- pkgs/tools/security/naabu/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix index 83bb83e4e2c0..5acd0a93ac22 100644 --- a/pkgs/tools/security/naabu/default.nix +++ b/pkgs/tools/security/naabu/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "0kbpfb1ryfqy8a54ksm7zm8pqy8f4adh06jc1ccpdxks3k0rygid"; }; - vendorSha256 = "0kkkx8p0r04gg3pp0qy835afaxnqxjggnr7q7l6azdvg8qvgxfms"; + vendorSha256 = "17x60x68hd2jm84xw5mgsclv6phn6ajkp92kpcz013vlkcdaqrxs"; buildInputs = [ libpcap diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c6fe2a7f7a5..d1e2011a4cfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7214,7 +7214,9 @@ with pkgs; mxt-app = callPackage ../misc/mxt-app { }; - naabu = callPackage ../tools/security/naabu { }; + naabu = callPackage ../tools/security/naabu { + buildGoModule = buildGo117Module; + }; nagstamon = callPackage ../tools/misc/nagstamon { pythonPackages = python3Packages; From efeefb2af1469a5d1f0ae7ca8f0dfd9bb87d5cfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jan 2022 03:10:51 +0000 Subject: [PATCH 17/24] python310Packages.pyexcel-io: 0.6.5 -> 0.6.6 --- pkgs/development/python-modules/pyexcel-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix index 4223ce02caea..840a74f252ef 100644 --- a/pkgs/development/python-modules/pyexcel-io/default.nix +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyexcel-io"; - version = "0.6.5"; + version = "0.6.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "608d8e80da38070d3bb970d132bc47a55dcfd63b4dc03997d93646c5b2ad185b"; + sha256 = "sha256-9ghL8a+l+/TGHPffRDcPpROCGvGIsC4+GbXvtm2Klp8="; }; propagatedBuildInputs = [ From 01614440cf28f0f5af67dbad21f3d3a591e6760b Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Sun, 30 Jan 2022 07:19:54 +0000 Subject: [PATCH 18/24] exploitdb: 2022-01-26 -> 2022-01-29 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index a59fc1dc90eb..15f677898505 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-01-26"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-5WdAh4YFNLOF8h8f0pN6GHdoyASf/3fN345Mp9b1Cfg="; + sha256 = "sha256-yIZFlj8WtKU3STdPXsZ+s3hoq/zBvqA64D6GoyUFXvE="; }; nativeBuildInputs = [ makeWrapper ]; From f9bd7869d52a2e0a2fa1bc652d6b9e5c0f55e3a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jan 2022 07:40:28 +0000 Subject: [PATCH 19/24] python310Packages.pykeyatome: 1.3.1 -> 1.4.1 --- pkgs/development/python-modules/pykeyatome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix index 145ea83abeb8..f4ea169b01e4 100644 --- a/pkgs/development/python-modules/pykeyatome/default.nix +++ b/pkgs/development/python-modules/pykeyatome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pykeyatome"; - version = "1.3.1"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jugla"; repo = "pyKeyAtome"; rev = "V${version}"; - sha256 = "1lvwxcr2ay8h5sr4lmjgs7xgszl1q8ciaqdn6cmrlra27jssl5ax"; + sha256 = "sha256-Gv418i2JLoovwagkZpv8PIJPW3I/0pRmXR/PJOJ2NBc="; }; propagatedBuildInputs = [ From e084de408ab4b8c37cb55c86b5cd0ca27211d953 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jan 2022 07:47:13 +0000 Subject: [PATCH 20/24] python310Packages.aiounifi: 30 -> 31 --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 1a8bdee922e2..7bd56482ed7b 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "30"; + version = "31"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "v${version}"; - sha256 = "036yx1g80rc32g9mqx4khn8iqhmwl4kfch35pjslnna9kw3kb9i8"; + sha256 = "sha256-8Hm7sUkIW4rVLCL5+vHfhAvmc8+IKDXaSLtYJTf14XY="; }; propagatedBuildInputs = [ From 984466e95769fda8e5e8cc768e2e418b25de611e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jan 2022 08:17:18 +0000 Subject: [PATCH 21/24] python310Packages.python-louvain: 0.15 -> 0.16 --- pkgs/development/python-modules/python-louvain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-louvain/default.nix b/pkgs/development/python-modules/python-louvain/default.nix index 6d22c1fd845a..262370f6109d 100644 --- a/pkgs/development/python-modules/python-louvain/default.nix +++ b/pkgs/development/python-modules/python-louvain/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-louvain"; - version = "0.15"; + version = "0.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KoVu374plSpgpVOKhLt4zKGPaISoi5Ml6FoRyN1JF+s="; + sha256 = "sha256-t7ot9QAv0o0+54mklTK6rRH+ZI5PIRfPB5jnUgodpWs="; }; propagatedBuildInputs = [ networkx numpy ]; From 55c79be9effadcbece00f35aa1b11fd15733bb46 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 30 Jan 2022 19:53:55 +1000 Subject: [PATCH 22/24] kuma: update vendorSha256 --- pkgs/applications/networking/cluster/kuma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index d7a58f09b4e7..b8fada3966c9 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, buildGoModule +, buildGo117Module , coredns , installShellFiles , isFull ? false @@ -14,11 +14,11 @@ ] }: -buildGoModule rec { +buildGo117Module rec { inherit pname ; version = "1.4.0"; tags = lib.optionals enableGateway ["gateway"]; - vendorSha256 = "1fc5psvbd9bpc6c3y2cpx5dx8cgr2fcp7nln3kwfgbryahq2y8wl"; + vendorSha256 = "19rd450gmc51gmwa13991lbkva7r80d2camikkxmmgywyhrd06sf"; src = fetchFromGitHub { owner = "kumahq"; From 2fe2f500d4644319587bda06eceff929852ce527 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 30 Jan 2022 19:53:55 +1000 Subject: [PATCH 23/24] beats7: update vendorSha256 --- pkgs/misc/logging/beats/7.x.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 9f5e550d9720..2cecc22cf5df 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -11,7 +11,7 @@ let beat = package: extraArgs: buildGoModule (rec { sha256 = "sha256-9Jl5Xo1iKdOY9ZE5JXKSL4ee+NdsN3KCY2dDYuxlzPI="; }; - vendorSha256 = "sha256-tyxyM7RsTHTVVxc9gagPsSvFRaWGTmobKzyv9RODXBk="; + vendorSha256 = "sha256-fiqCccS2IAnTzfPfUqY0Wy9uRUuiYNtiVvpAFZJOPVI="; subPackages = [ package ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1e2011a4cfb..ad0c718e730b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2165,7 +2165,9 @@ with pkgs; packetbeat6 journalbeat6; - inherit (callPackages ../misc/logging/beats/7.x.nix { }) + inherit (callPackages ../misc/logging/beats/7.x.nix { + buildGoModule = buildGo117Module; + }) filebeat7 heartbeat7 metricbeat7 From 7c895e75941c9f9950e0367c342e1ffb09f7d8f0 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 30 Jan 2022 08:25:33 -0300 Subject: [PATCH 24/24] linkerd_edge: 21.10.3 -> 22.1.4 --- pkgs/applications/networking/cluster/linkerd/edge.nix | 6 +++--- pkgs/applications/networking/cluster/linkerd/generic.nix | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 0af651246e5e..8c8a6d92930a 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "21.10.3"; - sha256 = "09k4c0dgn9vvgp6xb20x0vylk6bbd03srk3sra8vnpywwi591mcv"; - vendorSha256 = "sha256-J/+YFXHC6UTyhln2ZDEq/EyqMEP9XcNC4GRuJjGEY3g="; + version = "22.1.4"; + sha256 = "00r58k26qnxjsqjdcqz04p21c1vvw5ls485gad0pcny370wrp65n"; + vendorSha256 = "sha256-5vYf9/BCSHJ0iydKhz+9yDg0rRXpLd+j8uD8kcKhByc="; } diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index 7722a7109c21..5601bad7104a 100644 --- a/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -1,8 +1,9 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: +{ lib, fetchFromGitHub, buildGo117Module, installShellFiles }: { channel, version, sha256, vendorSha256 }: -buildGoModule rec { +# Fix-Me: Unlock buildGoModule version when #154059 is merged. +buildGo117Module rec { pname = "linkerd-${channel}"; inherit version vendorSha256;