From 01c28b84aadb78610e731f33f1fbc5b60a5c1249 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 04:46:34 +0000 Subject: [PATCH 01/42] toxiproxy: 2.4.0 -> 2.5.0 --- pkgs/development/tools/toxiproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix index c3b77e4b3e27..0ab9da2bf8a1 100644 --- a/pkgs/development/tools/toxiproxy/default.nix +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "toxiproxy"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Shopify"; repo = "toxiproxy"; rev = "v${version}"; - sha256 = "sha256-vFf1yLpAa+yO1PCE+pLTnvvtROtpVxlEgACDNNUWBEM="; + sha256 = "sha256-SL3YHsNeFw8K8lPrzJXAoTkHxS+1sTREfzjawBxdnf0="; }; - vendorSha256 = "sha256-mrRMyIU6zeyAT/fXbBmtMlZzpyeB45FQmYJ4FDwTRTo="; + vendorSha256 = "sha256-CmENxPAdjz0BAyvhLKIaJjSbK/mvRzHGCQOfGIiA3yI="; excludedPackages = [ "test/e2e" ]; From 3913119f037da15ad7ba4514a2dfb1e900ac2b91 Mon Sep 17 00:00:00 2001 From: Reed Date: Sat, 17 Sep 2022 09:25:27 -0400 Subject: [PATCH 02/42] cinny-desktop: use openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a54ee9c4c6df..de73b2ac9b82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3297,7 +3297,9 @@ with pkgs; cinny = callPackage ../applications/networking/instant-messengers/cinny { stdenv = stdenvNoCC; }; - cinny-desktop = callPackage ../applications/networking/instant-messengers/cinny-desktop { }; + cinny-desktop = callPackage ../applications/networking/instant-messengers/cinny-desktop { + openssl = openssl_1_1; + }; ckbcomp = callPackage ../tools/X11/ckbcomp { }; From dcc88d1557204524b3156d83ca6577eeff7b0e40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Sep 2022 07:14:58 +0000 Subject: [PATCH 03/42] datree: 1.6.29 -> 1.6.33 --- pkgs/development/tools/datree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 85d530f92510..ca9219a04418 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "datree"; - version = "1.6.29"; + version = "1.6.33"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - hash = "sha256-RFm7I9HTI3M0fdGOz4ZXHtQY4Pm86SOz9pcIQLqb7/U="; + hash = "sha256-VuTa1bnwxk8SUvOK3jLEvgJTPf3eABUyBssUYtoAxTs="; }; - vendorSha256 = "sha256-mEtnZO4AZEcnEHuiAWguT8VelD0yLj1rytl6gPkPKBg="; + vendorSha256 = "sha256-gjD24nyQ8U1WwhUbq8N4dvzFK74t3as7wWZK7rh9yiw="; ldflags = [ "-extldflags '-static'" From 32f4104b6610d31a17cc06f71a88bc27a677f538 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 20 Sep 2022 21:49:53 +0100 Subject: [PATCH 04/42] tinyproxy: add patch for CVE-2022-40468 --- pkgs/tools/networking/tinyproxy/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index 44bca62e8f09..12c8a0d0447e 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, perl, withDebug ? false }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, perl +, withDebug ? false +}: stdenv.mkDerivation rec { pname = "tinyproxy"; @@ -11,6 +18,14 @@ stdenv.mkDerivation rec { owner = "tinyproxy"; }; + patches = [ + (fetchpatch { + name = "CVE-2022-40468.patch"; + url = "https://github.com/tinyproxy/tinyproxy/commit/3764b8551463b900b5b4e3ec0cd9bb9182191cb7.patch"; + sha256 = "sha256-P0c4mUK227ld3703ss5MQhi8Vo2QVTCVXhKmc9fcufk="; + }) + ]; + # perl is needed for man page generation. nativeBuildInputs = [ autoreconfHook perl ]; From 97e042d58b5abcb0bbe84ba13dc48e23003bb585 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 06:46:07 +0000 Subject: [PATCH 05/42] rust-analyzer-unwrapped: 2022-09-12 -> 2022-09-19 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 37dcff8abce1..cdf9de2323a2 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-09-12"; - cargoSha256 = "sha256-mi6Ab3CyOfz1ZYViYbJwJCIew/N+IPt37bkq7x/N7IY="; + version = "2022-09-19"; + cargoSha256 = "sha256-GoGnhO1WaDpNrxyOj2xJPirwmsZ2IESDmA7orryupfo="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-1LkSsXzI1JTAmP/GMTz4fTJd8y/tw8R79l96q+h7mu8="; + sha256 = "sha256-aG6JOn3BG/2U1zuusB4bwLnPMXNoAeDSL8MWUCDLvl8="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; From ee95ea169bed642118ff48d526afdf7fcfa05205 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 23:41:24 +0000 Subject: [PATCH 06/42] mubeng: 0.10.0 -> 0.11.0 --- pkgs/tools/networking/mubeng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix index e4b9cedaff4d..a214d00b9812 100644 --- a/pkgs/tools/networking/mubeng/default.nix +++ b/pkgs/tools/networking/mubeng/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mubeng"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z81/WbqhMJPliT5rrW4UY8gseV7R2UDQIUOjZuUgLTI="; + sha256 = "sha256-BY3X9N7XnBZ6mVX/o+EXruJmi3HYWMeY9enSuJY4jWI="; }; - vendorSha256 = "sha256-CjAFntwpHvUOaaLHDOT9Dctptv5EFW62X8XWT4SvT2A="; + vendorSha256 = "sha256-1JxyP6CrJ4/g7o3eGeN1kRXJU/jNLEB8fW1bjJytQqQ="; ldflags = [ "-s" "-w" "-X ktbs.dev/mubeng/common.Version=${version}" ]; From 6b7659232eb5cff01ec97c201318445336205039 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Sep 2022 09:25:58 +0200 Subject: [PATCH 07/42] python310Packages.dulwich: 0.20.45 -> 0.20.46 --- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index d95fef43fad0..4b0fb7d224a0 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.20.45"; + version = "0.20.46"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-cHEN2coqRCGQx+UGiS2wdMMYrHYuIh91KbjONIAgQbc="; + hash = "sha256-Tw6I//9dsVI9k9kvFSX+X6FhMY/7qtUCwbmzvnoGcXI="; }; LC_ALL = "en_US.UTF-8"; From 9b63f833c7fe8d8d2f3f39ce08119b3c3ba88de0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Sep 2022 09:37:04 +0200 Subject: [PATCH 08/42] python310Packages.pygit2: 1.9.2 -> 1.10.1 --- pkgs/development/python-modules/pygit2/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 9e293e65a09b..565cd6d67ec9 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -4,7 +4,6 @@ , cacert , cached-property , cffi -, fetchpatch , fetchPypi , isPyPy , libgit2 @@ -15,25 +14,16 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.9.2"; + version = "1.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IIlEM98RRkgarK434rDzu7/eoCbbL1UGEXC9mCPkCxk="; + hash = "sha256-NUZRvwYsAtHwgEHW+/GptL96k6/OZZeb3Ai9xlZTqi4="; }; - patches = [ - # libgit 2 fix - (fetchpatch { - url = "https://github.com/libgit2/pygit2/commit/14b1df84060ea4ab085202382e80672ec1a104e3.patch"; - includes = [ "src/types.h" ]; - sha256 = "sha256-2krkyAT30l/olSEl2ugWCsylvGuT7VvkuSFVshIXktA="; - }) - ]; - preConfigure = lib.optionalString stdenv.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; From 9d60b4debc23766ba713dd970d8a296f1310d48e Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Thu, 22 Sep 2022 09:02:59 +0200 Subject: [PATCH 09/42] gitlab-runner: 15.2.1 -> 15.4.0 --- .../tools/continuous-integration/gitlab-runner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index bd1e4c5db299..0c2d18393390 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl }: let - version = "15.2.1"; + version = "15.4.0"; in buildGoModule rec { inherit version; @@ -14,13 +14,13 @@ buildGoModule rec { "-X ${commonPackagePath}.REVISION=v${version}" ]; - vendorSha256 = "sha256-weT4Ed/VNTLovxUu2xCdHDqxY7v/5Wi3WsWlNDWYLLc="; + vendorSha256 = "sha256-S0x1b2ITtqMoqdssoTgnolDC6Tyq3IdkJqxwZ29qCyU="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-HaFxMNREHTtnbIuQUXCinhd4lhcnkLkacLczeySsfWQ="; + sha256 = "sha256-zItzg5r0V+m68c5aIJLMKsTKgmkgWrQD9t0cx5Lcaho="; }; patches = [ From 4f0aca42cfc96084d045a41a8673b8e8eb8e1598 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Sep 2022 09:37:24 +0200 Subject: [PATCH 10/42] python310Packages.scmrepo: 0.0.25 -> 0.1.1 --- pkgs/development/python-modules/scmrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index e61ac1e5b9b5..f7443094f4aa 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.0.25"; + version = "0.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-269vJNclTBWEqM9AJbF96R1I6Ru3q8YBd5A8Rmw7Jjo="; + hash = "sha256-lFeYo7OVT0az+mYgERcVuuT9rX29+E2+WwfdDlMRm+I="; }; propagatedBuildInputs = [ From 5a4a5acfbf61275d44082fb84753516f19629b1c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Sep 2022 09:44:41 +0200 Subject: [PATCH 11/42] python310Packages.phonenumbers: 8.12.51 -> 8.12.55 --- pkgs/development/python-modules/phonenumbers/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index f0538c25d376..dd7583d7462d 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,16 +2,19 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.51"; + version = "8.12.55"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - hash = "sha256-nUqUYBJ//SiK4HHdH3lC4jKdpbXF1X2Kq+cQNCfKfL8="; + hash = "sha256-G+PHNT6TJd3qqQmrF5NkI8YpWNVwDWjl2lvpUDxG0Ic="; }; checkInputs = [ From 0b2b2d8379ec0cb5b9de43c74282792a9fb000ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 08:39:55 +0000 Subject: [PATCH 12/42] audible-cli: 0.2.3 -> 0.2.4 --- pkgs/tools/misc/audible-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/audible-cli/default.nix b/pkgs/tools/misc/audible-cli/default.nix index 81b071ce0aad..f83a87a75b25 100644 --- a/pkgs/tools/misc/audible-cli/default.nix +++ b/pkgs/tools/misc/audible-cli/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "audible-cli"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "mkb79"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-z7oLY+xu+rTHgIWLFQU/TTSQtxChwhfu8nXoI05QqLw="; + sha256 = "sha256-umIPHKPfWKlzEVyRKbBqmul/8n13EnpfYXmSQbQtLq8="; }; propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools questionary ]; From ee08af170b21e21015f3adba7430e09134ba773a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 22 Sep 2022 11:23:20 +0200 Subject: [PATCH 13/42] grafana: 9.1.5 -> 9.1.6, fix CVE-2022-35957 & CVE-2022-36062 ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.1.6 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 8b927aaab707..db5465285867 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.1.5"; + version = "9.1.6"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-R5gHd9lLXPV6Ck9mhPfdL41/O9ZN76wjBRDUBLtL2eA="; + sha256 = "sha256-DIcKz5M1KdyCBQByt/Z8Z+LBAtjdg5VkoFYRo0x6vP8="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-P+QkpyGRSuZX/OJo/CgMP9z1Rq7tJbWAZCMOwAuEFhc="; + sha256 = "sha256-ftLEnrHE36uQ/Lj6hNPlAN4KyNm4P5m3c7H8erJnkVs="; }; vendorSha256 = "sha256-frY84+Tp9qVj9Xs9l0c0u1YyYywMbXO4KS0AF5mpnhQ="; From d48e7fe59c70ba91981c140dc41171afc07435bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 09:50:59 +0000 Subject: [PATCH 14/42] cilium-cli: 0.12.3 -> 0.12.4 --- pkgs/applications/networking/cluster/cilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 7b68d68beece..af0375be90a9 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.12.3"; + version = "0.12.4"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mgyzdu7xzN6rDSHBcC8Uz8m5+5VEfA0RPe8cPZYfEgM="; + sha256 = "sha256-AmJHc9+d053tzz1nj5yyJYDxV3/Bko3plkfR2RjbjH8="; }; vendorSha256 = null; From 825646db8f65b005cbde941b49ed9a93dcc0c170 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 22 Sep 2022 11:57:33 +0200 Subject: [PATCH 15/42] evcxr: 0.13.0 -> 0.14.0 ChangeLog: https://github.com/google/evcxr/releases/tag/v0.14.0 --- pkgs/development/interpreters/evcxr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 1b76ecb68543..18b32e5ccdb7 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-n9wDO4HIWLINbqGVxaZyAEFVDLLnSpQLKlFf20jLq6o="; + sha256 = "sha256-gB56fGjL/YtzQI+vr83URPhQ6qXrCn5IRPnIYBt8iHk="; }; - cargoSha256 = "sha256-zdIJb9fXRByyAJ32RL9lQh6oS1K78IlZfWdJyj+MMZM="; + cargoSha256 = "sha256-DAbg5G1oGnfBR1kIUt7ebYEx06b6sbexqLyFJ7zKhlk="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; From 7ab32908ccd7c62db86f919f4cb0f08577a68985 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 21 Sep 2022 18:41:23 -0300 Subject: [PATCH 16/42] faas-cli: add shell completion and version test --- pkgs/development/tools/faas-cli/default.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 0791bff17675..e5b1c05ea6dc 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -4,6 +4,9 @@ , fetchFromGitHub , makeWrapper , git +, installShellFiles +, testers +, faas-cli }: let faasPlatform = platform: @@ -24,12 +27,10 @@ buildGoModule rec { sha256 = "sha256-iUS8bhTZc7oy7qy0ydmbVW3BNa/lZ2Q+kYefBKrNRyc="; }; - nativeBuildInputs = [ makeWrapper ]; + vendorSha256 = null; CGO_ENABLED = 0; - vendorSha256 = null; - subPackages = [ "." ]; ldflags = [ @@ -39,14 +40,25 @@ buildGoModule rec { "-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.targetPlatform}" ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; + postInstall = '' wrapProgram "$out/bin/faas-cli" \ --prefix PATH : ${lib.makeBinPath [ git ]} + + installShellCompletion --cmd metal \ + --bash <($out/bin/faas-cli completion --shell bash) \ + --zsh <($out/bin/faas-cli completion --shell zsh) ''; + passthru.tests.version = testers.testVersion { + command = "${faas-cli}/bin/faas-cli version --short-version --warn-update=false"; + package = faas-cli; + }; + meta = with lib; { - homepage = "https://github.com/openfaas/faas-cli"; description = "Official CLI for OpenFaaS "; + homepage = "https://github.com/openfaas/faas-cli"; license = licenses.mit; maintainers = with maintainers; [ welteki techknowlogick ]; }; From 646d3c0a7ca75b8bdc749b4c8f3072bd41c86f86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 12:07:53 +0000 Subject: [PATCH 17/42] gitleaks: 8.12.0 -> 8.13.0 --- pkgs/tools/security/gitleaks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index a9cdeb326100..1c68b87147ae 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.12.0"; + version = "8.13.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g15ySGRX9f3zlmoatfzUomokdXyr33geNZnEQLle9rw="; + sha256 = "sha256-Pdl26PoTcI0LiC3O8EN/vW9LjVfI54TsspRnmhpFaVo="; }; vendorSha256 = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE="; From a19860d9f3ee623344d273cf8f095b6fc35f95c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 14:07:50 +0000 Subject: [PATCH 18/42] python310Packages.pytomorrowio: 0.3.4 -> 0.3.5 --- pkgs/development/python-modules/pytomorrowio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytomorrowio/default.nix b/pkgs/development/python-modules/pytomorrowio/default.nix index 8a6e374df0f6..14daed084032 100644 --- a/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/pkgs/development/python-modules/pytomorrowio/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pytomorrowio"; - version = "0.3.4"; + version = "0.3.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-d4twa9bHaQ9XTHSb8pwJnnJ7tDH6vGpck3/8Y39tRaY="; + sha256 = "sha256-LFIQJJPqKlqLzEoX9ShfoASigPC5R+OWiW81VmjONe8="; }; propagatedBuildInputs = [ From 33e48b13d9133626950156ee00e673490e9280b5 Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 21 Sep 2022 11:31:06 +0200 Subject: [PATCH 19/42] tor-browser-bundle-bin: build on hydra again --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 58456a53d3b1..416ea09be69d 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -429,7 +429,6 @@ stdenv.mkDerivation rec { platforms = attrNames srcs; maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 KarlJoad ]; mainProgram = "tor-browser"; - hydraPlatforms = []; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain # restrictions on redistribution), it's free enough for our purposes. From fb85ef4c146d3b37783ffd4060fd29e5ab3a15db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 16:04:00 +0000 Subject: [PATCH 20/42] python310Packages.sabyenc3: 5.4.3 -> 5.4.4 --- pkgs/development/python-modules/sabyenc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sabyenc3/default.nix b/pkgs/development/python-modules/sabyenc3/default.nix index 4ae2b044ab87..19bd3d36fc46 100644 --- a/pkgs/development/python-modules/sabyenc3/default.nix +++ b/pkgs/development/python-modules/sabyenc3/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "sabyenc3"; - version = "5.4.3"; + version = "5.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ei/SnVg4Oy6cBBPxg14lMMQBgbNR4Fg0aa+8sVBTY0Y="; + hash = "sha256-89ZfKnC8sT7xvq4P9rs7aa2uGElwNfjNT/5OWvGqL0E="; }; # Tests are not included in pypi distribution From 0d26f9369699716903e39b3b026581035ca6be9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 16:05:01 +0000 Subject: [PATCH 21/42] python310Packages.safety: 2.1.1 -> 2.2.0 --- pkgs/development/python-modules/safety/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 5394a2af99a7..1f777501bee1 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "safety"; - version = "2.1.1"; + version = "2.2.0"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-28Xf+i5H2nbMQ9/oy7v8qZ0pEY0MbFTfz6EcK9NJ3/Y="; + hash = "sha256-Z0XeEqy9YKWAAf5my1QDVRh9e5kbMBBNnvFP9OSCYHM="; }; postPatch = '' From 3027aa17015ed8f8564b97f9f3c95901e541457c Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 22 Sep 2022 12:07:36 -0400 Subject: [PATCH 22/42] stylua: 0.15.0 -> 0.15.1 --- pkgs/development/tools/stylua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index ffa548ec377e..b4465d9fa080 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x4/DmFi/6bIQVn8sfSFEOJIv4Zd/3oHKXbrd6yIsSYU="; + sha256 = "sha256-uxJsgTEvrwFfGrGv1VFoYGX9RnlqHBgUU75OlqSOEnc="; }; - cargoSha256 = "sha256-lY18so+uG3yri18zd29B479nl0l1C0F1mw+sPrccRQs="; + cargoSha256 = "sha256-FQgb9EcKEp29hl4n+A4hTdzmoEy8MfwUyt32jy1BxiY="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' From ab17e4ed4a4a35a0e430cf085d567ae0c2128e9e Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 22 Sep 2022 12:11:41 -0400 Subject: [PATCH 23/42] cargo-edit: 0.11.1 -> 0.11.2 --- pkgs/development/tools/rust/cargo-edit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 16083cc0686b..618fbee79b55 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-TqRz1Og5wsKsiIESmplnTsGLRboEQ20cViWgXfwEHGQ="; + hash = "sha256-pFQJ2ktn3sMO6DOWlBBe1pJOPytqgqX/EvjGZLnypdY="; }; - cargoSha256 = "sha256-4DVek/R7VABzSJ8vEb6f3Tgf1vVLIKAWj80Il5gWu2g="; + cargoSha256 = "sha256-uTbMiMlCq7qImM5yz1ij0dokJgIMECzdBWst8fwdaoM="; nativeBuildInputs = [ pkg-config ]; From 5e162efaf18c9b7f31c07dfaa786bd2e56f14c7f Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 22 Sep 2022 12:16:14 -0400 Subject: [PATCH 24/42] cargo-hack: 0.5.18 -> 0.5.19 --- pkgs/development/tools/rust/cargo-hack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index 08cc12967d1e..55554512e62c 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.5.18"; + version = "0.5.19"; src = fetchCrate { inherit pname version; - sha256 = "sha256-EtM5nGbsvwWiQGKrakMiToz7Hy6xoE3C6JsD2+JBpaA="; + sha256 = "sha256-uBiqmJueSNDB1wWmWvSGR9qPV5NA8yVnl+GyAea30J4="; }; - cargoSha256 = "sha256-3O9j9I6iMsgQl1nhXfdI5sNnnt71FBidQh+bqjpuPhc="; + cargoSha256 = "sha256-X7p+tBcFvDL9PEeLkl0Ab/BqpJan0wJX9WCRjHek6u0="; # some necessary files are absent in the crate version doCheck = false; From dcd7afb8728bcde5c4df7106f6f09a85f1d49d12 Mon Sep 17 00:00:00 2001 From: Benoit Louy Date: Thu, 22 Sep 2022 12:06:46 -0400 Subject: [PATCH 25/42] tree-sitter-grammars.tree-sitter-smithy: init --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../tree-sitter/grammars/tree-sitter-smithy.json | 11 +++++++++++ pkgs/development/tools/parsing/tree-sitter/update.nix | 4 ++++ 3 files changed, 16 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 18c7ebd1c3cc..9786412e9192 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -78,6 +78,7 @@ tree-sitter-scala = lib.importJSON ./tree-sitter-scala.json; tree-sitter-scheme = lib.importJSON ./tree-sitter-scheme.json; tree-sitter-scss = lib.importJSON ./tree-sitter-scss.json; + tree-sitter-smithy = lib.importJSON ./tree-sitter-smithy.json; tree-sitter-sparql = lib.importJSON ./tree-sitter-sparql.json; tree-sitter-sql = lib.importJSON ./tree-sitter-sql.json; tree-sitter-supercollider = lib.importJSON ./tree-sitter-supercollider.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json new file mode 100644 index 000000000000..dbf91927edda --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/indoorvivants/tree-sitter-smithy", + "rev": "1cdb3578dfec76f19e566ea4c1e305632e88026a", + "date": "2022-05-21T16:39:36+01:00", + "path": "/nix/store/smvp9nkdg6amfzspfj0inmfvcsjgrsjz-tree-sitter-smithy", + "sha256": "14xaflvz43m1c892jh0bg2yzsj1mrambkvsj6xkx84j141nnf4vm", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index b92eb6cca066..81c9debe84b5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -343,6 +343,10 @@ let orga = "nickel-lang"; repo = "tree-sitter-nickel"; }; + "tree-sitter-smithy" = { + orga = "indoorvivants"; + repo = "tree-sitter-smithy"; + }; }; allGrammars = From 82a923a2ce3eb986cb858b208fc17023cc7afeaa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Sep 2022 19:02:37 +0200 Subject: [PATCH 26/42] python310Packages.adafruit-platformdetect: 3.29.0 -> 3.30.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 2ba734e05621..7e8bae06a5bd 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.29.0"; + version = "3.30.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-D3uME31aWBTwjDIcdt3ueOBqlkCeTvpl4ReHLNSHaCw="; + hash = "sha256-jf7tVwv+XvaZcOKNKODRyu4JzLidBRXFd68HD5yi7b0="; }; nativeBuildInputs = [ From e96412db82e1666ddb629d6b44262fb3a46263cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Sep 2022 19:59:42 +0200 Subject: [PATCH 27/42] python310Packages.pytomorrowio: update disabled --- pkgs/development/python-modules/pytomorrowio/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytomorrowio/default.nix b/pkgs/development/python-modules/pytomorrowio/default.nix index 14daed084032..0b92b97fa5cf 100644 --- a/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/pkgs/development/python-modules/pytomorrowio/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "pytomorrowio"; version = "0.3.5"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LFIQJJPqKlqLzEoX9ShfoASigPC5R+OWiW81VmjONe8="; + hash = "sha256-LFIQJJPqKlqLzEoX9ShfoASigPC5R+OWiW81VmjONe8="; }; propagatedBuildInputs = [ @@ -29,7 +29,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pytomorrowio" ]; + pythonImportsCheck = [ + "pytomorrowio" + ]; meta = { description = "Async Python package to access the Tomorrow.io API"; From b0517e5db9faf44bcebd406cad79b4210f703216 Mon Sep 17 00:00:00 2001 From: squalus Date: Thu, 22 Sep 2022 10:59:49 -0700 Subject: [PATCH 28/42] librewolf: 104.0-1 -> 105.0-1 --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 82af5098c64a..f88da4fb48a5 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "104.0-1", + "packageVersion": "105.0-1", "source": { - "rev": "104.0-1", - "sha256": "0fvbpiaabcr1j39zc3xz1czah537s8abidwch5a75phxn676np2k" + "rev": "105.0-1", + "sha256": "0p3bcyyap8yjxha064klpjkhca6hdis3qgx15c4dh8wc3gr581f6" }, "firefox": { - "version": "104.0", - "sha512": "8778650ffa3c2d18802c348e27789f00cff143c7ca0ae01b1bcd050b6942c149db25696b48f3c702fbde901c15fcae976ac731a456f641637cae3eb56d0077d3" + "version": "105.0", + "sha512": "a48f323f874b538402630a9094daa83189b3ca319feddc80fd66d087eca13f21c8b2d85be9c29e948c18cb7c524adac44e135adcde4d4592738e104ae9c1a734" } } From b16af369a79e860f093beab798de217fe3a4b615 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 19:13:42 +0000 Subject: [PATCH 29/42] scaleway-cli: 2.5.6 -> 2.6.0 --- pkgs/tools/admin/scaleway-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index d420528fe788..9ddde03d9c85 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.5.6"; + version = "2.6.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-C7hCTDs6XLLQPUojqCJEkdSeANrW3XwfFJscSefe0OQ="; + sha256 = "sha256-wWyykSNSv6Fp+/f54LhYeArXXzRreHdqso28cM1/fl0="; }; - vendorSha256 = "sha256-NUifjoMP3AmT7RjhkilGmQTMtl5wcuPJL5I32/M27a8="; + vendorSha256 = "sha256-awq4rObflJbKjZ2tJrZZMJklXBDwTjuRE8sS3iZBefk="; ldflags = [ "-w" From 2a7d96751c5fb3732cbdf6b2155b45f594e30425 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 19:33:52 +0000 Subject: [PATCH 30/42] sdrangel: 7.6.3 -> 7.7.0 --- pkgs/applications/radio/sdrangel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 7bf472cc7e36..fece0869a0bd 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -42,13 +42,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "7.6.3"; + version = "7.7.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-4o91vZnW5+wAKw4o3RrsS4gGVG0TyQCBcKg4GuE3n5s="; + sha256 = "sha256-du5mNGMrXt6iFjb/QXQsW1DpGfIlVjqrbmsQZb4mMZQ="; fetchSubmodules = false; }; From 87810a6c2f8ec43b1170e9abb311b3bcf3fb4bb2 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 21 Sep 2022 22:12:25 -0400 Subject: [PATCH 31/42] caddy: 2.6.0 -> 2.6.1 --- pkgs/servers/caddy/default.nix | 40 ++++++++++++++++++++++---- pkgs/servers/caddy/inject_version.diff | 15 ++++++++++ 2 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 pkgs/servers/caddy/inject_version.diff diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index f30515766a74..51088486809a 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,6 +1,13 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib +, buildGoModule +, fetchFromGitHub +, nixosTests +, caddy +, testers +, installShellFiles +}: let - version = "2.6.0"; + version = "2.6.1"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; @@ -12,25 +19,46 @@ buildGoModule { pname = "caddy"; inherit version; - subPackages = [ "cmd/caddy" ]; - src = fetchFromGitHub { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - sha256 = "sha256-BZGfYpQM5e+/LrGqs1oms/vOp9q4UY/ZyDODEsi/wl8="; + sha256 = "sha256-Z8MiMhXH1er+uYvmDQiamF/jSxHbTMwjo61qbH0ioEo="; }; vendorSha256 = "sha256-6UTErIPB/z4RfndPSLKFJDFweLB3ax8WxEDA+3G5asI="; + patches = [ + ./inject_version.diff + ]; + + subPackages = [ "cmd/caddy" ]; + + ldflags = [ + "-s" "-w" + "-X github.com/caddyserver/caddy/v2.ShortVersion=${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system substituteInPlace $out/lib/systemd/system/caddy.service --replace "/usr/bin/caddy" "$out/bin/caddy" substituteInPlace $out/lib/systemd/system/caddy-api.service --replace "/usr/bin/caddy" "$out/bin/caddy" + + installShellCompletion --cmd metal \ + --bash <($out/bin/caddy completion bash) \ + --zsh <($out/bin/caddy completion zsh) ''; - passthru.tests = { inherit (nixosTests) caddy; }; + passthru.tests = { + inherit (nixosTests) caddy; + version = testers.testVersion { + command = "${caddy}/bin/caddy version"; + package = caddy; + }; + }; meta = with lib; { homepage = "https://caddyserver.com"; diff --git a/pkgs/servers/caddy/inject_version.diff b/pkgs/servers/caddy/inject_version.diff new file mode 100644 index 000000000000..3636f026a77a --- /dev/null +++ b/pkgs/servers/caddy/inject_version.diff @@ -0,0 +1,15 @@ +diff --git a/caddy.go b/caddy.go +index 584865bd..082b9b6c 100644 +--- a/caddy.go ++++ b/caddy.go +@@ -840,7 +840,10 @@ func InstanceID() (uuid.UUID, error) { + // and https://github.com/golang/go/issues/50603. + // + // This function is experimental and subject to change or removal. ++var ShortVersion = "(devel)" ++ + func Version() (simple, full string) { ++ return ShortVersion, ShortVersion + // the currently-recommended way to build Caddy involves + // building it as a dependency so we can extract version + // information from go.mod tooling; once the upstream \ No newline at end of file From b5c0e6810058af86cd898ae92a5b50160889765d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 19:58:55 +0000 Subject: [PATCH 32/42] python310Packages.twilio: 7.14.0 -> 7.14.1 --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 4b932b09e59b..b5ce76c79888 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.14.0"; + version = "7.14.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-+D2zhWm2//eWJyEpMQIZM/lL4u7o3JQjGwUebbJKjQk="; + hash = "sha256-VKAeM1a1TMXrewJ+j+Outyp7vxh9xovqjJ+GneYa6eg="; }; propagatedBuildInputs = [ From dbbe91cfd528ed67030b9d8f54b2783803fb85ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 20:04:32 +0000 Subject: [PATCH 33/42] python310Packages.types-requests: 2.28.10 -> 2.28.11 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 6cd1168e347c..51210e5abb2e 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.10"; + version = "2.28.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-l9j0CqH/4eWMNybHfWPBgtrqmnLZ8fosr96nVrKhnyw="; + sha256 = "sha256-fugn64zmEbArURfP7F2mRVNltqV19eP/GfZVumA+a04="; }; propagatedBuildInputs = [ From 06562a86166c08442dc664f401e06ff8d879174f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 20:11:53 +0000 Subject: [PATCH 34/42] python310Packages.unifi-discovery: 1.1.6 -> 1.1.7 --- pkgs/development/python-modules/unifi-discovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix index 266ae1d8769d..3b3bfe4ca979 100644 --- a/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/pkgs/development/python-modules/unifi-discovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "unifi-discovery"; - version = "1.1.6"; + version = "1.1.7"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-C7kCliNLqzkrOoT1oy3scLl3VNdDXwWEqaO0DlGZWmk="; + hash = "sha256-EQFk3kRY/JL1ZTDdHKzl0KbMUuhZSFc4tYqAYvsNSj0="; }; nativeBuildInputs = [ From 08c129fdf343787fbee7dc3dd250b414fa382681 Mon Sep 17 00:00:00 2001 From: Amanda Cameron Date: Thu, 22 Sep 2022 17:16:28 -0400 Subject: [PATCH 35/42] pleroma: Add stripDebug=false (#192472) With https://github.com/NixOS/nixpkgs/pull/191237 the debug information is getting stripped by mixRelease. This seems to break pleroma for some reason I don't understand. This commit triggers the escape hatch added by the PR, to pleroma to work again. I confirmed this with the NixOS pleroma test. --- pkgs/servers/pleroma/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 3bea304ebc9d..e4204f28f1d5 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -16,6 +16,7 @@ beamPackages.mixRelease rec { rev = "v${version}"; sha256 = "sha256-x8j/2Eot/EEHsedgZntB5MPxlYMNDlFyZtmiMdhcS7U="; }; + stripDebug = false; mixNixDeps = import ./mix.nix { inherit beamPackages lib; From 86c91dc1a407c03c67091afbc1643cb834aab788 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 22 Sep 2022 17:33:45 -0400 Subject: [PATCH 36/42] keyscope: 1.2.2 -> 1.2.3 --- pkgs/tools/security/keyscope/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/keyscope/default.nix b/pkgs/tools/security/keyscope/default.nix index d73b1b499eca..08c2ded80ad8 100644 --- a/pkgs/tools/security/keyscope/default.nix +++ b/pkgs/tools/security/keyscope/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "keyscope"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "spectralops"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SLVNzxwZhdK2Fk2Vu5P/j0d8IoUPzlb9e5hnJrZ8Qsk="; + sha256 = "sha256-RKeEumj9HuifEXE8g5G7EsIalGD1vLRawh59s/ykUmg="; }; - cargoSha256 = "sha256-PBSQeLQ7UkWhGlRID+bv2HwzgvoiJ120t/TNKJFUY+M="; + cargoSha256 = "sha256-8lTwczuOgPhzwGcQ2KoqK5Zf3HS3uwsok036l+12Xb0="; nativeBuildInputs = [ pkg-config ]; From bb79bfc2f6113364aabbebdb1c0b1a8624111826 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Sep 2022 00:12:28 +0200 Subject: [PATCH 37/42] python310Packages.motionblinds: 0.6.12 -> 0.6.13 --- pkgs/development/python-modules/motionblinds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 2742df71aa63..8ee1e026684e 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - sha256 = "sha256-QVGOVb/YbpCcPIfJbhjBXOi1c72yMwghFpFeWCy3S48="; + sha256 = "sha256-vms9GcB2GQ7fZDk9f9xvFJ5Df7ArEcKn6frIuL1GwPo="; }; propagatedBuildInputs = [ From 3dca2a876c141dfe06dbb835e0c54a991948464a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Sep 2022 00:15:47 +0200 Subject: [PATCH 38/42] python310Packages.pylutron-caseta: 0.14.0 -> 0.15.2 --- pkgs/development/python-modules/pylutron-caseta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 1bbbcf308900..d7e18191aa3f 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.14.0"; + version = "0.15.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = pname; rev = "v${version}"; - hash = "sha256-D1P4roUZ+byU031RtdwIOR/ncxY9wl9UqCKVb/XPGVk="; + hash = "sha256-dw/uCEY4+kpgNjbjgvw+kSfluziIK6NvIKo5QIjt+GQ="; }; propagatedBuildInputs = [ From 1b822ee9e04c294d99f166927cf088844d23a66c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Sep 2022 00:20:25 +0200 Subject: [PATCH 39/42] python310Packages.pylitterbot: 2022.9.5 -> 2022.9.6 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index f08235d9abdd..c0c919321c0d 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2022.9.5"; + version = "2022.9.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sTHMu2HNO0VA86bym0lt810aJ9yYN9PYHcw18Qu7e7c="; + hash = "sha256-+8vsnSEEZ7uypASsJZ2MIK+riIF01Lxa1E3t0pC+e/I="; }; nativeBuildInputs = [ From c03b4fb965f3ae76886ea64a9bf7c609e5c6695c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Sep 2022 00:25:51 +0200 Subject: [PATCH 40/42] python310Packages.pyatome: 0.1.1 -> 0.1.2 --- pkgs/development/python-modules/pyatome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatome/default.nix b/pkgs/development/python-modules/pyatome/default.nix index 7db5b4fb15eb..6d6b949a1c0e 100644 --- a/pkgs/development/python-modules/pyatome/default.nix +++ b/pkgs/development/python-modules/pyatome/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pyatome"; - version = "0.1.1"; + version = "0.1.2"; src = fetchPypi { pname = "pyAtome"; inherit version; - sha256 = "7282e7ec258c69d4ddf2a5754ff07680a1ac92f9bfb478d601fd9e944fccd834"; + sha256 = "sha256-DGkgW6emh/esZa/alUjBbpLXlU4EVIPkysn9a0LgcJ4="; }; propagatedBuildInputs = [ requests simplejson fake-useragent ]; From cea111161b02f1a823698038bfd01bc93607e391 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Sep 2022 00:28:54 +0200 Subject: [PATCH 41/42] python310Packages.pyatome: disable on older Python releases --- .../development/python-modules/pyatome/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyatome/default.nix b/pkgs/development/python-modules/pyatome/default.nix index 6d6b949a1c0e..efc0a8ba554b 100644 --- a/pkgs/development/python-modules/pyatome/default.nix +++ b/pkgs/development/python-modules/pyatome/default.nix @@ -4,21 +4,29 @@ , requests , simplejson , fake-useragent +, pythonOlder }: buildPythonPackage rec { pname = "pyatome"; version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyAtome"; inherit version; - sha256 = "sha256-DGkgW6emh/esZa/alUjBbpLXlU4EVIPkysn9a0LgcJ4="; + hash = "sha256-DGkgW6emh/esZa/alUjBbpLXlU4EVIPkysn9a0LgcJ4="; }; - propagatedBuildInputs = [ requests simplejson fake-useragent ]; + propagatedBuildInputs = [ + requests + simplejson + fake-useragent + ]; - # no tests in PyPI tarballs + # No tests in PyPI tarballs doCheck = false; pythonImportsCheck = [ From cc2a2481253e689947fe1d049d38f0bf2620a6e4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 22 Sep 2022 08:18:11 +1000 Subject: [PATCH 42/42] kubernetes: 1.23.11 -> 1.23.12 https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.23.md#changelog-since-v12311 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index d50f004a84e5..66a11329d410 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.23.11"; + version = "1.23.12"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-fjB5O3kuU09megWGgU7f3otmWD/a31xVV1Dap2+xFkw="; + sha256 = "sha256-PuSjMyve7YxxuVr3ztM6nM86gl3GpcIa+LHajzfXODU="; }; vendorSha256 = null;