From 7756df7b572ebe012cf4d331e6ebc0c55e4810d4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 3 Jun 2023 04:20:00 +0000 Subject: [PATCH 01/12] mcfly: 0.8.0 -> 0.8.1 Diff: https://github.com/cantino/mcfly/compare/v0.8.0...v0.8.1 Changelog: https://github.com/cantino/mcfly/raw/v0.8.1/CHANGELOG.txt --- pkgs/tools/misc/mcfly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index b51b83be7f42..179dbe1dec3c 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - hash = "sha256-qzi21vouUhvpmqxQpYoCnHJDLRU8ZgCvewxblD2BGJc="; + hash = "sha256-9muBKJXsXiSxSmLRygGATEbwpiz6B8oTFQIkVMJMWAk="; }; postPatch = '' @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoHash = "sha256-RHR+qmtnSrJOPkObRrE39EshmDVu53vEvw647ATk+os="; + cargoHash = "sha256-LhIAJ3JI7cp+vzEH5vthefgExPORF6Xnjj3cQkIkhSA="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; From 6c19ea9ed870498a27f517280566e85ab897fc66 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 3 Jun 2023 04:20:00 +0000 Subject: [PATCH 02/12] flexget: 3.7.2 -> 3.7.4 Diff: https://github.com/Flexget/Flexget/compare/refs/tags/v3.7.2...v3.7.4 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.7.4 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 6a0687ae17aa..e88ff00ba943 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.7.2"; + version = "3.7.4"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-K71nawQhFYLPRg79rcZKJ+US+3M5JAU0eg+ZiFwB6n8="; + hash = "sha256-x5hwuc2yXDw8qWGLRJDH4V4rmvxjBKZaogmv4SxXoz4="; }; postPatch = '' From 4288b3aa4dc793221455a7c39ba23a68a4ddd1bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 04:33:15 +0000 Subject: [PATCH 03/12] karmor: 0.13.1 -> 0.13.2 --- pkgs/applications/networking/cluster/karmor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index 304ea70963cb..481ac09c751e 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "karmor"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-HSMyGA4S8VjEA2u4TbmH+qS5ZCsWBg+aTNhAbt4S6yY="; + hash = "sha256-IKvWS1c7u1a3Fm2+uyhhgyuM680ZYiq9Xq2Tg/Y6HJo="; }; - vendorHash = "sha256-Rxm96sgdZFKuyQzT76WJHvzEM0tG2rvqnl7+umoFIMY="; + vendorHash = "sha256-xBtKKq6oUjazRac1FozRXBNRv1rFXYAulWu0Rs8ETvQ="; nativeBuildInputs = [ installShellFiles ]; From 41436adde4048bc8603b0b40346463d2ea9fe740 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 4 Jun 2023 00:41:47 +0800 Subject: [PATCH 04/12] v2ray-geoip: build from source with dbip-country-lite --- pkgs/data/misc/v2ray-geoip/default.nix | 73 ++++++++++++++++++++------ pkgs/data/misc/v2ray-geoip/update.sh | 6 --- 2 files changed, 57 insertions(+), 22 deletions(-) delete mode 100755 pkgs/data/misc/v2ray-geoip/update.sh diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index d7bb9226253d..5dbaa6c9c93b 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -1,28 +1,69 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenvNoCC +, fetchFromGitHub +, pkgsBuildBuild +, jq +, moreutils +, dbip-country-lite +}: -stdenv.mkDerivation rec { - pname = "v2ray-geoip"; - version = "202306010100"; +let + generator = pkgsBuildBuild.buildGoModule { + pname = "v2ray-geoip"; + version = "unstable-2023-03-27"; - src = fetchFromGitHub { - owner = "v2fly"; - repo = "geoip"; - rev = "d8faa6ba0754c083a89898610942d1d1d978ef7f"; - sha256 = "sha256-Aumk+YPsxZl3F/DQv6w0rE5f5hduLNYApCKQIvRUSIw="; + src = fetchFromGitHub { + owner = "v2fly"; + repo = "geoip"; + rev = "9321a7f5e301a957228eba44845144b4555b6658"; + hash = "sha256-S30XEgzA9Vrq7I7REfO/WN/PKpcjcI7KZnrL4uw/Chs="; + }; + + vendorHash = "sha256-bAXeA1pDIUuEvzTLydUIX6S6fm6j7CUQmBG+7xvxUcc="; + + meta = with lib; { + description = "GeoIP for V2Ray"; + homepage = "https://github.com/v2fly/geoip"; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ nickcao ]; + }; }; + input = { + type = "maxmindMMDB"; + action = "add"; + args = { + uri = dbip-country-lite.mmdb; + }; + }; +in +stdenvNoCC.mkDerivation { + inherit (generator) pname src; + inherit (dbip-country-lite) version; + + nativeBuildInputs = [ + jq + moreutils + ]; + + postPatch = '' + jq '.input[0] |= ${builtins.toJSON input}' config.json | sponge config.json + ''; + + buildPhase = '' + runHook preBuild + ${generator}/bin/geoip + runHook postBuild + ''; installPhase = '' runHook preInstall - install -m 0644 geoip.dat -D $out/share/v2ray/geoip.dat + install -Dm444 -t "$out/share/v2ray" output/dat/{cn,geoip-only-cn-private,geoip,private}.dat runHook postInstall ''; - passthru.updateScript = ./update.sh; + passthru.generator = generator; - meta = with lib; { - description = "GeoIP for V2Ray"; - homepage = "https://github.com/v2fly/geoip"; - license = licenses.cc-by-sa-40; - maintainers = with maintainers; [ nickcao ]; + meta = generator.meta // { + inherit (dbip-country-lite.meta) license; }; } diff --git a/pkgs/data/misc/v2ray-geoip/update.sh b/pkgs/data/misc/v2ray-geoip/update.sh deleted file mode 100755 index e39012e30a51..000000000000 --- a/pkgs/data/misc/v2ray-geoip/update.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p common-updater-scripts curl jq -set -euo pipefail - -COMMIT=$(curl "https://api.github.com/repos/v2fly/geoip/commits/release?per_page=1") -update-source-version v2ray-geoip "$(echo $COMMIT | jq -r .commit.message)" --file=pkgs/data/misc/v2ray-geoip/default.nix --rev="$(echo $COMMIT | jq -r .sha)" From 344c56d53208b21fe3d9293c4e4ef332d79341c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 18:37:18 +0000 Subject: [PATCH 05/12] pachyderm: 2.6.0 -> 2.6.1 --- pkgs/applications/networking/cluster/pachyderm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index f0333e3b5fe1..b21b50397e9e 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-QWlNDnhcFXfCtX4J0V/hq6nFN0RjzYv29mI2zE2fyFo="; + hash = "sha256-C3qzf/+A1pYTYR3FMtUuqZNU+j8oOHSBLDfyuWYCh5I="; }; vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY="; From 489e8c837eb02bc3b8aee210955f16d5e7fc3349 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 18:53:53 +0000 Subject: [PATCH 06/12] ginkgo: 2.9.5 -> 2.9.7 --- pkgs/development/tools/ginkgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index cad04204916b..87bab08fd813 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.9.5"; + version = "2.9.7"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-1Hb8pCvPs/L5UU280XwwEOnQ1CjJjgw0+GdCbtLkIpg="; + sha256 = "sha256-+Wkd0+RSNnJb1ganYGhnRdLZGofTwWtDEN82dhc6HPc="; }; - vendorHash = "sha256-IxyPRUS7aqkfZ+hjtuopCd95dgiTgVdg1thSiTBZArg="; + vendorHash = "sha256-x4IghXr80sDPZhe97Q+04Mfcnvku/S/tNPZ9RSUmiVE="; # integration tests expect more file changes # types tests are missing CodeLocation From db7534df5fb9b7dfd3404ec26d977997ff2cc1a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Jun 2023 00:42:14 +0200 Subject: [PATCH 07/12] python310Packages.python-ecobee-api: 0.2.16 -> 0.2.17 --- pkgs/development/python-modules/python-ecobee-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix index e287d7490b99..644acb8a4883 100644 --- a/pkgs/development/python-modules/python-ecobee-api/default.nix +++ b/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-ecobee-api"; - version = "0.2.16"; + version = "0.2.17"; src = fetchPypi { inherit pname version; - hash = "sha256-wzL1WylQAFLxWu3lDFqQtLxJbQjse4OX/fbzaaEuvGQ="; + hash = "sha256-lJCbNOQJ8xmMa4V+tSFZx4QasK8ZLfsFavMP9Zge4K4="; }; propagatedBuildInputs = [ From 93a55a32ab29064132855e0e62b554fdef1fe528 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 23:47:05 +0000 Subject: [PATCH 08/12] ooniprobe-cli: 3.17.2 -> 3.17.3 --- pkgs/tools/networking/ooniprobe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index 0e76413a261a..d665d5813600 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.17.2"; + version = "3.17.3"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-wPvWIeanozLQwgDlU3WR11NYhIpjw04vj7DlnFlacNw="; + hash = "sha256-kqjTYowAEfJ+um9DQQXIMLVWlEGJ9intbdTSJukSvVc="; }; - vendorHash = "sha256-r8kyL9gpdDesY8Mbm4lONAhWC4We26Z9uG7QMt1JT9c="; + vendorHash = "sha256-kS5HWiATn2WT6E5gb0Gve83hHJ++xHmPSsgJu/5GqO4="; subPackages = [ "cmd/ooniprobe" ]; From a1bc1cbf8e5a7bc966143bb425e109531cc522ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Jun 2023 23:56:58 +0000 Subject: [PATCH 09/12] act: 0.2.45 -> 0.2.46 --- pkgs/development/tools/misc/act/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index e395645c9bce..932c6892d085 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.45"; + version = "0.2.46"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mp5+hDSZsp46WMCCqVoorKSHeoQY/+ORtj0fNrKsFWI="; + hash = "sha256-74ap3UgAFrt/ZrSMECdL3Mu26/53VWUEAUnqHw3oJDU="; }; - vendorHash = "sha256-37fHVy4NLhWyk1yD9zSNnZoVVyd2QizzDCDbiNJCBlc="; + vendorHash = "sha256-OYBFaosO1PKoN236pMFauC0ensnoFDlmAKVWd9OwLHU="; doCheck = false; From 50d66bcba638b527a02a4aee21fb91e6f5f1eb67 Mon Sep 17 00:00:00 2001 From: Tom Siewert Date: Sun, 4 Jun 2023 02:32:35 +0200 Subject: [PATCH 10/12] nixos/gitlab: Fix config reference for registry (#235639) Support for gitlab-container-registry has been added in 014816cbe469. However, when enabling the registry it will throw an error as it can't find a `package` attribute. This commit fixes the registry configuration by adding the missing `registry` part. --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index bf0a12007447..9c18a2eed1c6 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1231,7 +1231,7 @@ in { services.dockerRegistry = optionalAttrs cfg.registry.enable { enable = true; enableDelete = true; # This must be true, otherwise GitLab won't manage it correctly - package = cfg.package; + package = cfg.registry.package; extraConfig = { auth.token = { realm = "http${optionalString (cfg.https == true) "s"}://${cfg.host}/jwt/auth"; From 11c4eb0873a62618487c6f06f09ad4ac3f49cfaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jun 2023 00:44:55 +0000 Subject: [PATCH 11/12] granted: 0.11.1 -> 0.13.0 --- pkgs/tools/admin/granted/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index c21965aa0bbb..ed2bc901826d 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "granted"; - version = "0.11.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m6cFAX8FMyv9H1IKm6meWu2yNEZz4g1Q+h2rRijYJsc="; + sha256 = "sha256-UoU2+RBR6vBLRx5gJsVUswoEtZ8chCn+bSv+k4SCGyU="; }; - vendorSha256 = "sha256-8BPntTgd7QqO2T3vyWXC1z5yE/ovg3D3iilnislqV30="; + vendorHash = "sha256-P7HeJUdVlqrTEMVXGlvcCr9ezEmqIw5AX/+xdcFQoH4="; nativeBuildInputs = [ makeWrapper ]; From 1f231abe57afe462b11a18aa72db1f2141c19d65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Jun 2023 03:21:21 +0000 Subject: [PATCH 12/12] fastp: 0.23.3 -> 0.23.4 --- pkgs/applications/science/biology/fastp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/fastp/default.nix b/pkgs/applications/science/biology/fastp/default.nix index 0fd3dded09b3..e7fc0d4a35f1 100644 --- a/pkgs/applications/science/biology/fastp/default.nix +++ b/pkgs/applications/science/biology/fastp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "fastp"; - version = "0.23.3"; + version = "0.23.4"; src = fetchFromGitHub { owner = "OpenGene"; repo = "fastp"; rev = "v${version}"; - sha256 = "sha256-9YHm5LIKJJpMavlWMZXD5ZgTgT5w9eXuXwQVa/prux8="; + sha256 = "sha256-hkCo8CiZNJuVcL9Eg/R7YzM7/FEcGEnovV325oWa7y8="; }; buildInputs = [ zlib libdeflate isa-l ];