From 6df79a104ac310baed6f44c1d106a016e3bf7854 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 15 Jun 2025 23:34:04 +0200 Subject: [PATCH 01/48] converged-security-suite: init at 2.8.1 Signed-off-by: Felix Singer --- .../co/converged-security-suite/package.nix | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/co/converged-security-suite/package.nix diff --git a/pkgs/by-name/co/converged-security-suite/package.nix b/pkgs/by-name/co/converged-security-suite/package.nix new file mode 100644 index 000000000000..3a443b5ea733 --- /dev/null +++ b/pkgs/by-name/co/converged-security-suite/package.nix @@ -0,0 +1,49 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: + +buildGoModule (finalAttrs: { + pname = "converged-security-suite"; + + version = "2.8.1"; + + src = fetchFromGitHub { + owner = "9elements"; + repo = "converged-security-suite"; + tag = "v${finalAttrs.version}"; + hash = "sha256-/TsKKBrwiwPVyfmDvzouVRyAPLVPsLZFmIIzl0gJWL4="; + }; + + vendorHash = "sha256-p1r6LS0h5NbUdGUHEPtZydXNOjyz7jXegmbFBl38MEI="; + + subPackages = [ + "cmd/core/bg-prov" + "cmd/core/bg-suite" + "cmd/core/txt-prov" + "cmd/core/txt-suite" + "cmd/exp/amd-suite" + "cmd/exp/pcr0tool" + ]; + + ldflags = [ + "-s" + "-w" + ]; + + checkPhase = '' + go test -v ./pkg/... + ''; + + meta = { + homepage = "https://github.com/9elements/converged-security-suite"; + changelog = "https://github.com/9elements/converged-security-suite/releases/tag/v${finalAttrs.version}"; + description = "Converged Security Suite for Intel & AMD platform security features"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + felixsinger + ]; + mainProgram = "bg-prov"; + }; +}) From b492714eda0ac1ccbb1e38657b108225689b75b7 Mon Sep 17 00:00:00 2001 From: Different Date: Mon, 23 Jun 2025 06:13:01 +1000 Subject: [PATCH 02/48] maintainers: add different-name --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 664ee433104b..43a97832648a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6372,6 +6372,12 @@ github = "dietmarw"; githubId = 9332; }; + different-name = { + name = "different-name"; + email = "hello@different-name.dev"; + github = "different-name"; + githubId = 49257026; + }; diffumist = { email = "git@diffumist.me"; github = "Diffumist"; From 9895036cfc18dbd18ddcb04d7d6c373fd56576e1 Mon Sep 17 00:00:00 2001 From: Different Date: Mon, 23 Jun 2025 06:13:20 +1000 Subject: [PATCH 03/48] python3Packages.useful-types: init at 0.2.1 useful-types is a Python library for composing runtime type checks. Changelog: https://github.com/hauntsaninja/useful_types/blob/v0.2.1/CHANGELOG.md --- .../python-modules/useful-types/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/useful-types/default.nix diff --git a/pkgs/development/python-modules/useful-types/default.nix b/pkgs/development/python-modules/useful-types/default.nix new file mode 100644 index 000000000000..32434c202563 --- /dev/null +++ b/pkgs/development/python-modules/useful-types/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + flit-core, + typing-extensions, +}: +buildPythonPackage rec { + pname = "useful-types"; + version = "0.2.1"; + format = "pyproject"; + + src = fetchPypi { + inherit version; + pname = "useful_types"; + hash = "sha256-hwoLzI/LfQsvFAVUOMHKt+JI/e2UKwlDpNcBnn+72s0="; + }; + + build-system = [ + flit-core + ]; + + dependencies = [ + typing-extensions + ]; + + pythonImportsCheck = [ "useful_types" ]; + + meta = { + description = "Useful types for Python"; + homepage = "https://github.com/hauntsaninja/useful_types"; + changelog = "https://github.com/hauntsaninja/useful_types/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ different-name ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 954c54da7583..eb33d98c2de3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18902,6 +18902,8 @@ self: super: with self; { usbtmc = callPackage ../development/python-modules/usbtmc { }; + useful-types = callPackage ../development/python-modules/useful-types { }; + user-agents = callPackage ../development/python-modules/user-agents { }; userpath = callPackage ../development/python-modules/userpath { }; From dea8b612186514a574c35c726ff6925af4c09527 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 27 Jun 2025 14:31:48 +0200 Subject: [PATCH 04/48] cdrtools: unpin llvmPackages_14 --- pkgs/tools/cd-dvd/cdrtools/default.nix | 14 ++++++++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix index 6ac321e61fc6..1b8e568b1bab 100644 --- a/pkgs/tools/cd-dvd/cdrtools/default.nix +++ b/pkgs/tools/cd-dvd/cdrtools/default.nix @@ -22,10 +22,16 @@ stdenv.mkDerivation rec { libcap ]; - env.CFLAGS = toString [ - "-Wno-error=implicit-int" - "-Wno-error=implicit-function-declaration" - ]; + env.NIX_CFLAGS_COMPILE = toString ( + [ + "-Wno-error=implicit-int" + "-Wno-error=implicit-function-declaration" + ] + # https://github.com/macports/macports-ports/commit/656932616eebe60f4e8cfd96d8268801dad8224d + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + "-DNO_SCANSTACK" + ] + ); postPatch = '' sed "/\.mk3/d" -i libschily/Targets.man diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fe50aec5a33..5df52cad410a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2505,9 +2505,7 @@ with pkgs; cdist = python3Packages.callPackage ../tools/admin/cdist { }; - cdrtools = callPackage ../tools/cd-dvd/cdrtools { - stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_14.stdenv else stdenv; - }; + cdrtools = callPackage ../tools/cd-dvd/cdrtools { }; cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { }; From e46de4648ac3ab96226eff2af82fbed76273910d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 27 Jun 2025 14:32:32 +0200 Subject: [PATCH 05/48] cdrtools: add wegank as maintainer --- pkgs/tools/cd-dvd/cdrtools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/cd-dvd/cdrtools/default.nix b/pkgs/tools/cd-dvd/cdrtools/default.nix index 1b8e568b1bab..3f61dd45854d 100644 --- a/pkgs/tools/cd-dvd/cdrtools/default.nix +++ b/pkgs/tools/cd-dvd/cdrtools/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { gpl2Plus lgpl21 ]; + maintainers = with maintainers; [ wegank ]; platforms = with platforms; linux ++ darwin; # Licensing issues: This package contains code licensed under CDDL, GPL2 # and LGPL2. There is a debate regarding the legality of distributing this From 36c44da00537c266345d91b67581e9f1c15c383a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 28 Jun 2025 16:27:00 +0200 Subject: [PATCH 06/48] vectorcode: 0.6.12 -> 0.7.4 Diff: https://github.com/Davidyz/VectorCode/compare/refs/tags/0.6.12...refs/tags/0.7.4 Changelog: https://github.com/Davidyz/VectorCode/releases/tag/0.7.4 --- .../vim/plugins/non-generated/vectorcode-nvim/default.nix | 4 ++++ pkgs/by-name/ve/vectorcode/package.nix | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vectorcode-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vectorcode-nvim/default.nix index ac8e52fdfbbc..e928846098f7 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/vectorcode-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/vectorcode-nvim/default.nix @@ -27,6 +27,10 @@ vimUtils.buildVimPlugin { cp -r ../lua . ''; + checkInputs = [ + vimPlugins.codecompanion-nvim + ]; + meta = { description = "Index and navigate your code repository using vectorcode"; homepage = "https://github.com/Davidyz/VectorCode/blob/main/docs/neovim.md"; diff --git a/pkgs/by-name/ve/vectorcode/package.nix b/pkgs/by-name/ve/vectorcode/package.nix index a54aac009134..f58cb9430cbb 100644 --- a/pkgs/by-name/ve/vectorcode/package.nix +++ b/pkgs/by-name/ve/vectorcode/package.nix @@ -92,14 +92,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "vectorcode"; - version = "0.6.12"; + version = "0.7.4"; pyproject = true; src = fetchFromGitHub { owner = "Davidyz"; repo = "VectorCode"; tag = version; - hash = "sha256-7RI5F7r4yX3wqAuakdBvZOvDRWn8IHntU0fyTPIXjT4="; + hash = "sha256-N74XBQahUIj0rKJI0emtNvGlG9uYkeHqweppp8fUSLU="; }; build-system = with python.pkgs; [ From 1d49e9d6c5cf0fb01dea87622f1e8687557513ab Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 29 Jun 2025 11:48:18 +0200 Subject: [PATCH 07/48] vectorcode: mark as broken on aarch64-linux --- pkgs/by-name/ve/vectorcode/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ve/vectorcode/package.nix b/pkgs/by-name/ve/vectorcode/package.nix index f58cb9430cbb..7af4424e2569 100644 --- a/pkgs/by-name/ve/vectorcode/package.nix +++ b/pkgs/by-name/ve/vectorcode/package.nix @@ -167,12 +167,6 @@ python.pkgs.buildPythonApplication rec { }; ''; - # Test collection breaks on aarch64-linux, because the transitive onnxruntime - # tries to read /sys/devices/system/cpu, which does not exist in the sandbox. - # - # We inherit the issue from chromadb, so inherit its `doCheck` attribute. - inherit (python.pkgs.chromadb) doCheck; - pythonImportsCheck = [ "vectorcode" ]; nativeCheckInputs = @@ -207,5 +201,16 @@ python.pkgs.buildPythonApplication rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "vectorcode"; + badPlatforms = [ + # Error in cpuinfo: failed to parse the list of possible processors in /sys/devices/system/cpu/possible + # Error in cpuinfo: failed to parse the list of present processors in /sys/devices/system/cpu/present + # Error in cpuinfo: failed to parse both lists of possible and present processors + # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' + # what(): /build/source/include/onnxruntime/core/common/logging/logging.h:371 static const onnxruntime::logging::Logger& onnxruntime::logging::LoggingManager::DefaultLogger() Attempt to use DefaultLogger but none has been registered. + # + # Since 0.7.4, disabling `pythonImportsCheck` and `pytestCheckPhase` is not enough anymore. + # The error above happens at the end of `pypaInstallPhase`. + "aarch64-linux" + ]; }; } From 068033a134504c4ca235694e31167e8bf22b625a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jun 2025 15:39:51 +0000 Subject: [PATCH 08/48] splitcode: 0.31.2 -> 0.31.3 --- pkgs/by-name/sp/splitcode/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/splitcode/package.nix b/pkgs/by-name/sp/splitcode/package.nix index 5e59f7c88be9..7de43dca3747 100644 --- a/pkgs/by-name/sp/splitcode/package.nix +++ b/pkgs/by-name/sp/splitcode/package.nix @@ -8,7 +8,7 @@ nix-update-script, }: let - version = "0.31.2"; + version = "0.31.3"; in stdenv.mkDerivation { pname = "splitcode"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "pachterlab"; repo = "splitcode"; tag = "v${version}"; - hash = "sha256-fIx8EXdhkIkWmb86HKlUPSgsKvbGcrKsuNMWo8kU+Aw="; + hash = "sha256-EEYjBo52jPCSnv5WSGsXhfZEjsBCHdGerVPOZfShXBU="; }; nativeBuildInputs = [ cmake ]; From 96cb06e818eb92132ec1648ce1ead9ed95b8158d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jun 2025 21:07:21 +0000 Subject: [PATCH 09/48] sherlock-launcher: 0.1.13-hotfix-1 -> 0.1.13-hotfix-2 --- pkgs/by-name/sh/sherlock-launcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/sherlock-launcher/package.nix b/pkgs/by-name/sh/sherlock-launcher/package.nix index 59579a156e9c..6d932b37ed7e 100644 --- a/pkgs/by-name/sh/sherlock-launcher/package.nix +++ b/pkgs/by-name/sh/sherlock-launcher/package.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sherlock-launcher"; - version = "0.1.13-hotfix-1"; + version = "0.1.13-hotfix-2"; src = fetchFromGitHub { owner = "Skxxtz"; repo = "sherlock"; tag = "v${finalAttrs.version}"; - hash = "sha256-h8/72EipLTssik2I4GSfBRSc34ecAm0L39wA9hnGrR4="; + hash = "sha256-5ERCusCDf+GCwmJc5BrEK8Kn5ClMOILBStv17vyS7MQ="; }; nativeBuildInputs = [ From 752706cc274d22aa73d25b22736de602863fe7ae Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 30 Jun 2025 16:43:53 +0200 Subject: [PATCH 10/48] python3Packages.ase: cleanup, skip failing test --- .../python-modules/ase/default.nix | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index f468c370481e..a512bc2ae135 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -1,21 +1,29 @@ { lib, stdenv, - fetchPypi, buildPythonPackage, isPy27, + fetchPypi, pythonAtLeast, + + # build-system setuptools, - numpy, - scipy, - matplotlib, + + # dependencies flask, + matplotlib, + numpy, pillow, psycopg2, + scipy, tkinter, + + # tests + addBinToPathHook, pytestCheckHook, pytest-mock, pytest-xdist, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -34,24 +42,30 @@ buildPythonPackage rec { dependencies = [ - numpy - scipy - matplotlib flask + matplotlib + numpy pillow psycopg2 + scipy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ tkinter ]; nativeCheckInputs = [ + addBinToPathHook pytestCheckHook pytest-mock pytest-xdist + writableTmpDirAsHomeHook ]; disabledTests = [ + # AssertionError: assert (1 != 0) == False + # TypeError: list indices must be integers or slices, not numpy.bool + "test_long" + "test_fundamental_params" "test_ase_bandstructure" "test_imports" @@ -64,16 +78,12 @@ buildPythonPackage rec { "test_ipi_protocol" # flaky ] ++ lib.optionals (pythonAtLeast "3.12") [ "test_info_calculators" ]; - preCheck = '' - export PATH="$out/bin:$PATH" - ''; - pythonImportsCheck = [ "ase" ]; - meta = with lib; { + meta = { description = "Atomic Simulation Environment"; homepage = "https://wiki.fysik.dtu.dk/ase/"; - license = licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; maintainers = [ ]; }; } From 21963fd6602180da8fb9ebdd6175e4e33a59053b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Jul 2025 02:12:05 +0000 Subject: [PATCH 11/48] grpc-client-cli: 1.22.3 -> 1.22.4 --- pkgs/by-name/gr/grpc-client-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grpc-client-cli/package.nix b/pkgs/by-name/gr/grpc-client-cli/package.nix index 6d809d2ccfee..5ec717a8126f 100644 --- a/pkgs/by-name/gr/grpc-client-cli/package.nix +++ b/pkgs/by-name/gr/grpc-client-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grpc-client-cli"; - version = "1.22.3"; + version = "1.22.4"; src = fetchFromGitHub { owner = "vadimi"; repo = "grpc-client-cli"; rev = "v${version}"; - sha256 = "sha256-6dUdyBmwX97Xvy7CYMUrpQxG25uPFyPFhwFI3QMzWtU="; + sha256 = "sha256-xZjVKVbVSchsnAH9DC68IHAqIG6W3DrF5L3Vt+pbyTU="; }; - vendorHash = "sha256-Iiifu0dYgeqWUgWRjJ3uaBL6SyYl2Ehqzk+1COO/XXI="; + vendorHash = "sha256-XhbmyPZ0GFNRfnHBfMxgSXNLPoCE85e52xcQFhqOrl4="; meta = with lib; { description = "generic gRPC command line client"; From a12acc270878ae69b42332e11c6de14eb99dacde Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 1 Jul 2025 11:46:48 +0200 Subject: [PATCH 12/48] aravis: 0.8.34 -> 0.8.35 https://github.com/AravisProject/aravis/releases/tag/0.8.35 --- pkgs/by-name/ar/aravis/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/aravis/package.nix b/pkgs/by-name/ar/aravis/package.nix index 5447efb9e304..a16eb1fb6600 100644 --- a/pkgs/by-name/ar/aravis/package.nix +++ b/pkgs/by-name/ar/aravis/package.nix @@ -30,13 +30,13 @@ assert enableViewer -> wrapGAppsHook3 != null; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.8.34"; + version = "0.8.35"; src = fetchFromGitHub { owner = "AravisProject"; repo = "aravis"; tag = version; - hash = "sha256-6tCV2QyzlMNnkXlRz41JT05FeBcRckHXM50VGY5/BnM="; + hash = "sha256-RRIYZHtljZ44s1kmmUI1KMx92+PLLI/eCJRs4m0+egg="; }; outputs = [ @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { ''; # the documentation is the best working homepage that's not the Github repo homepage = "https://aravisproject.github.io/docs/aravis-0.8"; - license = lib.licenses.lgpl2; + license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ tpw_rules ]; platforms = lib.platforms.unix; }; From eddc5aec80961ed451a6e16dfdb7ff050b5219ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Jul 2025 10:03:36 +0000 Subject: [PATCH 13/48] fleet: 4.69.0 -> 4.70.0 --- pkgs/by-name/fl/fleet/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix index e4a1303f71d6..eae52ef9bf84 100644 --- a/pkgs/by-name/fl/fleet/package.nix +++ b/pkgs/by-name/fl/fleet/package.nix @@ -7,15 +7,15 @@ buildGoModule (finalAttrs: { pname = "fleet"; - version = "4.69.0"; + version = "4.70.0"; src = fetchFromGitHub { owner = "fleetdm"; repo = "fleet"; tag = "fleet-v${finalAttrs.version}"; - hash = "sha256-3++w9AG70UMO6ProIBedhMs5q7Pk+pg8J50yIhnEzEM="; + hash = "sha256-wUyKxG6sJ0UBtrA3LOi+48kLi3cY6wZHYt/nfGf6pWU="; }; - vendorHash = "sha256-ZdkpgZbXchDp5kiEgCsSsd3/ltltSRjOuTPOhiBEloc="; + vendorHash = "sha256-mlZO7wxZamI7xjvZ+ncTkiqTsXhNhjjE0JI5+8bPbv0="; subPackages = [ "cmd/fleet" From 4d07773b8fb993a5c4a803de4033758e55535faf Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Tue, 1 Jul 2025 19:16:44 +0000 Subject: [PATCH 14/48] animeko: fix --- pkgs/by-name/an/animeko/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix index 6e82bdb631b8..df57d3a8209b 100644 --- a/pkgs/by-name/an/animeko/package.nix +++ b/pkgs/by-name/an/animeko/package.nix @@ -209,6 +209,7 @@ stdenv.mkDerivation (finalAttrs: { "libFLAC.so.12" "libtheoradec.so.1" "libtheoraenc.so.1" + "libxml2.so.2" ]; dontWrapQtApps = true; From 00814c9389cbd36bcd445bbb9d21a3dfbc77d9e2 Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 2 Jul 2025 04:11:33 +0800 Subject: [PATCH 15/48] python312Packages.adios2: fix build Catalyst with pythonSupport propagates the python include header to adios2. This causes a mismatch if Catalyst and adios2 are built with different Python versions. Ensure Catalyst uses the same Python package as adios2 to fix the build when using python312Packages.adios2. --- pkgs/by-name/ad/adios2/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix index 57a752309cea..70a6eaa513aa 100644 --- a/pkgs/by-name/ad/adios2/package.nix +++ b/pkgs/by-name/ad/adios2/package.nix @@ -39,7 +39,12 @@ let cppSupport = !mpiSupport; }; catalyst = catalyst.override { - inherit mpi mpiSupport pythonSupport; + inherit + mpi + mpiSupport + python3Packages + pythonSupport + ; }; mpi4py = python3Packages.mpi4py.override { inherit mpi; }; }; From 5e0368d0ce41a10c1f2ca7b4474745f6775c8835 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 2 Jul 2025 10:37:17 +0900 Subject: [PATCH 16/48] morewaita-icon-theme: 48.2 -> 48.3 Diff: https://github.com/somepaulo/MoreWaita/compare/v48.2...v48.3 --- .../fix-broken-symlinks.patch | 48 ------------------- .../mo/morewaita-icon-theme/package.nix | 15 ++---- 2 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 pkgs/by-name/mo/morewaita-icon-theme/fix-broken-symlinks.patch diff --git a/pkgs/by-name/mo/morewaita-icon-theme/fix-broken-symlinks.patch b/pkgs/by-name/mo/morewaita-icon-theme/fix-broken-symlinks.patch deleted file mode 100644 index 4c7e42f4afb6..000000000000 --- a/pkgs/by-name/mo/morewaita-icon-theme/fix-broken-symlinks.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Kenichi Kamiya -Date: Sun, 15 Jun 2025 10:35:51 +0900 -Subject: [PATCH] Fix broken symlinks - ---- - scalable/apps/gnome-character-map.svg | 2 +- - symbolic/apps/pamac-manager-symbolic.svg | 2 +- - symbolic/apps/pamac-symbolic.svg | 2 +- - symbolic/apps/pamac-updater-symbolic.svg | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/scalable/apps/gnome-character-map.svg b/scalable/apps/gnome-character-map.svg -index f04d4679adb66b897b42396e75896f4c46199c24..d400f7677eefaa10db958bb324247825d8c3578e 120000 ---- a/scalable/apps/gnome-character-map.svg -+++ b/scalable/apps/gnome-character-map.svg -@@ -1 +1 @@ --accessories-character-map.svg -\ No newline at end of file -+../legacy/accessories-character-map.svg -\ No newline at end of file -diff --git a/symbolic/apps/pamac-manager-symbolic.svg b/symbolic/apps/pamac-manager-symbolic.svg -index 758557a5c791b43de172d29f466fe6b6cb9d5207..106458e72401668bca4b9457cd6c2eff9ea7e4e2 120000 ---- a/symbolic/apps/pamac-manager-symbolic.svg -+++ b/symbolic/apps/pamac-manager-symbolic.svg -@@ -1 +1 @@ --system-software-install-symbolic.svg -\ No newline at end of file -+../legacy/system-software-install-symbolic.svg -\ No newline at end of file -diff --git a/symbolic/apps/pamac-symbolic.svg b/symbolic/apps/pamac-symbolic.svg -index 758557a5c791b43de172d29f466fe6b6cb9d5207..106458e72401668bca4b9457cd6c2eff9ea7e4e2 120000 ---- a/symbolic/apps/pamac-symbolic.svg -+++ b/symbolic/apps/pamac-symbolic.svg -@@ -1 +1 @@ --system-software-install-symbolic.svg -\ No newline at end of file -+../legacy/system-software-install-symbolic.svg -\ No newline at end of file -diff --git a/symbolic/apps/pamac-updater-symbolic.svg b/symbolic/apps/pamac-updater-symbolic.svg -index 758557a5c791b43de172d29f466fe6b6cb9d5207..106458e72401668bca4b9457cd6c2eff9ea7e4e2 120000 ---- a/symbolic/apps/pamac-updater-symbolic.svg -+++ b/symbolic/apps/pamac-updater-symbolic.svg -@@ -1 +1 @@ --system-software-install-symbolic.svg -\ No newline at end of file -+../legacy/system-software-install-symbolic.svg -\ No newline at end of file diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index 66a8d865ae1a..4550ba0ea206 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -8,26 +8,17 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "morewaita-icon-theme"; - version = "48.2"; + version = "48.3"; src = fetchFromGitHub { owner = "somepaulo"; repo = "MoreWaita"; tag = "v${finalAttrs.version}"; - hash = "sha256-eCMU5RNlqHN6tImGd2ur+rSC+kR5xQ8Zh4BaRgjBHVc="; + hash = "sha256-ywZSRNXVxjs5l5UO4yvNZ7q7PRlaLNi/2+HSNhe8e5w="; }; - patches = [ - # Avoiding "ERROR: noBrokenSymlinks". ref: https://github.com/somepaulo/MoreWaita/pull/335 - ./fix-broken-symlinks.patch - ]; - postPatch = '' patchShebangs install.sh - - # Replace this workaround if https://github.com/somepaulo/MoreWaita/pull/339 is merged - substituteInPlace install.sh \ - --replace-fail '"''${HOME}/.local/share/' '"$out/share/' ''; nativeBuildInputs = [ @@ -38,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - ./install.sh + THEMEDIR="$out/share/icons/MoreWaita" ./install.sh runHook postInstall ''; From e795b424aa66c11fd5757546fffe44a8a19d99ed Mon Sep 17 00:00:00 2001 From: blackzeshi <105582686+zeshi09@users.noreply.github.com> Date: Wed, 2 Jul 2025 11:14:25 +0500 Subject: [PATCH 17/48] caido: 0.48.1 -> 0.49.0 --- pkgs/by-name/ca/caido/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index c9953ffc5013..2ed7a1a07b8d 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -15,14 +15,14 @@ let "cli" "desktop" ]; - version = "0.48.1"; + version = "0.49.0"; cli = fetchurl { url = "https://caido.download/releases/v${version}/caido-cli-v${version}-linux-x86_64.tar.gz"; - hash = "sha256-UdeC3BZmQVUdWmwQTC27ptF0+lZgCXpF8yXaf8Bjpbo="; + hash = "sha256-pPFTN/KjwZZXJvFHttw3dQr7AQnIIEkyxlsWEx61Kbc="; }; desktop = fetchurl { url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; - hash = "sha256-4KQpgO8Cb+TkKuDOK+bAE0nOhlwjkSUVXLHJmHaj6NQ="; + hash = "sha256-bvK2SdFrIpX/cJghwW0QJ6wkTndRIZZ3qf7dHqeZTgY="; }; appimageContents = appimageTools.extractType2 { inherit pname version; From 86dfe6fb8ed8246ed2aa2f49b2fc775eea939c06 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Wed, 2 Jul 2025 10:51:30 +0300 Subject: [PATCH 18/48] mattermost-desktop: 5.11.2 -> 5.12.1 --- pkgs/by-name/ma/mattermost-desktop/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix index 2ce3996a482d..b3bd0df9b95e 100644 --- a/pkgs/by-name/ma/mattermost-desktop/package.nix +++ b/pkgs/by-name/ma/mattermost-desktop/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, buildNpmPackage, - electron_34, + electron_35, makeWrapper, testers, mattermost-desktop, @@ -10,21 +10,21 @@ }: let - electron = electron_34; + electron = electron_35; in buildNpmPackage rec { pname = "mattermost-desktop"; - version = "5.11.2"; + version = "5.12.1"; src = fetchFromGitHub { owner = "mattermost"; repo = "desktop"; tag = "v${version}"; - hash = "sha256-03874pV7/GqydMdaSlh3N17LsbHppfPdYJ8nGdbvvbk="; + hash = "sha256-Sn6gKkeN+wRgTnFtQ9ewAFvRsRdXVo11ibaxFvSG7dg="; }; - npmDepsHash = "sha256-v6XEJJ9kozkY7HSLNJtM+86+36G7wt8xIFwCyO7x11Y="; + npmDepsHash = "sha256-U6pmvSfps1VzKFnzJ0yij2r0uLrtnujZv+LVediX1Bo="; npmBuildScript = "build-prod"; makeCacheWritable = true; From 74644e8e67175b630f1261c85e73cba9d7666287 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 2 Jul 2025 09:24:33 +0100 Subject: [PATCH 19/48] apko: move to pkgs/by-name --- .../tools/apko/default.nix => by-name/ap/apko/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/tools/apko/default.nix => by-name/ap/apko/package.nix} (100%) diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/by-name/ap/apko/package.nix similarity index 100% rename from pkgs/development/tools/apko/default.nix rename to pkgs/by-name/ap/apko/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaad152d625b..2e125524d1f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -306,7 +306,7 @@ with pkgs; cve = with python3Packages; toPythonApplication cvelib; - apko = callPackage ../development/tools/apko { + apko = callPackage ../by-name/ap/apko/package.nix { buildGoModule = buildGo123Module; }; From 52c39cbac8fa101fcc91bb8cc5c8bd3dd8fa1dda Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 2 Jul 2025 09:17:44 +0100 Subject: [PATCH 20/48] apko: 0.27.9 -> 0.29.1 Diff: chainguard-dev/apko@refs/tags/v0.27.9...refs/tags/v0.29.1 Changelog: https://github.com/chainguard-dev/apko/blob/main/NEWS.md --- pkgs/by-name/ap/apko/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index 4b9cb5946964..b5c663bbb15d 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "apko"; - version = "0.27.9"; + version = "0.29.1"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; tag = "v${version}"; - hash = "sha256-ET/jzQ8sGQrxn9+3z6gOk57XTj9w9lJnwBK7c2n4s10="; + hash = "sha256-PRT29c7WqjkWR4hqzzz8ek5IytsS3ntDlPQ/tzpARCk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-zZwEdHZOPNCLpOgdV23ewOQhAkob8bcasUopwzXLtGk="; + vendorHash = "sha256-j7f9cbcbX4PdaRxg5lare6aRz1B5lCfj2RSvs+XOfe4="; nativeBuildInputs = [ installShellFiles ]; From eee84aed6b1a47d4ed83055d4274ab88c3e5b8c2 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 2 Jul 2025 09:26:03 +0100 Subject: [PATCH 21/48] apko: remove pin on buildGoModules version --- pkgs/top-level/all-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e125524d1f0..a5303c0b49a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -306,10 +306,6 @@ with pkgs; cve = with python3Packages; toPythonApplication cvelib; - apko = callPackage ../by-name/ap/apko/package.nix { - buildGoModule = buildGo123Module; - }; - basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix { tbb = tbb_2021; cereal = cereal_1_3_2; From 3006e8537199239cfd21916e450eb0824e95d4da Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 2 Jul 2025 09:27:58 +0100 Subject: [PATCH 22/48] apko: move to finalAttrs pattern --- pkgs/by-name/ap/apko/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index b5c663bbb15d..e75c0f61b665 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -5,14 +5,14 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "apko"; version = "0.29.1"; src = fetchFromGitHub { owner = "chainguard-dev"; - repo = pname; - tag = "v${version}"; + repo = "apko"; + tag = "v${finalAttrs.version}"; hash = "sha256-PRT29c7WqjkWR4hqzzz8ek5IytsS3ntDlPQ/tzpARCk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. @@ -32,7 +32,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}" + "-X sigs.k8s.io/release-utils/version.gitVersion=v${finalAttrs.version}" "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" ]; @@ -69,7 +69,7 @@ buildGoModule rec { runHook preInstallCheck $out/bin/apko --help - $out/bin/apko version 2>&1 | grep "v${version}" + $out/bin/apko version 2>&1 | grep "v${finalAttrs.version}" runHook postInstallCheck ''; @@ -86,4 +86,4 @@ buildGoModule rec { emilylange ]; }; -} +}) From cc04d1ce175afd8cfa8da8a0a62edc94a3965758 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 2 Jul 2025 10:02:19 +0100 Subject: [PATCH 23/48] apko: fix tests on darwin and use writableTmpDirAsHomeHook Skip tests on darwin due to some local networking failures `__darwinAllowLocalNetworking = true;` wasn't sufficient for aarch64 or x86_64 --- pkgs/by-name/ap/apko/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index e75c0f61b665..d3a01f51b2df 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -1,7 +1,9 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, + writableTmpDirAsHomeHook, installShellFiles, }: @@ -42,14 +44,17 @@ buildGoModule (finalAttrs: { ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; - preCheck = '' - # some tests require a writable HOME - export HOME=$(mktemp -d) + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + # skip tests on darwin due to some local networking failures + # `__darwinAllowLocalNetworking = true;` wasn't sufficient for + # aarch64 or x86_64 + doCheck = !stdenv.isDarwin; + preCheck = '' # some test data include SOURCE_DATE_EPOCH (which is different from our default) # and the default version info which we get by unsetting our ldflags export SOURCE_DATE_EPOCH=0 - ldflags= + unset ldflags ''; checkFlags = [ From 3c7c5d868bd56b90051368427fbfa84d56225e45 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 2 Jul 2025 10:05:24 +0100 Subject: [PATCH 24/48] apko: move version check to versionCheckHook --- pkgs/by-name/ap/apko/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index d3a01f51b2df..078c006ab8aa 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, writableTmpDirAsHomeHook, installShellFiles, + versionCheckHook, }: buildGoModule (finalAttrs: { @@ -69,15 +70,9 @@ buildGoModule (finalAttrs: { --zsh <($out/bin/apko completion zsh) ''; + nativeCheckInstallInputs = [ versionCheckHook ]; doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/apko --help - $out/bin/apko version 2>&1 | grep "v${finalAttrs.version}" - - runHook postInstallCheck - ''; + versionCheckProgramArg = "version"; meta = with lib; { homepage = "https://apko.dev/"; From 40722e650574136c0a8faf51e0b6a67294f553e0 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 2 Jul 2025 10:06:38 +0100 Subject: [PATCH 25/48] apko: reduce usage of `with lib;` --- pkgs/by-name/ap/apko/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index 078c006ab8aa..af1e369a93cc 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -74,13 +74,13 @@ buildGoModule (finalAttrs: { doInstallCheck = true; versionCheckProgramArg = "version"; - meta = with lib; { + meta = { homepage = "https://apko.dev/"; changelog = "https://github.com/chainguard-dev/apko/blob/main/NEWS.md"; description = "Build OCI images using APK directly without Dockerfile"; mainProgram = "apko"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jk developer-guy emilylange From 56eea6911fec3c527335d2d24655a37ddd6e0f6a Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 2 Jul 2025 10:10:36 +0100 Subject: [PATCH 26/48] apko: adjust completion generation to work when cross-compiling --- pkgs/by-name/ap/apko/package.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index af1e369a93cc..dea7ec686877 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -6,6 +6,7 @@ writableTmpDirAsHomeHook, installShellFiles, versionCheckHook, + buildPackages, }: buildGoModule (finalAttrs: { @@ -63,12 +64,20 @@ buildGoModule (finalAttrs: { "-skip=TestInitDB_ChainguardDiscovery" ]; - postInstall = '' - installShellCompletion --cmd apko \ - --bash <($out/bin/apko completion bash) \ - --fish <($out/bin/apko completion fish) \ - --zsh <($out/bin/apko completion zsh) - ''; + postInstall = + let + apko = + if stdenv.buildPlatform.canExecute stdenv.hostPlatform then + placeholder "out" + else + buildPackages.apko; + in + '' + installShellCompletion --cmd apko \ + --bash <(${apko}/bin/apko completion bash) \ + --fish <(${apko}/bin/apko completion fish) \ + --zsh <(${apko}/bin/apko completion zsh) + ''; nativeCheckInstallInputs = [ versionCheckHook ]; doInstallCheck = true; From 0b120942bad9f414df8ddaa7b9f8b0927ee4b903 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Jul 2025 09:25:29 +0000 Subject: [PATCH 27/48] wrangler: 4.20.5 -> 4.22.0 --- pkgs/by-name/wr/wrangler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 7bbc825262be..a7d7da4b40d9 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wrangler"; - version = "4.20.5"; + version = "4.22.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-sdk"; rev = "wrangler@${finalAttrs.version}"; - hash = "sha256-jf4HZVLNqwl8IcS/Po2PKPCd1iMvBuFybhz0z3b0stM="; + hash = "sha256-4uE1Jv70aDqAUk7GWmFr65SNXLnDDIZiFN87DQxluKg="; }; pnpmDeps = pnpm_9.fetchDeps { From a0463b2d80171550ba1857f9a301972792cc6972 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Wed, 2 Jul 2025 12:56:35 +0300 Subject: [PATCH 28/48] teleport_17: 17.5.1 -> 17.5.3 Changelog: https://github.com/gravitational/teleport/releases/tag/v17.5.3 Diff: https://github.com/gravitational/teleport/compare/v17.5.1...v17.5.3 --- pkgs/by-name/te/teleport/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix index 58a6caf352dc..dcbe7033f4ef 100644 --- a/pkgs/by-name/te/teleport/package.nix +++ b/pkgs/by-name/te/teleport/package.nix @@ -21,12 +21,12 @@ withRdpClient ? true, - version ? "17.5.1", - hash ? "sha256-+9Oit7GAUTNv5Z8ZDOuBBRnVvtdA9N0X97UJbLILX50=", - vendorHash ? "sha256-yeouUrLMfkKSYnS9va59cYWnGCvQatQQrNa1DuHQMug=", + version ? "17.5.3", + hash ? "sha256-VyuzSk388Dumm65+Gadu/SddVN7uUS3du5RGPm4xI6g=", + vendorHash ? "sha256-IHXwCp1MdcEKJhIs9DNf77Vd93Ai2as7ROlh6AJT9+Q=", extPatches ? [ ], cargoHash ? "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=", - pnpmHash ? "sha256-TZb1nABTbR+SPgykc/KMRkHW7oLawem6KWmdOFAbLbk=", + pnpmHash ? "sha256-YwftGEQTEI8NvFTFLMJHhYkvaIIP9+bskCQCp5xuEtY=", }: let # This repo has a private submodule "e" which fetchgit cannot handle without failing. From eb99c899e29b12a3a8b5df56a66fa4f25446dc55 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Wed, 2 Jul 2025 06:43:33 -0400 Subject: [PATCH 29/48] sparrow: 2.2.1 -> 2.2.3 --- pkgs/by-name/sp/sparrow/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sp/sparrow/package.nix b/pkgs/by-name/sp/sparrow/package.nix index 11a8fd7dcd92..a17c7387c0c8 100644 --- a/pkgs/by-name/sp/sparrow/package.nix +++ b/pkgs/by-name/sp/sparrow/package.nix @@ -25,13 +25,13 @@ let pname = "sparrow"; - version = "2.2.1"; + version = "2.2.3"; openjdk = jdk23.override { enableJavaFX = true; }; src = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/sparrowwallet-${version}-x86_64.tar.gz"; - hash = "sha256-m6FHcz62MbEQFfLeDyW0ziqoB4YVYOOL/IB5AgunXrQ="; + hash = "sha256-MsERgfJGpxRkQm4Ww30Tc95kThjlgI+nO4bq2zNGdeU="; # nativeBuildInputs, downloadToTemp, and postFetch are used to verify the signed upstream package. # The signature is not a self-contained file. Instead the SHA256 of the package is added to a manifest file. @@ -60,12 +60,12 @@ let manifest = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-manifest.txt"; - hash = "sha256-rbLTZAkqesmS1pg5wbnbTbnTuFnpWuDID0aCAwwM65w="; + hash = "sha256-qPIllqFqe84BSIcYYYa+rKJvSpN/QnomHnsOoTxlyl4="; }; manifestSignature = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-manifest.txt.asc"; - hash = "sha256-Ct2PVjH5WEa+XqJtUNHlmMhlEN/r/Z+Y73vsHfMo5Qg="; + hash = "sha256-PpruG9l7MhI30b6dd96KAkkQvyMNuh36GtmEdYaRgac="; }; publicKey = ./publickey.asc; From d49a7704333f5c62e613b080518c31230447b978 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Wed, 2 Jul 2025 12:36:04 +0100 Subject: [PATCH 30/48] nexusmods-app: 0.12.3 -> 0.13.4 https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.13.4 --- pkgs/by-name/ne/nexusmods-app/deps.json | 109 +++++++++++++++------- pkgs/by-name/ne/nexusmods-app/package.nix | 4 +- 2 files changed, 79 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json index 4b45a9401d91..f73fca4450dd 100644 --- a/pkgs/by-name/ne/nexusmods-app/deps.json +++ b/pkgs/by-name/ne/nexusmods-app/deps.json @@ -279,6 +279,11 @@ "version": "8.5.0", "hash": "sha256-mLraPiJa1JiXOWQ17GUp8MWuBNrIjcYYjItQRfMjP8s=" }, + { + "pname": "EnumerableAsyncProcessor", + "version": "2.1.0", + "hash": "sha256-WljvqFPe95cjtm+VfaeLvQDFW2j9QQBWJAd0bM8VXN0=" + }, { "pname": "ExCSS", "version": "4.3.0", @@ -356,58 +361,58 @@ }, { "pname": "GameFinder", - "version": "4.7.2", - "hash": "sha256-a+/4rJbo7dc4sVRg6TtvfCt02/Qlih9ovwwkAf6Lve0=" + "version": "4.7.3", + "hash": "sha256-tUUvWC8/HTFvESqSPN2HMnGkf6OroDBpHCbqo1ThD/8=" }, { "pname": "GameFinder.Common", - "version": "4.7.2", - "hash": "sha256-PNGHswvAeJyr0ipbxY884c9/SKsoYXEYMsI5ymfJovQ=" + "version": "4.7.3", + "hash": "sha256-lPTPiywObx6SEaBKuL25+eLdfVHuWb1x14Q7aMpXLMQ=" }, { "pname": "GameFinder.Launcher.Heroic", - "version": "4.7.2", - "hash": "sha256-sQth9S4artOEA0nalFZRQKLkMU7IqHCx/B5HG8fJVZk=" + "version": "4.7.3", + "hash": "sha256-Rp9I0XfW4KhyOSgyPzhR9aHYVcLDwUnpmvTjowviWC8=" }, { "pname": "GameFinder.RegistryUtils", - "version": "4.7.2", - "hash": "sha256-ujiSbIH5JHG4c861ex3zm+Uf7RbV+2tNFHKY2gtkwFg=" + "version": "4.7.3", + "hash": "sha256-Z4IbxyMx6apZt9SYfDFvWD8I/qSP2S4kEz8hXym96KY=" }, { "pname": "GameFinder.StoreHandlers.EADesktop", - "version": "4.7.2", - "hash": "sha256-BcSyWqlsFXaQmYqD+dR2FSNI0NkzjkH9kZCqp4YOy14=" + "version": "4.7.3", + "hash": "sha256-RbPZayuG9OJXI1aSL2d5vfjfXlEAWFz9aZrXDXX6jhM=" }, { "pname": "GameFinder.StoreHandlers.EGS", - "version": "4.7.2", - "hash": "sha256-YAz1gf77Bm18dZe0h1zKO52ZJ7sw6XRz1XPQRVt8W3U=" + "version": "4.7.3", + "hash": "sha256-99DbRfzESJZAUDd3yREb8M6Mgn8dztNQqBPyR1bsST4=" }, { "pname": "GameFinder.StoreHandlers.GOG", - "version": "4.7.2", - "hash": "sha256-hvA+kf2ZvpDS1pVSTAJ2839b1rRamJTz+Erux/OmdfE=" + "version": "4.7.3", + "hash": "sha256-u0Vm9k8XAkzOdW2U6nzuRPWgMxj3QwkvFc5S4c8A/u4=" }, { "pname": "GameFinder.StoreHandlers.Origin", - "version": "4.7.2", - "hash": "sha256-U7ko6fWujUXabVEe0Xxc5PXwb2VBFCyHIByg3MzleG4=" + "version": "4.7.3", + "hash": "sha256-f/saANmx8zYrZ+G3xbsy2w7mQwC0Jmb5WpUSlZNyzJU=" }, { "pname": "GameFinder.StoreHandlers.Steam", - "version": "4.7.2", - "hash": "sha256-G1YPgAn7ORQuBm5ZD78EzKS1hIiLyQgjcX2RzSYWbO4=" + "version": "4.7.3", + "hash": "sha256-5WtdyR1/xX+Ra5ldlvM0leIgc8gTGaPKAFOC/KTHGk8=" }, { "pname": "GameFinder.StoreHandlers.Xbox", - "version": "4.7.2", - "hash": "sha256-LSxBpARmANJg199wBZ5FgvBUkq5JvCjTUEe9X+Gs+Ec=" + "version": "4.7.3", + "hash": "sha256-Z9RpXomR53mLhD0WH7pCYxmnQIAsGiBVqUgs4I0ZO4w=" }, { "pname": "GameFinder.Wine", - "version": "4.7.2", - "hash": "sha256-YQgkRgF/wh+Jy5dIDBBE3lExDv5XpylL/xNBf0ge9sI=" + "version": "4.7.3", + "hash": "sha256-PO8aXHEvCxBQq92GyPl3b//s4MTCU7T8mvryS4p0Hsg=" }, { "pname": "Gee.External.Capstone", @@ -1544,6 +1549,26 @@ "version": "8.0.0", "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" }, + { + "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", + "version": "1.7.1", + "hash": "sha256-zaDOAoEA4CF6/7rXLBO5f5d8PpcqB7hKlwdEWzaFsNk=" + }, + { + "pname": "Microsoft.Testing.Platform", + "version": "1.4.3", + "hash": "sha256-KqB3+uBGl0edpaGl6Qykubb3OrVTs6IcPWc59UQ/Iww=" + }, + { + "pname": "Microsoft.Testing.Platform", + "version": "1.7.1", + "hash": "sha256-YJ41q1VXvFZh/TWo3tutGQnhNCrxv/QbDLTxCS4b/w4=" + }, + { + "pname": "Microsoft.Testing.Platform.MSBuild", + "version": "1.4.3", + "hash": "sha256-289hhblU55kDvzbiSQAFSxOyht1MlXT4e+bEQyQqils=" + }, { "pname": "Microsoft.TestPlatform.ObjectModel", "version": "17.10.0", @@ -1671,13 +1696,13 @@ }, { "pname": "NexusMods.Cascade", - "version": "0.15.0", - "hash": "sha256-lmb0zvp4cq9oOF25B/J2iBKmiBAMGtCYb6WMqeqwgA0=" + "version": "0.16.0", + "hash": "sha256-TybY3XW0/crQT4pTbHCW7VsAdoTGLTU/GwAxVfxv4uc=" }, { "pname": "NexusMods.Cascade.SourceGenerator", - "version": "0.15.0", - "hash": "sha256-8tfNAUILcmBPeZNiQJ7VC+jbuFEhT9aZo/T7gnn4ZAI=" + "version": "0.16.0", + "hash": "sha256-fc6Gvf0e1pVZSJvyUJcZQUAsIXh3K9xXSn/3UHeOhZc=" }, { "pname": "NexusMods.Hashing.xxHash3", @@ -1691,18 +1716,18 @@ }, { "pname": "NexusMods.MnemonicDB", - "version": "0.15.0", - "hash": "sha256-4rtb6WRCxknp0a47tg3JPkvGOCoRXl4ilQZOaTvYQFw=" + "version": "0.17.0", + "hash": "sha256-1BAprdtAvVRfA5fpKV3BxpW7PIkSXWbWnUI70uTzk6k=" }, { "pname": "NexusMods.MnemonicDB.Abstractions", - "version": "0.15.0", - "hash": "sha256-BWx5MjJfSu4UGRVnFIncfSg6tu5OetSTdtDsIHwHZ5Q=" + "version": "0.17.0", + "hash": "sha256-eXGPNioGdwhjYhCjV7Aj2vwS2lcMOHxNWfIL9Ww5+NM=" }, { "pname": "NexusMods.MnemonicDB.SourceGenerator", - "version": "0.15.0", - "hash": "sha256-MuMgcHn+73izfYdA6WTHpvKBAITxuNhtGSW1JCJD4Y0=" + "version": "0.17.0", + "hash": "sha256-TDHxCFa8qWfHD80utMZpD4DWkz0O3MJA3nQAtQgpdFI=" }, { "pname": "NexusMods.Paths", @@ -3169,6 +3194,26 @@ "version": "1.1.0", "hash": "sha256-I2NBomTTExaEhf9/BoplBbDJ9B7YMS3nUOQ5Od4A/e0=" }, + { + "pname": "TUnit", + "version": "0.25.0", + "hash": "sha256-rQaQ9DQF+y2bbtFqIa7oVtXC+dgGi6nYLTyZjrhmN9s=" + }, + { + "pname": "TUnit.Assertions", + "version": "0.25.0", + "hash": "sha256-DuurVpcD3mxMl7nh3nmtxsUyBNRyeZi3vy91lzwQYyA=" + }, + { + "pname": "TUnit.Core", + "version": "0.25.0", + "hash": "sha256-zaTFjXPtR2muqmyyWt1GxL5ACp5tiArcH6B2h4PscNw=" + }, + { + "pname": "TUnit.Engine", + "version": "0.25.0", + "hash": "sha256-0/5JkVww0Ek48VaTuZ/mkNcVCef43k0F95QU8WS71Nc=" + }, { "pname": "Validation", "version": "2.3.7", diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 35a6aa834ef2..02f1be911f3b 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -23,12 +23,12 @@ let in buildDotnetModule (finalAttrs: { inherit pname; - version = "0.12.3"; + version = "0.13.4"; src = fetchgit { url = "https://github.com/Nexus-Mods/NexusMods.App.git"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-X0zF0zqWwuCt7oWXwfzDtu+7KZ3yMQwQqP45rlfGm/o="; + hash = "sha256-Ub6HjZChOhRUDYQ2TAnrwOtrW6ahP+k74vCAmLkYABA="; fetchSubmodules = true; }; From 6c6eecec4ae47326f7cd45c04f670f462375479c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Jul 2025 12:58:08 +0000 Subject: [PATCH 31/48] texturepacker: 7.7.1 -> 7.8.0 --- pkgs/by-name/te/texturepacker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/texturepacker/package.nix b/pkgs/by-name/te/texturepacker/package.nix index 9f6356da974a..0c8d52d86cb3 100644 --- a/pkgs/by-name/te/texturepacker/package.nix +++ b/pkgs/by-name/te/texturepacker/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "texturepacker"; - version = "7.7.1"; + version = "7.8.0"; src = fetchurl { url = "https://www.codeandweb.com/download/texturepacker/${finalAttrs.version}/TexturePacker-${finalAttrs.version}.deb"; - hash = "sha256-3zBPPH3LJLJEEMWV8eWP9yu5oq+3toexIcnLOi02yD8="; + hash = "sha256-r1oK5VgUZrdPDOM/8LDSgq5KVmahVVJQ9QXGPK6RkcY="; }; nativeBuildInputs = [ From 6d2547a3e5f6df299116a8d7e777067c265504f3 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 2 Jul 2025 16:09:35 +0200 Subject: [PATCH 32/48] alertmanager-ntfy: 0-unstable-2025-06-27 -> 1.0.0 Diff: https://github.com/alexbakker/alertmanager-ntfy/compare/dc4ef93f7db7f046a775ef3e4a2a462b2afcec6c...v1.0.0 --- pkgs/by-name/al/alertmanager-ntfy/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/al/alertmanager-ntfy/package.nix b/pkgs/by-name/al/alertmanager-ntfy/package.nix index 07d19fe9d2f6..32144dba93e1 100644 --- a/pkgs/by-name/al/alertmanager-ntfy/package.nix +++ b/pkgs/by-name/al/alertmanager-ntfy/package.nix @@ -6,18 +6,18 @@ nix-update-script, }: -buildGoModule { +buildGoModule (finalAttrs: { pname = "alertmanager-ntfy"; - version = "0-unstable-2025-06-27"; + version = "1.0.0"; src = fetchFromGitHub { owner = "alexbakker"; repo = "alertmanager-ntfy"; - rev = "dc4ef93f7db7f046a775ef3e4a2a462b2afcec6c"; - hash = "sha256-J+T3Mt+40vhL3DVBKKH86l45AKSlkT7h+TrfhsWwMac="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tyRBfcPL0tzsZgWwgjSW9eMcXZAotkx88tjDr2gw4s4="; }; - vendorHash = "sha256-e1JAoDNm2+xB/bZcEGr5l4+va8GIg1R8pdj3d+/Y+UY="; + vendorHash = "sha256-CpVGLM6ZtfYODhP6gzWGcnpEuDvKRiMWzoPNm2qtML4="; doInstallCheck = true; installCheckPhase = '' @@ -30,7 +30,7 @@ buildGoModule { passthru = { tests = { inherit (nixosTests.prometheus) alertmanager-ntfy; }; - updateScript = nix-update-script { extraArgs = [ "--version=branch=master" ]; }; + updateScript = nix-update-script { }; }; meta = { @@ -40,4 +40,4 @@ buildGoModule { maintainers = with lib.maintainers; [ defelo ]; mainProgram = "alertmanager-ntfy"; }; -} +}) From df42f855db1d882e75d30d8a5282a2f65959668a Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 2 Jul 2025 08:34:40 -0700 Subject: [PATCH 33/48] treewide: add --extra-experimental-features nix-command to nix hash invocations --- maintainers/scripts/copy-tarballs.pl | 4 ++-- pkgs/applications/audio/reaper/updater.sh | 4 ++-- pkgs/applications/blockchains/teos/update.sh | 2 +- pkgs/applications/editors/cudatext/update.sh | 4 ++-- .../vscode/extensions/_maintainers/update-bin-srcs-lib.sh | 2 +- .../vscode/extensions/ms-vscode.cpptools/update_helper.sh | 2 +- pkgs/applications/editors/vscode/update-vscode.sh | 2 +- pkgs/applications/editors/vscode/update-vscodium.sh | 2 +- .../applications/graphics/tesseract/fetch-language-hashes | 2 +- .../applications/networking/browsers/librewolf/update.nix | 4 ++-- pkgs/applications/networking/cluster/timoni/update.sh | 2 +- pkgs/by-name/at/atlassian-plugin-sdk/package.nix | 2 +- pkgs/by-name/ba/balatro/package.nix | 2 +- pkgs/by-name/be/beekeeper-studio/update.sh | 2 +- pkgs/by-name/bi/bilibili/update.sh | 4 ++-- pkgs/by-name/bl/bloomeetunes/update.sh | 2 +- pkgs/by-name/bo/boundary/update.sh | 2 +- pkgs/by-name/bu/buck2/update.sh | 6 +++--- pkgs/by-name/bu/buckets/package.nix | 2 +- pkgs/by-name/ch/chatgpt/update.sh | 2 +- pkgs/by-name/cl/clojure-lsp/package.nix | 2 +- pkgs/by-name/co/coder/update.sh | 2 +- pkgs/by-name/co/confluent-cli/update.sh | 2 +- pkgs/by-name/cr/crc/update.sh | 2 +- pkgs/by-name/db/dbgate/update.sh | 2 +- pkgs/by-name/de/dependabot-cli/update.sh | 2 +- pkgs/by-name/dr/draupnir/update.sh | 2 +- pkgs/by-name/du/duplicati/package.nix | 2 +- pkgs/by-name/dy/dynamodb-local/package.nix | 2 +- pkgs/by-name/el/electrs/update.sh | 2 +- pkgs/by-name/en/envoy-bin/update.sh | 2 +- pkgs/by-name/fe/feishu/package.nix | 2 +- pkgs/by-name/fi/fishnet/update.bash | 4 ++-- pkgs/by-name/fl/fluxcd/update.sh | 6 +++--- pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix | 4 ++-- pkgs/by-name/go/google-chrome/update.sh | 6 +++--- pkgs/by-name/ha/hamrs-pro/update.sh | 2 +- pkgs/by-name/he/hey-mail/package.nix | 2 +- pkgs/by-name/ho/hoppscotch/update.sh | 2 +- pkgs/by-name/i-/i-dot-ming/package.nix | 2 +- pkgs/by-name/ib/ibm-plex/update.sh | 2 +- pkgs/by-name/je/jenkins/package.nix | 2 +- pkgs/by-name/je/jetbrains-toolbox/update.sh | 2 +- pkgs/by-name/ke/keyguard/update.sh | 2 +- pkgs/by-name/li/librewolf-bin-unwrapped/update.sh | 2 +- pkgs/by-name/lm/lmstudio/update.sh | 2 +- pkgs/by-name/lo/localsend/update.sh | 4 ++-- pkgs/by-name/mi/mihomo-party/update.sh | 2 +- pkgs/by-name/mu/mullvad-browser/update.nix | 2 +- pkgs/by-name/nb/nbxplorer/util/update-common.sh | 2 +- pkgs/by-name/om/ombi/update.sh | 2 +- pkgs/by-name/pd/pdfium-binaries/update.sh | 4 ++-- pkgs/by-name/pe/perses/update.sh | 2 +- pkgs/by-name/ph/phoenixd/update.sh | 2 +- pkgs/by-name/pi/pilipalax/update.sh | 2 +- pkgs/by-name/pl/platformsh/update.sh | 6 +++--- pkgs/by-name/pr/protoc-gen-grpc-java/update.sh | 2 +- pkgs/by-name/qq/qq/update.sh | 6 +++--- pkgs/by-name/re/readarr/update.sh | 2 +- pkgs/by-name/rn/rnnoise/package.nix | 2 +- pkgs/by-name/ru/rundeck/package.nix | 2 +- pkgs/by-name/si/signal-desktop-bin/update.sh | 2 +- pkgs/by-name/sp/sparkle/update.sh | 2 +- pkgs/by-name/st/standardnotes/update.nix | 2 +- pkgs/by-name/st/stockfish/update.bash | 4 ++-- pkgs/by-name/su/sudachidict/update.sh | 2 +- pkgs/by-name/ta/tailwindcss_3/update.sh | 2 +- pkgs/by-name/ta/tandoor-recipes/update.sh | 2 +- pkgs/by-name/te/termius/package.nix | 2 +- pkgs/by-name/th/the-unarchiver/update/update.mjs | 2 +- pkgs/by-name/to/tor-browser/update.nix | 2 +- pkgs/by-name/tr/tradingview/update.sh | 2 +- pkgs/by-name/ty/typesense/update.sh | 2 +- pkgs/by-name/up/upsun/update.sh | 6 +++--- pkgs/by-name/va/vault-bin/update-bin.sh | 2 +- pkgs/by-name/vi/vivaldi/update-vivaldi.sh | 2 +- pkgs/by-name/wa/waveterm/update.sh | 4 ++-- pkgs/by-name/we/wechat-uos/update.sh | 2 +- pkgs/by-name/wh/whisparr/update.sh | 2 +- pkgs/by-name/xu/xunlei-uos/update.sh | 2 +- pkgs/by-name/ya/yazi/plugins/update.py | 4 ++-- pkgs/by-name/zo/zoom-us/update.sh | 6 +++--- pkgs/development/compilers/dotnet/update.sh | 8 ++++---- .../compilers/graalvm/graalvm-oracle/hashes.nix | 2 +- pkgs/development/libraries/libcef/update.sh | 2 +- .../libraries/science/math/libtorch/prefetch.sh | 2 +- pkgs/development/python-modules/jaxlib/prefetch.sh | 2 +- pkgs/development/python-modules/mypy-boto3/update.sh | 2 +- pkgs/development/python-modules/ray/prefetch.sh | 2 +- pkgs/development/python-modules/torch/bin/prefetch.sh | 2 +- pkgs/development/python-modules/torchaudio/prefetch.sh | 2 +- pkgs/development/python-modules/torchvision/prefetch.sh | 2 +- .../python-modules/types-aiobotocore/update.sh | 2 +- .../tools/continuous-integration/woodpecker/update.sh | 2 +- pkgs/development/tools/infisical/update.sh | 2 +- pkgs/development/tools/rover/update.sh | 2 +- pkgs/misc/lilypond/update.sh | 2 +- pkgs/os-specific/linux/batman-adv/version.nix | 2 +- .../minimal-bootstrap/stage0-posix/bootstrap-sources.nix | 2 +- pkgs/servers/etcd/3.5/update.sh | 2 +- pkgs/servers/lidarr/update.sh | 2 +- pkgs/tools/admin/ibmcloud-cli/update.sh | 2 +- pkgs/tools/misc/xvfb-run/update.sh | 2 +- 103 files changed, 132 insertions(+), 132 deletions(-) diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 30fbac6f002d..6e4dcd6b22b0 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -176,7 +176,7 @@ elsif (defined $expr) { if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) { $algo = $1; - $hash = `nix hash to-base16 $hash` or die; + $hash = `nix --extra-experimental-features nix-command hash to-base16 $hash` or die; chomp $hash; } @@ -184,7 +184,7 @@ elsif (defined $expr) { # Convert non-SRI base-64 to base-16. if ($hash =~ /^[A-Za-z0-9+\/=]+$/) { - $hash = `nix hash to-base16 --type '$algo' $hash` or die; + $hash = `nix --extra-experimental-features nix-command hash to-base16 --type '$algo' $hash` or die; chomp $hash; } diff --git a/pkgs/applications/audio/reaper/updater.sh b/pkgs/applications/audio/reaper/updater.sh index a47df805345f..50832c27d2fa 100755 --- a/pkgs/applications/audio/reaper/updater.sh +++ b/pkgs/applications/audio/reaper/updater.sh @@ -8,14 +8,14 @@ reaper_ver=$(curl -Ls https://www.reaper.fm/download.php | grep -o 'Version [0-9 function set_hash_for_linux() { local arch=$1 pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_linux_$arch.tar.xz) - pkg_hash=$(nix hash convert "sha256:$pkg_hash") + pkg_hash=$(nix --extra-experimental-features nix-command hash convert "sha256:$pkg_hash") update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-linux --ignore-same-version } function set_hash_for_darwin() { local arch=$1 pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_universal.dmg) - pkg_hash=$(nix hash convert "sha256:$pkg_hash") + pkg_hash=$(nix --extra-experimental-features nix-command hash convert "sha256:$pkg_hash") update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-darwin --ignore-same-version } diff --git a/pkgs/applications/blockchains/teos/update.sh b/pkgs/applications/blockchains/teos/update.sh index f27be08299b2..5dae537abd0c 100755 --- a/pkgs/applications/blockchains/teos/update.sh +++ b/pkgs/applications/blockchains/teos/update.sh @@ -23,7 +23,7 @@ git clone --depth 1 --branch "v${version}" -c advice.detachedHead=false 'https:/ git -C "$repo" checkout "tags/v${version}" rm -rf "${repo}/.git" -hashcheck=$(nix hash path "$repo") +hashcheck=$(nix --extra-experimental-features nix-command hash path "$repo") (cd "$nixpkgs" && update-source-version teos "$version" "$hashcheck" && update-source-version teos --ignore-same-version --source-key=cargoDeps) echo diff --git a/pkgs/applications/editors/cudatext/update.sh b/pkgs/applications/editors/cudatext/update.sh index 36b53ec141be..3ed1f8d56dc3 100755 --- a/pkgs/applications/editors/cudatext/update.sh +++ b/pkgs/applications/editors/cudatext/update.sh @@ -17,7 +17,7 @@ echo "New version: $version" url="https://github.com/Alexey-T/CudaText/archive/refs/tags/${version}.tar.gz" hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url) -sriHash=$(nix hash to-sri --type sha256 $hash) +sriHash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash) sed -i "s#version = \".*\"#version = \"$version\"#" default.nix sed -i "s#hash = \".*\"#hash = \"$sriHash\"#" default.nix @@ -27,7 +27,7 @@ while IFS=$'\t' read repo owner rev; do if [ "$latest" != "$rev" ]; then url="https://github.com/${owner}/${repo}/archive/refs/tags/${latest}.tar.gz" hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url) - sriHash=$(nix hash to-sri --type sha256 $hash) + sriHash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash) jq ".\"${repo}\".rev = \"${latest}\" | .\"${repo}\".hash = \"${sriHash}\"" deps.json | sponge deps.json fi done <<< $(jq -r 'to_entries[]|[.key,.value.owner,.value.rev]|@tsv' deps.json) diff --git a/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh b/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh index 4b0ca54da362..15bfb8682955 100755 --- a/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh +++ b/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh @@ -60,7 +60,7 @@ prefetchExtensionUnpacked() { declare unpackedStorePath unpackedStorePath="$(nix add-to-store -n "$unpackedStoreName" "$tmpDir")" declare unpackedSha256 - unpackedSha256="$(nix hash-path --base32 --type sha256 "$unpackedStorePath")" + unpackedSha256="$(nix --extra-experimental-features nix-command hash path --base32 --type sha256 "$unpackedStorePath")" 1>&2 echo "unpackedStorePath='$unpackedStorePath'" 1>&2 echo "unpackedSha256='$unpackedSha256'" diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh index 9541700a28b8..76bb4bfde053 100755 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh @@ -58,7 +58,7 @@ make_trapped_tmpdir unzip -q -d "$tmpDir" "$cpptoolsZipStorePath" cpptoolsStorePath="$(nix add-to-store -n "$extStoreName" "$tmpDir")" -cpptoolsSha256="$(nix hash-path --base32 --type sha512 "$cpptoolsStorePath")" +cpptoolsSha256="$(nix --extra-experimental-features nix-command hash path --base32 --type sha512 "$cpptoolsStorePath")" echo "cpptoolsStorePath='$cpptoolsStorePath'" echo "cpptoolsSha256='$cpptoolsSha256'" diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh index e839bc194082..d8796470c312 100755 --- a/pkgs/applications/editors/vscode/update-vscode.sh +++ b/pkgs/applications/editors/vscode/update-vscode.sh @@ -18,7 +18,7 @@ update-source-version vscode $latestVersion systems=$(nix eval --json -f . vscode.meta.platforms | jq --raw-output '.[]') for system in $systems; do - hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw -f . vscode.src.url --system "$system"))) + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw -f . vscode.src.url --system "$system"))) update-source-version vscode $latestVersion $hash --system=$system --ignore-same-version --ignore-same-hash done diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index 6f5a04262465..e568013cfd34 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -21,6 +21,6 @@ for i in \ "aarch64-darwin darwin-arm64 zip" \ "x86_64-darwin darwin-x64 zip"; do set -- $i - hash=$(nix hash convert --hash-algo sha256 --to sri $(nix-prefetch-url "https://github.com/VSCodium/vscodium/releases/download/$latestVersion/VSCodium-$2-$latestVersion.$3")) + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(nix-prefetch-url "https://github.com/VSCodium/vscodium/releases/download/$latestVersion/VSCodium-$2-$latestVersion.$3")) update-source-version vscodium $latestVersion $hash --system=$1 --ignore-same-version done diff --git a/pkgs/applications/graphics/tesseract/fetch-language-hashes b/pkgs/applications/graphics/tesseract/fetch-language-hashes index b8aedcfbd9c0..2104cdf1d79b 100755 --- a/pkgs/applications/graphics/tesseract/fetch-language-hashes +++ b/pkgs/applications/graphics/tesseract/fetch-language-hashes @@ -30,6 +30,6 @@ fi for lang in $langCodes; do url=https://github.com/tesseract-ocr/tessdata/raw/$tessdataRev/$lang.traineddata - hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url $url 2>/dev/null)) + hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url $url 2>/dev/null)) echo "$lang = \"$hash\";" done diff --git a/pkgs/applications/networking/browsers/librewolf/update.nix b/pkgs/applications/networking/browsers/librewolf/update.nix index f55e57abb065..88c5a7e49fc7 100644 --- a/pkgs/applications/networking/browsers/librewolf/update.nix +++ b/pkgs/applications/networking/browsers/librewolf/update.nix @@ -46,7 +46,7 @@ writeScript "update-librewolf" '' repoUrl=https://codeberg.org/librewolf/source.git nix-prefetch-git $repoUrl --quiet --rev $latestTag --fetch-submodules > $prefetchOut srcDir=$(jq -r .path < $prefetchOut) - srcHash=$(nix hash convert --to sri --hash-algo sha256 $(jq -r .sha256 < $prefetchOut)) + srcHash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(jq -r .sha256 < $prefetchOut)) ffVersion=$(<$srcDir/version) lwRelease=$(<$srcDir/release) @@ -68,7 +68,7 @@ writeScript "update-librewolf" '' curl --silent --show-error -o "$HOME"/shasums.asc "$mozillaUrl$ffVersion/SHA512SUMS.asc" gpgv --keyring="$GNUPGHOME"/pubring.kbx "$HOME"/shasums.asc "$HOME"/shasums - ffHash=$(nix hash convert --to sri --hash-algo sha512 $(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o)) + ffHash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 $(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o)) echo "ffHash=$ffHash" jq ".source.rev = \"$latestTag\"" $srcJson | sponge $srcJson diff --git a/pkgs/applications/networking/cluster/timoni/update.sh b/pkgs/applications/networking/cluster/timoni/update.sh index 4e997beeece5..10e4814f46ae 100755 --- a/pkgs/applications/networking/cluster/timoni/update.sh +++ b/pkgs/applications/networking/cluster/timoni/update.sh @@ -16,7 +16,7 @@ sed -i "s|$PREV_VERSION|$NEXT_VERSION|" "$FILE" # update hash PREV_HASH=$(nix eval --raw -f $NIXPKGS_ROOT/default.nix $ATTR.src.outputHash) -NEXT_HASH=$(nix hash to-sri --type sha256 $(nix-prefetch-url --unpack --type sha256 $(nix eval --raw -f $NIXPKGS_ROOT/default.nix $ATTR.src.url))) +NEXT_HASH=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --unpack --type sha256 $(nix eval --raw -f $NIXPKGS_ROOT/default.nix $ATTR.src.url))) sed -i "s|$PREV_HASH|$NEXT_HASH|" "$FILE" # update vendor hash diff --git a/pkgs/by-name/at/atlassian-plugin-sdk/package.nix b/pkgs/by-name/at/atlassian-plugin-sdk/package.nix index 8f4becdd9914..5547053892a8 100644 --- a/pkgs/by-name/at/atlassian-plugin-sdk/package.nix +++ b/pkgs/by-name/at/atlassian-plugin-sdk/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { fi DOWNLOAD_URL="${mavenGroupIdUrl}/atlassian-plugin-sdk/${version}/atlassian-plugin-sdk-$NEW_VERSION.tar.gz" - NIX_HASH=$(nix hash to-sri sha256:$(nix-prefetch-url $DOWNLOAD_URL)) + NIX_HASH=$(nix --extra-experimental-features nix-command hash to-sri sha256:$(nix-prefetch-url $DOWNLOAD_URL)) update-source-version "atlassian-plugin-sdk" "$NEW_VERSION" "$NIX_HASH" "$DOWNLOAD_URL" ''; diff --git a/pkgs/by-name/ba/balatro/package.nix b/pkgs/by-name/ba/balatro/package.nix index 526ca9ee051f..ec56a60e8bda 100644 --- a/pkgs/by-name/ba/balatro/package.nix +++ b/pkgs/by-name/ba/balatro/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { src = requireFile { name = "Balatro-${finalAttrs.version}.exe"; url = "https://store.steampowered.com/app/2379780/Balatro/"; - # Use `nix hash file --sri --type sha256` to get the correct hash + # Use `nix --extra-experimental-features nix-command hash file --sri --type sha256` to get the correct hash hash = "sha256-DXX+FkrM8zEnNNSzesmHiN0V8Ljk+buLf5DE5Z3pP0c="; }; diff --git a/pkgs/by-name/be/beekeeper-studio/update.sh b/pkgs/by-name/be/beekeeper-studio/update.sh index 8bca15d4e3c8..cc6f15fb95c0 100755 --- a/pkgs/by-name/be/beekeeper-studio/update.sh +++ b/pkgs/by-name/be/beekeeper-studio/update.sh @@ -16,5 +16,5 @@ fi nix-update beekeeper-studio --version "$latestVersion" || true -hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url "$(nix eval -f . --raw beekeeper-studio.src.url --system aarch64-linux)")) +hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url "$(nix eval -f . --raw beekeeper-studio.src.url --system aarch64-linux)")) update-source-version beekeeper-studio $latestVersion $hash --system=aarch64-linux --ignore-same-version diff --git a/pkgs/by-name/bi/bilibili/update.sh b/pkgs/by-name/bi/bilibili/update.sh index 5bd8dea6fdfd..e515f08f6616 100755 --- a/pkgs/by-name/bi/bilibili/update.sh +++ b/pkgs/by-name/bi/bilibili/update.sh @@ -14,8 +14,8 @@ amd64_hash=$(nix-prefetch-url $amd64_url) arm64_hash=$(nix-prefetch-url $arm64_url) # use friendlier hashes -amd64_hash=$(nix hash convert --to sri --hash-algo sha256 "$amd64_hash") -arm64_hash=$(nix hash convert --to sri --hash-algo sha256 "$arm64_hash") +amd64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$amd64_hash") +arm64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$arm64_hash") cat >sources.nix <$ROOT/pubspec.lock.json diff --git a/pkgs/by-name/bo/boundary/update.sh b/pkgs/by-name/bo/boundary/update.sh index 0418b2b3dd0a..660f44964a95 100644 --- a/pkgs/by-name/bo/boundary/update.sh +++ b/pkgs/by-name/bo/boundary/update.sh @@ -15,7 +15,7 @@ function calc_hash () { local arch=$2 url="https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${arch}.zip" zip_hash=$(nix-prefetch-url --unpack $url) - nix hash to-sri --type sha256 "$zip_hash" + nix --extra-experimental-features nix-command hash to-sri --type sha256 "$zip_hash" } replace_sha() { diff --git a/pkgs/by-name/bu/buck2/update.sh b/pkgs/by-name/bu/buck2/update.sh index b4614c47126c..ef158d8326ff 100755 --- a/pkgs/by-name/bu/buck2/update.sh +++ b/pkgs/by-name/bu/buck2/update.sh @@ -27,7 +27,7 @@ HFILE=pkgs/by-name/bu/buck2/hashes.json rm -f "$HFILE" && touch "$HFILE" PRELUDE_SHA256HASH="$(nix-prefetch-url --type sha256 "$PRELUDE_DL_URL")" -PRELUDE_SRIHASH="$(nix hash to-sri --type sha256 "$PRELUDE_SHA256HASH")" +PRELUDE_SRIHASH="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$PRELUDE_SHA256HASH")" printf "{ \"_comment\": \"@generated by pkgs/by-name/bu/buck2/update.sh\"\n" >> "$HFILE" printf ", \"_prelude\": \"$PRELUDE_SRIHASH\"\n" >> "$HFILE" @@ -35,12 +35,12 @@ printf ", \"_prelude\": \"$PRELUDE_SRIHASH\"\n" >> "$HFILE" for arch in "${ARCHS[@]}"; do IFS=: read -r arch_name arch_target <<< "$arch" sha256hash="$(nix-prefetch-url --type sha256 "https://github.com/facebook/buck2/releases/download/${VERSION}/buck2-${arch_target}.zst")" - srihash="$(nix hash to-sri --type sha256 "$sha256hash")" + srihash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$sha256hash")" echo ", \"buck2-$arch_name\": \"$srihash\"" >> "$HFILE" IFS=: read -r arch_name arch_target <<< "$arch" sha256hash="$(nix-prefetch-url --type sha256 "https://github.com/facebook/buck2/releases/download/${VERSION}/rust-project-${arch_target}.zst")" - srihash="$(nix hash to-sri --type sha256 "$sha256hash")" + srihash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$sha256hash")" echo ", \"rust-project-$arch_name\": \"$srihash\"" >> "$HFILE" done echo "}" >> "$HFILE" diff --git a/pkgs/by-name/bu/buckets/package.nix b/pkgs/by-name/bu/buckets/package.nix index c0e90904add2..c8e84075de3d 100644 --- a/pkgs/by-name/bu/buckets/package.nix +++ b/pkgs/by-name/bu/buckets/package.nix @@ -18,7 +18,7 @@ let .${system}; # Get hash in sri format - # nix-prefetch-url | xargs nix hash convert --hash-algo sha256 + # nix-prefetch-url | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 hash = { x86_64-linux = "sha256-DK5+VT4+OCcJ4Bbv6GGs6R332GMsD1gNEmcz0iaJb1c="; diff --git a/pkgs/by-name/ch/chatgpt/update.sh b/pkgs/by-name/ch/chatgpt/update.sh index 03b9176ed146..871a6b4f6685 100755 --- a/pkgs/by-name/ch/chatgpt/update.sh +++ b/pkgs/by-name/ch/chatgpt/update.sh @@ -8,7 +8,7 @@ XML_DATA=$(curl -s $XML_URL) LATEST_VERSION=$(echo "$XML_DATA" | xmllint --xpath '/rss/channel/item[1]/*[local-name()="shortVersionString"]/text()' -) DOWNLOAD_URL=$(echo "$XML_DATA" | xmllint --xpath 'string(//item[1]/enclosure/@url)' -) -HASH=$(nix-prefetch-url $DOWNLOAD_URL | xargs nix hash convert --hash-algo sha256) +HASH=$(nix-prefetch-url $DOWNLOAD_URL | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256) SOURCE_NIX="$(dirname ${BASH_SOURCE[0]})/source.nix" diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix index cbde13c0a97d..561a18d097f6 100644 --- a/pkgs/by-name/cl/clojure-lsp/package.nix +++ b/pkgs/by-name/cl/clojure-lsp/package.nix @@ -59,7 +59,7 @@ buildGraalvmNativeImage (finalAttrs: { old_jar_hash="$(nix-instantiate --strict --json --eval -A clojure-lsp.jar.drvAttrs.outputHash | jq -r .)" curl -o clojure-lsp-standalone.jar -sL "https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar" - new_jar_hash="$(nix-hash --flat --type sha256 clojure-lsp-standalone.jar | xargs -n1 nix hash convert --hash-algo sha256)" + new_jar_hash="$(nix-hash --flat --type sha256 clojure-lsp-standalone.jar | xargs -n1 nix --extra-experimental-features nix-command hash convert --hash-algo sha256)" rm -f clojure-lsp-standalone.jar diff --git a/pkgs/by-name/co/coder/update.sh b/pkgs/by-name/co/coder/update.sh index 6c12ef73b191..7f5e29d10b00 100755 --- a/pkgs/by-name/co/coder/update.sh +++ b/pkgs/by-name/co/coder/update.sh @@ -32,7 +32,7 @@ update_version_and_hashes() { # Fetch the new hash using nix-prefetch-url local NEW_HASH=$(nix-prefetch-url --type sha256 $URL) - local SRI_HASH=$(nix hash to-sri --type sha256 $NEW_HASH) + local SRI_HASH=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $NEW_HASH) # Update the Nix file with the new hash, using '#' as delimiter and preserving indentation sed -i "/${channel} = {/,/};/{ diff --git a/pkgs/by-name/co/confluent-cli/update.sh b/pkgs/by-name/co/confluent-cli/update.sh index 2992fffd400a..e237957438f0 100755 --- a/pkgs/by-name/co/confluent-cli/update.sh +++ b/pkgs/by-name/co/confluent-cli/update.sh @@ -26,6 +26,6 @@ for i in \ "x86_64-darwin darwin_amd64" \ "aarch64-darwin darwin_arm64"; do set -- $i - hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/$latestVersion/confluent_${latestVersion}_$2.tar.gz")) + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/$latestVersion/confluent_${latestVersion}_$2.tar.gz")) update-source-version confluent-cli $latestVersion $hash --system=$1 --ignore-same-version done diff --git a/pkgs/by-name/cr/crc/update.sh b/pkgs/by-name/cr/crc/update.sh index d022177a9354..8921955d5fb6 100755 --- a/pkgs/by-name/cr/crc/update.sh +++ b/pkgs/by-name/cr/crc/update.sh @@ -26,7 +26,7 @@ CRC_COMMIT=$(curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") CRC_GIT_PREFETCH=$(nix-prefetch-url --unpack https://github.com/crc-org/crc/archive/${CRC_COMMIT}.tar.gz) -CRC_GIT_HASH=$(nix hash convert --to sri --hash-algo sha256 ${CRC_GIT_PREFETCH}) +CRC_GIT_HASH=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 ${CRC_GIT_PREFETCH}) FILE_MAKEFILE=${WORKDIR}/Makefile curl --silent https://raw.githubusercontent.com/crc-org/crc/${CRC_COMMIT}/Makefile >$FILE_MAKEFILE diff --git a/pkgs/by-name/db/dbgate/update.sh b/pkgs/by-name/db/dbgate/update.sh index a7acfa2c0e91..1e893aaa7706 100755 --- a/pkgs/by-name/db/dbgate/update.sh +++ b/pkgs/by-name/db/dbgate/update.sh @@ -17,6 +17,6 @@ for system in \ aarch64-linux \ x86_64-darwin \ aarch64-darwin; do - hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; dbgate.src.url" --system "$system" | tr -d '"'))) + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; dbgate.src.url" --system "$system" | tr -d '"'))) update-source-version dbgate $latestVersion $hash --system=$system --ignore-same-version done diff --git a/pkgs/by-name/de/dependabot-cli/update.sh b/pkgs/by-name/de/dependabot-cli/update.sh index a01d0accfa32..6ec4191c948e 100755 --- a/pkgs/by-name/de/dependabot-cli/update.sh +++ b/pkgs/by-name/de/dependabot-cli/update.sh @@ -21,7 +21,7 @@ if [ "$OLD_VERSION" = "$VERSION" ]; then fi SHA256="$(nix-prefetch-url --quiet --unpack https://github.com/dependabot/cli/archive/refs/tags/v${VERSION}.tar.gz)" -HASH="$(nix hash convert --hash-algo sha256 --to sri "$SHA256")" +HASH="$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$SHA256")" nix-prefetch-docker --json --quiet --final-image-name dependabot-update-job-proxy --final-image-tag "nixpkgs-dependabot-cli-$VERSION" ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy latest > "$temp_dir/dependabot-update-job-proxy.json" diff --git a/pkgs/by-name/dr/draupnir/update.sh b/pkgs/by-name/dr/draupnir/update.sh index 78842bfcbfc4..604deb5ec211 100755 --- a/pkgs/by-name/dr/draupnir/update.sh +++ b/pkgs/by-name/dr/draupnir/update.sh @@ -29,7 +29,7 @@ cd $TMPDIR curl https://raw.githubusercontent.com/the-draupnir-project/Draupnir/v$latestVersion/yarn.lock -o yarn.lock TMP_PREFETCH_HASH=`prefetch-yarn-deps yarn.lock` -NEW_YARN_OFFLINE_HASH=`nix hash to-sri --type sha256 $TMP_PREFETCH_HASH` +NEW_YARN_OFFLINE_HASH=`nix --extra-experimental-features nix-command hash to-sri --type sha256 $TMP_PREFETCH_HASH` cd - echo "New yarn offline hash: $NEW_YARN_OFFLINE_HASH" diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix index 803bada022dd..9f61595f0f20 100644 --- a/pkgs/by-name/du/duplicati/package.nix +++ b/pkgs/by-name/du/duplicati/package.nix @@ -18,7 +18,7 @@ let "aarch64-linux" = "linux-arm64"; }; _platform = _supportedPlatforms."${stdenv.hostPlatform.system}"; - # nix hash convert --to sri "sha256:`nix-prefetch-url --unpack https://updates.duplicati.com/stable/duplicati-2.1.0.5_stable_2025-03-04-linux-arm64-cli.zip`" + # nix --extra-experimental-features nix-command hash convert --to sri "sha256:`nix-prefetch-url --unpack https://updates.duplicati.com/stable/duplicati-2.1.0.5_stable_2025-03-04-linux-arm64-cli.zip`" _fileHashForSystem = { "armv7l-linux" = "sha256-FQQ07M0rwvxNkHPW6iK5WBTKgFrZ4LOP4vgINfmtq4k="; "x86_64-linux" = "sha256-1QspF/A3hOtqd8bVbSqClJIHUN9gBrd18J5qvZJLkQE="; diff --git a/pkgs/by-name/dy/dynamodb-local/package.nix b/pkgs/by-name/dy/dynamodb-local/package.nix index 177950548dc2..82be1d83820d 100644 --- a/pkgs/by-name/dy/dynamodb-local/package.nix +++ b/pkgs/by-name/dy/dynamodb-local/package.nix @@ -74,7 +74,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { fi DOWNLOAD_URL="https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_$NEW_VERSION_DATE.tar.gz" - NIX_HASH=$(nix hash to-sri sha256:$(nix-prefetch-url $DOWNLOAD_URL)) + NIX_HASH=$(nix --extra-experimental-features nix-command hash to-sri sha256:$(nix-prefetch-url $DOWNLOAD_URL)) update-source-version "dynamodb-local" "$NEW_VERSION" "$NIX_HASH" "$DOWNLOAD_URL" ''; diff --git a/pkgs/by-name/el/electrs/update.sh b/pkgs/by-name/el/electrs/update.sh index db6a2fa5639f..0c1db1772886 100755 --- a/pkgs/by-name/el/electrs/update.sh +++ b/pkgs/by-name/el/electrs/update.sh @@ -32,7 +32,7 @@ echo "Verifying commit" git -C $repo verify-tag v${version} rm -rf $repo/.git -hash=$(nix hash path $repo) +hash=$(nix --extra-experimental-features nix-command hash path $repo) (cd "$nixpkgs" && update-source-version electrs "$version" "$hash" && update-source-version electrs --ignore-same-version --source-key=cargoDeps) echo diff --git a/pkgs/by-name/en/envoy-bin/update.sh b/pkgs/by-name/en/envoy-bin/update.sh index df32827256aa..e0ae167b10e7 100755 --- a/pkgs/by-name/en/envoy-bin/update.sh +++ b/pkgs/by-name/en/envoy-bin/update.sh @@ -14,7 +14,7 @@ fetch_arch() { VER="$1" ARCH="$2" URL="https://github.com/envoyproxy/envoy/releases/download/v${VER}/envoy-${VER}-linux-${ARCH}" - nix hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "$URL")" + nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "$URL")" } replace_hash() { diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix index fbbe4ad8f67f..28193a77a4e2 100644 --- a/pkgs/by-name/fe/feishu/package.nix +++ b/pkgs/by-name/fe/feishu/package.nix @@ -217,7 +217,7 @@ stdenv.mkDerivation { update_link=$(echo $package_info | jq -r '.data.download_link' | sed 's/lf[0-9]*-ug-sign.feishucdn.com/sf3-cn.feishucdn.com\/obj/;s/?.*$//') new_version=$(echo $package_info | jq -r '.data.version_number' | sed -n 's/.*@V//p') sha256_hash=$(nix-prefetch-url $update_link) - sri_hash=$(nix hash to-sri --type sha256 $sha256_hash) + sri_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $sha256_hash) update-source-version feishu $new_version $sri_hash $update_link --system=$platform --ignore-same-version --source-key="sources.$platform" done ''; diff --git a/pkgs/by-name/fi/fishnet/update.bash b/pkgs/by-name/fi/fishnet/update.bash index 8bf6997f3936..6e40cba6bfec 100644 --- a/pkgs/by-name/fi/fishnet/update.bash +++ b/pkgs/by-name/fi/fishnet/update.bash @@ -14,7 +14,7 @@ new_nnue_big_file="$( grep --perl-regexp --only-matching 'EvalFileDefaultNameBig "\Knn-(\w+).nnue' )" new_nnue_big_hash="$( - nix hash to-sri --type sha256 "$( + nix --extra-experimental-features nix-command hash to-sri --type sha256 "$( nix-prefetch-url --type sha256 "https://tests.stockfishchess.org/api/nn/${new_nnue_big_file}" )" )" @@ -23,7 +23,7 @@ new_nnue_small_file="$( grep --perl-regexp --only-matching 'EvalFileDefaultNameSmall "\Knn-(\w+).nnue' )" new_nnue_small_hash="$( - nix hash to-sri --type sha256 "$( + nix --extra-experimental-features nix-command hash to-sri --type sha256 "$( nix-prefetch-url --type sha256 "https://tests.stockfishchess.org/api/nn/${new_nnue_small_file}" )" )" diff --git a/pkgs/by-name/fl/fluxcd/update.sh b/pkgs/by-name/fl/fluxcd/update.sh index bc229dd6c72e..33decbba8a91 100755 --- a/pkgs/by-name/fl/fluxcd/update.sh +++ b/pkgs/by-name/fl/fluxcd/update.sh @@ -12,9 +12,9 @@ LATEST_VERSION=$(echo "${LATEST_TAG}" | sed 's/^v//') if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then SRC_SHA256=$(nix-prefetch-url --quiet --unpack "https://github.com/fluxcd/flux2/archive/refs/tags/${LATEST_TAG}.tar.gz") - SRC_HASH=$(nix hash convert --hash-algo sha256 --to sri "$SRC_SHA256") + SRC_HASH=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$SRC_SHA256") MANIFESTS_SHA256=$(nix-prefetch-url --quiet --unpack "https://github.com/fluxcd/flux2/releases/download/${LATEST_TAG}/manifests.tar.gz") - MANIFESTS_HASH=$(nix hash convert --hash-algo sha256 --to sri "$MANIFESTS_SHA256") + MANIFESTS_HASH=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$MANIFESTS_SHA256") setKV () { sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${FLUXCD_PATH}/package.nix" @@ -27,7 +27,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then set +e VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd "$NIXPKGS_PATH" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') - VENDOR_HASH=$(nix hash convert --hash-algo sha256 --to sri "$VENDOR_SHA256") + VENDOR_HASH=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$VENDOR_SHA256") set -e if [ -n "${VENDOR_HASH:-}" ]; then diff --git a/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix b/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix index 1bf16e984bea..36025ca24492 100644 --- a/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix +++ b/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix @@ -91,7 +91,7 @@ stdenvNoCC.mkDerivation ( echo "Fetching hash for $system" hash=$(nix-prefetch-url --type sha256 $url --unpack) - sriHash="$(nix hash to-sri --type sha256 $hash)" + sriHash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)" yq -iPoj ". + { \"$system\": { \"url\": \"$url\", \"hash\": \"$sriHash\" } }" "$tempfile" } @@ -101,7 +101,7 @@ stdenvNoCC.mkDerivation ( echo "Fetching hash" hash=$(nix-prefetch-url --type sha256 $url --unpack) - sriHash="$(nix hash to-sri --type sha256 $hash)" + sriHash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)" yq -iPoj ". + { \"url\": \"$url\", \"hash\": \"$sriHash\" }" "$tempfile" } diff --git a/pkgs/by-name/go/google-chrome/update.sh b/pkgs/by-name/go/google-chrome/update.sh index c65b8ae4dfec..d6428933d270 100755 --- a/pkgs/by-name/go/google-chrome/update.sh +++ b/pkgs/by-name/go/google-chrome/update.sh @@ -41,7 +41,7 @@ update_linux() { local download_url="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${version}-1_amd64.deb" new_hash="$(nix-prefetch-url "$download_url" 2>/dev/null)" - new_sri_hash="$(nix hash to-sri --type sha256 "$new_hash")" + new_sri_hash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$new_hash")" sed -i "/^ linux = stdenvNoCC.mkDerivation/,/^ });/s/version = \".*\"/version = \"$version\"/" "$DEFAULT_NIX" sed -i "/^ linux = stdenvNoCC.mkDerivation/,/^ });/s|hash = \".*\"|hash = \"$new_sri_hash\"|" "$DEFAULT_NIX" @@ -87,8 +87,8 @@ update_darwin() { manifest_version="$(echo "$response" | xmllint --xpath "string(//manifest/@version)" -)" local download_url="$url$pkg" - new_hash="$(nix hash to-sri --type sha256 "$(nix-prefetch-url "$download_url" 2>/dev/null)")" - new_sri_hash="$(nix hash to-sri --type sha256 "$new_hash")" + new_hash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$(nix-prefetch-url "$download_url" 2>/dev/null)")" + new_sri_hash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$new_hash")" sed -i "/^ darwin = stdenvNoCC.mkDerivation/,/^ });/s/version = \".*\"/version = \"$manifest_version\"/" "$DEFAULT_NIX" sed -i "/^ darwin = stdenvNoCC.mkDerivation/,/^ });/s|hash = \".*\"|hash = \"$new_sri_hash\"|" "$DEFAULT_NIX" diff --git a/pkgs/by-name/ha/hamrs-pro/update.sh b/pkgs/by-name/ha/hamrs-pro/update.sh index dfd93fa6788a..7913ced30cbb 100755 --- a/pkgs/by-name/ha/hamrs-pro/update.sh +++ b/pkgs/by-name/ha/hamrs-pro/update.sh @@ -19,6 +19,6 @@ for system in \ aarch64-linux \ x86_64-darwin \ aarch64-darwin; do - hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; hamrs-pro.src.url" --system "$system" | tr -d '"'))) + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; hamrs-pro.src.url" --system "$system" | tr -d '"'))) update-source-version hamrs-pro $latestVersion $hash --system=$system --ignore-same-version done diff --git a/pkgs/by-name/he/hey-mail/package.nix b/pkgs/by-name/he/hey-mail/package.nix index b4e3f10b2995..472c5fc80dfe 100644 --- a/pkgs/by-name/he/hey-mail/package.nix +++ b/pkgs/by-name/he/hey-mail/package.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: { if [[ "x$UPDATE_NIX_OLD_VERSION" != "x$version" ]]; then revision=$(jq -r .revision <<<"$data") - hash=$(nix hash to-sri "sha512:$(jq -r .download_sha512 <<<"$data")") + hash=$(nix --extra-experimental-features nix-command hash to-sri "sha512:$(jq -r .download_sha512 <<<"$data")") update-source-version "$UPDATE_NIX_ATTR_PATH" "$version" "$hash" update-source-version --ignore-same-hash --version-key=rev "$UPDATE_NIX_ATTR_PATH" "$revision" "$hash" diff --git a/pkgs/by-name/ho/hoppscotch/update.sh b/pkgs/by-name/ho/hoppscotch/update.sh index dbdb039c00bc..dd18d1942cad 100755 --- a/pkgs/by-name/ho/hoppscotch/update.sh +++ b/pkgs/by-name/ho/hoppscotch/update.sh @@ -19,6 +19,6 @@ for system in \ x86_64-linux \ x86_64-darwin \ aarch64-darwin; do - hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import $BASEDIR {}; hoppscotch.src.url" --system "$system" | tr -d '"'))) + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import $BASEDIR {}; hoppscotch.src.url" --system "$system" | tr -d '"'))) (cd $BASEDIR && update-source-version hoppscotch $latestVersion $hash --system=$system --ignore-same-version) done diff --git a/pkgs/by-name/i-/i-dot-ming/package.nix b/pkgs/by-name/i-/i-dot-ming/package.nix index 3254482681ba..0fd556b1bc65 100644 --- a/pkgs/by-name/i-/i-dot-ming/package.nix +++ b/pkgs/by-name/i-/i-dot-ming/package.nix @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec { curl -Lo $tmp/I.Ming.ttf https://raw.githubusercontent.com/ichitenfont/I.Ming/$version/$version/I.Ming-$version.ttf install -DT -m444 $tmp/I.Ming.ttf $tmp/share/fonts/truetype/I.Ming/I.Ming.ttf rm $tmp/I.Ming.ttf - hash=$(nix hash path --type sha256 --base32 --sri $tmp) + hash=$(nix --extra-experimental-features nix-command hash path --type sha256 --base32 --sri $tmp) sed -i -E \ -e "s/version = \"[0-9.]+\"/version = \"$version\"/" \ -e "s|hash = \".*\"|hash = \"$hash\"|" \ diff --git a/pkgs/by-name/ib/ibm-plex/update.sh b/pkgs/by-name/ib/ibm-plex/update.sh index dd91a5521e9d..c44aac891530 100755 --- a/pkgs/by-name/ib/ibm-plex/update.sh +++ b/pkgs/by-name/ib/ibm-plex/update.sh @@ -37,7 +37,7 @@ printf '{\n' > "$dirname/hashes.nix" for family in "${families[@]}"; do url="https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-${family}%40${version}/ibm-plex-${family}.zip" - printf ' "%s" = "%s";\n' "$family" "$(nix-prefetch-url --unpack "$url" | xargs nix hash convert --hash-algo sha256)" >>"$dirname/hashes.nix" + printf ' "%s" = "%s";\n' "$family" "$(nix-prefetch-url --unpack "$url" | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256)" >>"$dirname/hashes.nix" done printf '}\n' >> "$dirname/hashes.nix" diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index 6bd6791ffd11..796792cf725d 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { version="$(jq -r .version <<<$core_json)" sha256="$(jq -r .sha256 <<<$core_json)" - hash="$(nix hash to-sri --type sha256 "$sha256")" + hash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$sha256")" if [ ! "$oldVersion" = "$version" ]; then update-source-version jenkins "$version" "$hash" diff --git a/pkgs/by-name/je/jetbrains-toolbox/update.sh b/pkgs/by-name/je/jetbrains-toolbox/update.sh index 6e0619033962..03f58c1829de 100755 --- a/pkgs/by-name/je/jetbrains-toolbox/update.sh +++ b/pkgs/by-name/je/jetbrains-toolbox/update.sh @@ -28,6 +28,6 @@ for system in $systems; do unpack="" fi prefetch=$(nix-prefetch-url $unpack "$url") - hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch) + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $prefetch) update-source-version jetbrains-toolbox $latestVersion $hash --system=$system --ignore-same-version done diff --git a/pkgs/by-name/ke/keyguard/update.sh b/pkgs/by-name/ke/keyguard/update.sh index 803f359bf537..872efbf61632 100755 --- a/pkgs/by-name/ke/keyguard/update.sh +++ b/pkgs/by-name/ke/keyguard/update.sh @@ -20,7 +20,7 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then exit 0 fi -hash=$(nix hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/AChep/keyguard-app/archive/refs/tags/${latestTag}.tar.gz")) +hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/AChep/keyguard-app/archive/refs/tags/${latestTag}.tar.gz")) update-source-version keyguard $latestVersion $hash sed -i 's/tag = "r[0-9]\+\(\.[0-9]\+\)\?";/tag = "'"$latestTag"'";/g' "$ROOT/package.nix" diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/update.sh b/pkgs/by-name/li/librewolf-bin-unwrapped/update.sh index beeee3124a37..9116a5b95dc1 100755 --- a/pkgs/by-name/li/librewolf-bin-unwrapped/update.sh +++ b/pkgs/by-name/li/librewolf-bin-unwrapped/update.sh @@ -19,6 +19,6 @@ for i in \ "x86_64-linux linux-x86_64" \ "aarch64-linux linux-arm64"; do set -- $i - hash=$(nix hash convert --to sri --hash-algo sha256 $(curl ${GITLAB_TOKEN:+-H "Private-Token: $GITLAB_TOKEN"} -sL https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/$latestVersion/librewolf-$latestVersion-$2-package.tar.xz.sha256sum)) + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(curl ${GITLAB_TOKEN:+-H "Private-Token: $GITLAB_TOKEN"} -sL https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/$latestVersion/librewolf-$latestVersion-$2-package.tar.xz.sha256sum)) update-source-version librewolf-bin-unwrapped $latestVersion $hash --system=$1 --ignore-same-version done diff --git a/pkgs/by-name/lm/lmstudio/update.sh b/pkgs/by-name/lm/lmstudio/update.sh index 4b9f5ef47560..415c2006e172 100755 --- a/pkgs/by-name/lm/lmstudio/update.sh +++ b/pkgs/by-name/lm/lmstudio/update.sh @@ -11,7 +11,7 @@ for system in "aarch64-darwin darwin/arm64" "x86_64-linux linux/x64"; do arch="${1}" url=$(echo "${packages}" | grep "${2}") version="$(echo "${url}" | cut -d/ -f6)" - hash=$(nix hash convert --hash-algo sha256 "$(nix-prefetch-url "${url}")") + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 "$(nix-prefetch-url "${url}")") update-source-version lmstudio "${version}" "${hash}" --system="${arch}" --version-key="version_${arch}" \ 2> >(tee /dev/stderr) | grep -q "nothing to do" && exit diff --git a/pkgs/by-name/lo/localsend/update.sh b/pkgs/by-name/lo/localsend/update.sh index 1b8b3085b933..de38328446b2 100755 --- a/pkgs/by-name/lo/localsend/update.sh +++ b/pkgs/by-name/lo/localsend/update.sh @@ -17,10 +17,10 @@ fi sed -i "s/version = \".*\"/version = \"${latestVersion}\"/" "$ROOT/package.nix" DARWIN_x64_URL="https://github.com/localsend/localsend/releases/download/v${latestVersion}/LocalSend-${latestVersion}.dmg" -DARWIN_X64_SHA=$(nix hash to-sri --type sha256 $(nix-prefetch-url ${DARWIN_x64_URL})) +DARWIN_X64_SHA=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url ${DARWIN_x64_URL})) sed -i "/darwin/,/hash/{s|hash = \".*\"|hash = \"${DARWIN_X64_SHA}\"|}" "$ROOT/package.nix" GIT_SRC_URL="https://github.com/localsend/localsend/archive/refs/tags/v${latestVersion}.tar.gz" -GIT_SRC_SHA=$(nix hash to-sri --type sha256 $(nix-prefetch-url --unpack ${GIT_SRC_URL})) +GIT_SRC_SHA=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --unpack ${GIT_SRC_URL})) sed -i "/linux/,/hash/{s|hash = \".*\"|hash = \"${GIT_SRC_SHA}\"|}" "$ROOT/package.nix" curl https://raw.githubusercontent.com/localsend/localsend/v${latestVersion}/app/pubspec.lock | yq . > $ROOT/pubspec.lock.json diff --git a/pkgs/by-name/mi/mihomo-party/update.sh b/pkgs/by-name/mi/mihomo-party/update.sh index 406680fd0208..9e12398c0068 100755 --- a/pkgs/by-name/mi/mihomo-party/update.sh +++ b/pkgs/by-name/mi/mihomo-party/update.sh @@ -18,6 +18,6 @@ for i in \ "aarch64-linux arm64"; do set -- $i prefetch=$(nix-prefetch-url "https://github.com/mihomo-party-org/mihomo-party/releases/download/v$latestVersion/mihomo-party-linux-$latestVersion-$2.deb") - hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch) + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $prefetch) update-source-version mihomo-party $latestVersion $hash --system=$1 --ignore-same-version done diff --git a/pkgs/by-name/mu/mullvad-browser/update.nix b/pkgs/by-name/mu/mullvad-browser/update.nix index 148a8ecc9bcd..16cfdb2cc197 100644 --- a/pkgs/by-name/mu/mullvad-browser/update.nix +++ b/pkgs/by-name/mu/mullvad-browser/update.nix @@ -67,7 +67,7 @@ writeShellScript "update-${pname}" '' for platform in ${lib.escapeShellArgs meta.platforms}; do arch="''${platforms[$platform]}" sha256=$(grep "${name}-$arch-$version.tar.xz" "$HOME/shasums" | head -1 | cut -d" " -f1) - hash=$(nix hash to-sri --type sha256 "$sha256") + hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$sha256") update-source-version "${pname}" "$version" "$hash" --ignore-same-version --source-key="sources.$platform" done diff --git a/pkgs/by-name/nb/nbxplorer/util/update-common.sh b/pkgs/by-name/nb/nbxplorer/util/update-common.sh index e9b05253c403..2ac0118c26df 100755 --- a/pkgs/by-name/nb/nbxplorer/util/update-common.sh +++ b/pkgs/by-name/nb/nbxplorer/util/update-common.sh @@ -58,7 +58,7 @@ echo echo "Verifying commit" git -C $repo verify-commit HEAD rm -rf $repo/.git -newHash=$(nix hash-path $repo) +newHash=$(nix --extra-experimental-features nix-command hash path $repo) rm -rf $tmpdir echo diff --git a/pkgs/by-name/om/ombi/update.sh b/pkgs/by-name/om/ombi/update.sh index 9b49180b6f11..0a32e9b423cc 100755 --- a/pkgs/by-name/om/ombi/update.sh +++ b/pkgs/by-name/om/ombi/update.sh @@ -15,7 +15,7 @@ updateHash() url="https://github.com/Ombi-app/Ombi/releases/download/v$version/$os-$arch.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) - sriHash="$(nix hash to-sri --type sha256 $hash)" + sriHash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)" sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" } diff --git a/pkgs/by-name/pd/pdfium-binaries/update.sh b/pkgs/by-name/pd/pdfium-binaries/update.sh index 8cc3aecd7933..7546a8926329 100755 --- a/pkgs/by-name/pd/pdfium-binaries/update.sh +++ b/pkgs/by-name/pd/pdfium-binaries/update.sh @@ -21,7 +21,7 @@ for system in \ aarch64-linux \ x86_64-darwin \ aarch64-darwin; do - hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url --unpack $(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries.src.url" --system "$system" | tr -d '"'))) + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url --unpack $(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries.src.url" --system "$system" | tr -d '"'))) update-source-version pdfium-binaries $latestVersion $hash --system=$system --ignore-same-version done @@ -30,6 +30,6 @@ for system in \ aarch64-linux \ x86_64-darwin \ aarch64-darwin; do - hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url --unpack $(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries-v8.src.url" --system "$system" | tr -d '"'))) + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url --unpack $(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries-v8.src.url" --system "$system" | tr -d '"'))) update-source-version pdfium-binaries-v8 $latestVersion $hash --system=$system --ignore-same-version done diff --git a/pkgs/by-name/pe/perses/update.sh b/pkgs/by-name/pe/perses/update.sh index 8c0948f24e75..092727655033 100755 --- a/pkgs/by-name/pe/perses/update.sh +++ b/pkgs/by-name/pe/perses/update.sh @@ -23,7 +23,7 @@ src="$(nix-build -A "${UPDATE_NIX_ATTR_PATH}".src --no-out-link)" echo " url = \"${url}\";" hash="$(nix-prefetch-url "${url}" --name "${UPDATE_NIX_PNAME}-${name,,}-${version}.tar.gz")" - hash="$(nix hash convert --hash-algo sha256 "${hash}")" + hash="$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 "${hash}")" echo " hash = \"${hash}\";" diff --git a/pkgs/by-name/ph/phoenixd/update.sh b/pkgs/by-name/ph/phoenixd/update.sh index 3b43d0443740..a983312c6a71 100755 --- a/pkgs/by-name/ph/phoenixd/update.sh +++ b/pkgs/by-name/ph/phoenixd/update.sh @@ -19,6 +19,6 @@ for system in \ aarch64-linux \ x86_64-darwin \ aarch64-darwin; do - hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; phoenixd.src.url" --system "$system" | tr -d '"'))) + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; phoenixd.src.url" --system "$system" | tr -d '"'))) update-source-version phoenixd $latestVersion $hash --system=$system --ignore-same-version done diff --git a/pkgs/by-name/pi/pilipalax/update.sh b/pkgs/by-name/pi/pilipalax/update.sh index dd22b6a805c3..6f8e37101fd3 100755 --- a/pkgs/by-name/pi/pilipalax/update.sh +++ b/pkgs/by-name/pi/pilipalax/update.sh @@ -18,7 +18,7 @@ fi sed -i "s/\(tag = \"\${version}+\)[0-9]\+/\1${RunNumber}/" "$ROOT/package.nix" -hash=$(nix hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/orz12/PiliPalaX/archive/refs/tags/${latestTag}.tar.gz")) +hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/orz12/PiliPalaX/archive/refs/tags/${latestTag}.tar.gz")) update-source-version pilipalax $latestVersion $hash curl https://raw.githubusercontent.com/orz12/PiliPalaX/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json diff --git a/pkgs/by-name/pl/platformsh/update.sh b/pkgs/by-name/pl/platformsh/update.sh index a5df69f2970b..6da4fddd5ffe 100755 --- a/pkgs/by-name/pl/platformsh/update.sh +++ b/pkgs/by-name/pl/platformsh/update.sh @@ -10,9 +10,9 @@ version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ linux_arm64_url=https://github.com/platformsh/cli/releases/download/$version/platform_${version}_linux_arm64.tar.gz linux_amd64_url=https://github.com/platformsh/cli/releases/download/$version/platform_${version}_linux_amd64.tar.gz darwin_all_url=https://github.com/platformsh/cli/releases/download/$version/platform_${version}_darwin_all.tar.gz -linux_arm64_hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$linux_arm64_url")) -linux_amd64_hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$linux_amd64_url")) -darwin_all_hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$darwin_all_url")) +linux_arm64_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$linux_arm64_url")) +linux_amd64_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$linux_amd64_url")) +darwin_all_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$darwin_all_url")) jq -n \ --arg version "$version" \ --arg darwin_all_hash "$darwin_all_hash" \ diff --git a/pkgs/by-name/pr/protoc-gen-grpc-java/update.sh b/pkgs/by-name/pr/protoc-gen-grpc-java/update.sh index a7e62e72cea1..b0c8e2f98df4 100755 --- a/pkgs/by-name/pr/protoc-gen-grpc-java/update.sh +++ b/pkgs/by-name/pr/protoc-gen-grpc-java/update.sh @@ -27,7 +27,7 @@ version="$( echo '{' >"${HASHES_FILE}" for arch in "${ARCHS[@]}"; do url="https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/${version}/protoc-gen-grpc-java-${version}-${arch}.exe" - hash=$(nix hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url "${url}")") + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url "${url}")") echo " ${arch} = \"${hash}\";" >>"${HASHES_FILE}" done echo '}' >>"${HASHES_FILE}" diff --git a/pkgs/by-name/qq/qq/update.sh b/pkgs/by-name/qq/qq/update.sh index e281dbf08b72..334f6e9443b8 100755 --- a/pkgs/by-name/qq/qq/update.sh +++ b/pkgs/by-name/qq/qq/update.sh @@ -16,7 +16,7 @@ darwin_url=$(jq -r .downloadUrl <<< "$darwin_payload") darwin_hash=$(nix-prefetch-url $darwin_url) # use friendlier hashes -darwin_hash=$(nix hash convert --to sri --hash-algo sha256 "$darwin_hash") +darwin_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$darwin_hash") # linux @@ -31,8 +31,8 @@ linux_aarch64_hash=$(nix-prefetch-url $linux_aarch64_url) linux_x86_64_hash=$(nix-prefetch-url $linux_x86_64_url) # use friendlier hashes -linux_aarch64_hash=$(nix hash convert --to sri --hash-algo sha256 "$linux_aarch64_hash") -linux_x86_64_hash=$(nix hash convert --to sri --hash-algo sha256 "$linux_x86_64_hash") +linux_aarch64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$linux_aarch64_hash") +linux_x86_64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$linux_x86_64_hash") cat >sources.nix <sources.nix <sources.nix < str: new_hash = run_command(f"nix-prefetch-url --unpack --type sha256 {prefetch_url} 2>/dev/null") if not new_hash.startswith("sha256-"): - new_hash = run_command(f"nix hash to-sri --type sha256 {new_hash} 2>/dev/null") + new_hash = run_command(f"nix --extra-experimental-features nix-command hash to-sri --type sha256 {new_hash} 2>/dev/null") if not new_hash.startswith("sha256-"): print("Warning: Failed to get SRI hash directly, trying alternative method...") raw_hash = run_command(f"nix-prefetch-url --type sha256 {prefetch_url} 2>/dev/null") - new_hash = run_command(f"nix hash to-sri --type sha256 {raw_hash} 2>/dev/null") + new_hash = run_command(f"nix --extra-experimental-features nix-command hash to-sri --type sha256 {raw_hash} 2>/dev/null") except Exception as e: raise RuntimeError(f"Error calculating hash: {e}") diff --git a/pkgs/by-name/zo/zoom-us/update.sh b/pkgs/by-name/zo/zoom-us/update.sh index b7d7be55f1b8..d307058ceb5d 100755 --- a/pkgs/by-name/zo/zoom-us/update.sh +++ b/pkgs/by-name/zo/zoom-us/update.sh @@ -21,9 +21,9 @@ echo >&2 "=== Downloading packages and computing hashes..." # causes cross compiling headaches; using nix-prefetch-url with # hard-coded URLs is simpler. Keep these URLs in sync with the ones # in package.nix where `srcs` is defined. -hash_aarch64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_aarch64_darwin}/zoomusInstallerFull.pkg?archType=arm64")) -hash_x86_64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_darwin}/zoomusInstallerFull.pkg")) -hash_x86_64_linux=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_linux}/zoom_x86_64.pkg.tar.xz")) +hash_aarch64_darwin=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_aarch64_darwin}/zoomusInstallerFull.pkg?archType=arm64")) +hash_x86_64_darwin=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_darwin}/zoomusInstallerFull.pkg")) +hash_x86_64_linux=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_linux}/zoom_x86_64.pkg.tar.xz")) echo >&2 "=== Updating package.nix ..." # update-source-version expects to be at the root of nixpkgs diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 2eb3d9cc234e..2e4b41244d70 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -43,7 +43,7 @@ platform_sources () { [[ -z "$url" || -z "$hash" ]] && continue - hash=$(nix hash convert --to sri --hash-algo sha512 "$hash") + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") echo " $rid = { url = \"$url\"; @@ -73,7 +73,7 @@ generate_package_list() { if hash=$(curl -s --head "$url" -o /dev/null -w '%header{x-ms-meta-sha512}') && [[ -n "$hash" ]]; then # Undocumented fast path for nuget.org # https://github.com/NuGet/NuGetGallery/issues/9433#issuecomment-1472286080 - hash=$(nix hash convert --to sri --hash-algo sha512 "$hash") + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") elif { catalog_url=$(curl -sL --compressed "${nuget_registration_base_url}${pkg,,}/${version,,}.json" | jq -r ".catalogEntry") && [[ -n "$catalog_url" ]] && catalog=$(curl -sL "$catalog_url") && [[ -n "$catalog" ]] && @@ -81,11 +81,11 @@ generate_package_list() { hash=$(jq -er '.packageHash' <<<"$catalog") && [[ -n "$hash" ]] }; then # Documented but slower path (requires 2 requests) - hash=$(nix hash convert --to sri --hash-algo "${hash_algorithm,,}" "$hash") + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo "${hash_algorithm,,}" "$hash") elif hash=$(nix-prefetch-url "$url" --type sha512); then # Fallback to downloading and hashing locally echo "Failed to fetch hash from nuget for $url, falling back to downloading locally" >&2 - hash=$(nix hash convert --to sri --hash-algo sha512 "$hash") + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") else echo "Failed to fetch hash for $url" >&2 exit 1 diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix index 52d5f2212b1b..ea5de7396f10 100644 --- a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix +++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix @@ -2,7 +2,7 @@ # https://www.oracle.com/java/technologies/javase/graalvm-jdk23-archive-downloads.html # Then run this script: # $ rg -No "(https://.+)\"" -r '$1' pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix | \ -# parallel -k 'echo {}; nix hash convert --hash-algo sha256 --to sri $(curl -s {}.sha256)' +# parallel -k 'echo {}; nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(curl -s {}.sha256)' { "23" = { "aarch64-linux" = { diff --git a/pkgs/development/libraries/libcef/update.sh b/pkgs/development/libraries/libcef/update.sh index 04bfeb627a52..556337c5333d 100755 --- a/pkgs/development/libraries/libcef/update.sh +++ b/pkgs/development/libraries/libcef/update.sh @@ -38,6 +38,6 @@ declare -a platforms=( for platform in "${platforms[@]}"; do read -r system arch <<< "$platform" url="https://cef-builds.spotifycdn.com/cef_binary_${cef_version}+g${git_revision}+chromium-${chromium_version}_linux${arch}_minimal.tar.bz2" - hash=$(nix hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --quiet "$url")") + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --quiet "$url")") update-source-version libcef "$cef_version" "$hash" --system="$system" --ignore-same-version done diff --git a/pkgs/development/libraries/science/math/libtorch/prefetch.sh b/pkgs/development/libraries/science/math/libtorch/prefetch.sh index d8680d3a60cf..4ae96be7aa75 100755 --- a/pkgs/development/libraries/science/math/libtorch/prefetch.sh +++ b/pkgs/development/libraries/science/math/libtorch/prefetch.sh @@ -23,7 +23,7 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --unpack "$url" --name "$name")) + hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --unpack "$url" --name "$name")) echo " $key = {" >> $hashfile echo " name = \"$name\";" >> $hashfile diff --git a/pkgs/development/python-modules/jaxlib/prefetch.sh b/pkgs/development/python-modules/jaxlib/prefetch.sh index 1a4f38daa6a7..d90cb0e97ff9 100755 --- a/pkgs/development/python-modules/jaxlib/prefetch.sh +++ b/pkgs/development/python-modules/jaxlib/prefetch.sh @@ -6,7 +6,7 @@ prefetch() { url=$(NIX_PATH=.. nix-instantiate --eval -E "$expr" | jq -r) echo "$url" sha256=$(nix-prefetch-url "$url") - nix hash convert --to sri --hash-algo sha256 "$sha256" + nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$sha256" echo } diff --git a/pkgs/development/python-modules/mypy-boto3/update.sh b/pkgs/development/python-modules/mypy-boto3/update.sh index 53622b479ed4..3e9b90693ad2 100755 --- a/pkgs/development/python-modules/mypy-boto3/update.sh +++ b/pkgs/development/python-modules/mypy-boto3/update.sh @@ -368,7 +368,7 @@ for package in "${packages[@]}"; do if [ "${version}" != "${old_version}" ]; then url="https://pypi.io/packages/source/m/${package//-/_}/${package//-/_}-${version}.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) - sri_hash="$(nix hash to-sri --type sha256 $hash)" + sri_hash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)" awk -i inplace -v pkg="\"$package_short_name\"" -v new_version="$version" -v new_sha256="$sri_hash" ' # Match the line containing the package name diff --git a/pkgs/development/python-modules/ray/prefetch.sh b/pkgs/development/python-modules/ray/prefetch.sh index e12eb5e06558..e91ca7d77f8f 100755 --- a/pkgs/development/python-modules/ray/prefetch.sh +++ b/pkgs/development/python-modules/ray/prefetch.sh @@ -13,7 +13,7 @@ prefetch() { url=$(NIX_PATH=.. nix-instantiate --eval -E "$expr" | jq -r) sha256=$(nix-prefetch-url "$url") - hash=$(nix hash convert --to sri --hash-algo sha256 "$sha256") + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$sha256") echo -e " cp${1} = \"${hash}\";" >>$outfile echo diff --git a/pkgs/development/python-modules/torch/bin/prefetch.sh b/pkgs/development/python-modules/torch/bin/prefetch.sh index 169d5f802ab0..bfb942c2cad2 100755 --- a/pkgs/development/python-modules/torch/bin/prefetch.sh +++ b/pkgs/development/python-modules/torch/bin/prefetch.sh @@ -37,7 +37,7 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) echo " $key = {" >>$hashfile echo " name = \"$name\";" >>$hashfile diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index 466e4a4c043f..b3c22e498664 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -37,7 +37,7 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) echo " $key = {" >>$hashfile echo " name = \"$name\";" >>$hashfile diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index 06decb3e3b09..d4d631cc96b5 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -36,7 +36,7 @@ for url_and_key in "${url_and_key_list[@]}"; do name=$(echo "$url_and_key" | cut -d' ' -f3) echo "prefetching ${url}..." - hash=$(nix hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 $(nix-prefetch-url "$url" --name "$name")) echo " $key = {" >>$hashfile echo " name = \"$name\";" >>$hashfile diff --git a/pkgs/development/python-modules/types-aiobotocore/update.sh b/pkgs/development/python-modules/types-aiobotocore/update.sh index b9dd1c209a9e..de00ff30f3ff 100755 --- a/pkgs/development/python-modules/types-aiobotocore/update.sh +++ b/pkgs/development/python-modules/types-aiobotocore/update.sh @@ -371,7 +371,7 @@ for package in "${packages[@]}"; do url="https://pypi.io/packages/source/t/${package}/${package//-/_}-${version}.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) - sri_hash="$(nix hash convert --hash-algo sha256 --to sri $hash)" + sri_hash="$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $hash)" package_short="${package#types-aiobotocore-}" awk -i inplace -v pkg="$package" -v pkg_short="$package_short" -v ver="$version" -v hash="$sri_hash" ' diff --git a/pkgs/development/tools/continuous-integration/woodpecker/update.sh b/pkgs/development/tools/continuous-integration/woodpecker/update.sh index a52906ac8c98..e1b4eb449dba 100755 --- a/pkgs/development/tools/continuous-integration/woodpecker/update.sh +++ b/pkgs/development/tools/continuous-integration/woodpecker/update.sh @@ -28,5 +28,5 @@ sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix # Woodpecker repository src_hash=$(nix-prefetch-url --type sha256 --unpack "https://github.com/woodpecker-ci/woodpecker/releases/download/v$version/woodpecker-src.tar.gz") -src_hash=$(nix hash to-sri --type sha256 "$src_hash") +src_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$src_hash") sed -i -E -e "s#srcHash = \".*\"#srcHash = \"$src_hash\"#" common.nix diff --git a/pkgs/development/tools/infisical/update.sh b/pkgs/development/tools/infisical/update.sh index d0ad2342f415..dc2a855d9cf0 100755 --- a/pkgs/development/tools/infisical/update.sh +++ b/pkgs/development/tools/infisical/update.sh @@ -29,7 +29,7 @@ printf "{ \"_comment\": \"@generated by pkgs/development/tools/infisical/update. for arch in "${ARCHS[@]}"; do IFS=: read -r arch_name arch_target <<< "$arch" sha256hash="$(nix-prefetch-url --type sha256 "https://github.com/infisical/infisical/releases/download/${RELEASE_NAME}/infisical_${VERSION}_${arch_target}.tar.gz")" - srihash="$(nix hash to-sri --type sha256 "$sha256hash")" + srihash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$sha256hash")" echo ", \"$arch_name\": \"$srihash\"" >> "$HFILE" done echo "}" >> "$HFILE" diff --git a/pkgs/development/tools/rover/update.sh b/pkgs/development/tools/rover/update.sh index a9a5bdb6ad6c..4cb5d448da34 100755 --- a/pkgs/development/tools/rover/update.sh +++ b/pkgs/development/tools/rover/update.sh @@ -24,7 +24,7 @@ rover_tar_url="https://github.com/apollographql/rover/archive/refs/tags/${rover_ } < <(nix-prefetch-url "$rover_tar_url" --unpack --type sha256 --print-path) # Convert hash to SRI representation -rover_sri_hash=$(nix hash to-sri --type sha256 "$rover_hash") +rover_sri_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$rover_hash") # Update rover version. sed --in-place \ diff --git a/pkgs/misc/lilypond/update.sh b/pkgs/misc/lilypond/update.sh index a2dc8e48242d..5d5f855dbd7c 100755 --- a/pkgs/misc/lilypond/update.sh +++ b/pkgs/misc/lilypond/update.sh @@ -21,5 +21,5 @@ echo "[{\"commitMessage\":\"$ATTR: $PREV -> $NEXT\"}]" # update hash PREV=$(nix eval --raw -f default.nix $ATTR.src.outputHash) -NEXT=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 --unpack $(nix eval --raw -f default.nix $ATTR.src.url))) +NEXT=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-url --type sha256 --unpack $(nix eval --raw -f default.nix $ATTR.src.url))) sed -i "s|$PREV|$NEXT|" "$FILE" diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 51bd7732b1e5..ac3b657e4a6e 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -4,7 +4,7 @@ # To get these, run: # # ``` - # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2025.2/$tool-2025.2.tar.gz --type sha256 | xargs nix hash convert --hash-algo sha256 --to sri; done + # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2025.2/$tool-2025.2.tar.gz --type sha256 | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri; done # ``` sha256 = { alfred = "sha256-Q0fR5LB5Svv2sXGoV7mjx9UaKR/FTxbNrZLH99HNtRo="; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix index 200e2d51bc69..4f247197dc13 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix @@ -22,7 +22,7 @@ rec { Run the following command: ``` - nix hash path $(nix build --print-out-paths -f '' make-minimal-bootstrap-sources) + nix --extra-experimental-features nix-command hash path $(nix build --print-out-paths -f '' make-minimal-bootstrap-sources) ``` # Why do we need this `.nar` archive? diff --git a/pkgs/servers/etcd/3.5/update.sh b/pkgs/servers/etcd/3.5/update.sh index 6c11ce1be748..2a3d9b108707 100755 --- a/pkgs/servers/etcd/3.5/update.sh +++ b/pkgs/servers/etcd/3.5/update.sh @@ -27,7 +27,7 @@ OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; \ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then echo "Attempting to update etcd from $OLD_VERSION to $LATEST_VERSION" ETCD_SRC_HASH=$(nix-prefetch-url --quiet --unpack https://github.com/etcd-io/etcd/archive/refs/tags/${LATEST_TAG}.tar.gz) - ETCD_SRC_HASH=$(nix hash to-sri --type sha256 $ETCD_SRC_HASH) + ETCD_SRC_HASH=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $ETCD_SRC_HASH) setKV () { sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/default.nix" diff --git a/pkgs/servers/lidarr/update.sh b/pkgs/servers/lidarr/update.sh index e87f6888a8dd..a0712f299113 100755 --- a/pkgs/servers/lidarr/update.sh +++ b/pkgs/servers/lidarr/update.sh @@ -15,7 +15,7 @@ updateHash() url="https://github.com/Lidarr/Lidarr/releases/download/v$version/Lidarr.master.$version.$os-core-$arch.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) - sriHash="$(nix hash to-sri --type sha256 $hash)" + sriHash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)" sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" } diff --git a/pkgs/tools/admin/ibmcloud-cli/update.sh b/pkgs/tools/admin/ibmcloud-cli/update.sh index c2b80cb104f2..26f1525a3202 100755 --- a/pkgs/tools/admin/ibmcloud-cli/update.sh +++ b/pkgs/tools/admin/ibmcloud-cli/update.sh @@ -23,7 +23,7 @@ for system in \ aarch64-darwin; do tmp=$(mktemp -d) curl -fsSL -o $tmp/ibmcloud-cli $(nix-instantiate --eval -E "with import ./. {}; ibmcloud-cli.src.url" --system "$system" | tr -d '"') - hash=$(nix hash file $tmp/ibmcloud-cli) + hash=$(nix --extra-experimental-features nix-command hash file $tmp/ibmcloud-cli) update-source-version ibmcloud-cli $latestVersion $hash --system=$system --ignore-same-version rm -rf $tmp done diff --git a/pkgs/tools/misc/xvfb-run/update.sh b/pkgs/tools/misc/xvfb-run/update.sh index e592323154e2..11b6449495e7 100755 --- a/pkgs/tools/misc/xvfb-run/update.sh +++ b/pkgs/tools/misc/xvfb-run/update.sh @@ -7,7 +7,7 @@ set -e info=$(nix-prefetch-git --quiet --url "https://github.com/archlinux/svntogit-packages" --rev "refs/heads/packages/xorg-server") rev=$(jq -r '.rev' <<< "$info") -sha256=$(nix hash to-sri --type sha256 "$(jq -r '.sha256' <<< "$info")") +sha256=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$(jq -r '.sha256' <<< "$info")") dir=$(jq -r '.path' <<< "$info") newXvfbsha=$(sha256sum "$dir/trunk/xvfb-run") From 0ad7f8ba0a7f9473065d5007461af7e4e66f3516 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 2 Jul 2025 16:42:21 +0100 Subject: [PATCH 34/48] python3Packages.craft-application: 5.3.0 -> 5.4.0 --- pkgs/development/python-modules/craft-application/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index ec71f3dd4b4c..a07d626512b5 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "craft-application"; - version = "5.3.0"; + version = "5.4.0"; pyproject = true; src = fetchFromGitHub { owner = "canonical"; repo = "craft-application"; tag = version; - hash = "sha256-6iD35ql3/vUzILh5VMWiFwBKPoGPfCUgEKD4g7s55Y0="; + hash = "sha256-xWGcKJY5ov6SN8CCRK33rVDsDcvKtEnv7Zy9VBLJYYc="; }; postPatch = '' From 4884eded0dc17e01cc694085a523b9fcada619c7 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 2 Jul 2025 16:42:45 +0100 Subject: [PATCH 35/48] python3Packages.craft-parts: 2.14.0 -> 2.15.0 --- pkgs/development/python-modules/craft-parts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index 1372f1564b29..5b91e3fc3f89 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "2.14.0"; + version = "2.15.0"; pyproject = true; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; tag = version; - hash = "sha256-NJTueawkjoYPVnDSODgU/JlTG5yLow+4wiHQzNWHNbA="; + hash = "sha256-UW4VdJvEG4w7CM5aj1OKK91nsywQgsguJ+tnhEbqwYA="; }; patches = [ ./bash-path.patch ]; From 1a6af86f80e218601eae762bd60bf8eca3402a1e Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 2 Jul 2025 16:43:08 +0100 Subject: [PATCH 36/48] python3Packages.craft-store: 3.2.2 -> 3.3.0 --- pkgs/development/python-modules/craft-store/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-store/default.nix b/pkgs/development/python-modules/craft-store/default.nix index 720801ad5570..37f3fb2c5d1d 100644 --- a/pkgs/development/python-modules/craft-store/default.nix +++ b/pkgs/development/python-modules/craft-store/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "craft-store"; - version = "3.2.2"; + version = "3.3.0"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-store"; tag = version; - hash = "sha256-ODchOdEzzR8LXdPgPVXp0mWIu2rr5yzrfUDbOVW1xXc="; + hash = "sha256-ige4R5nwlfeSDyhzw0TDQMMIcExIJQuFAFvbNEpreSs="; }; postPatch = '' From 7eda8b09dff9c328902bbdcee25cb42474727bd0 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 2 Jul 2025 16:43:24 +0100 Subject: [PATCH 37/48] charmcraft: 3.5.1 -> 3.5.2 --- pkgs/by-name/ch/charmcraft/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 6f5707243d6f..d7385f7773a5 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -44,7 +44,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "charmcraft"; - version = "3.5.1"; + version = "3.5.2"; pyproject = true; @@ -52,7 +52,7 @@ python.pkgs.buildPythonApplication rec { owner = "canonical"; repo = "charmcraft"; tag = version; - hash = "sha256-4zlUHttny6nIRhx/5aDz2sh1Va0+nN+7cezBGtt5Img="; + hash = "sha256-WpiLi8raY1f6+Jjlamp+eDh429gjSwSufNfoPOcGIgU="; }; postPatch = '' From e68656253dd5915115c2ab676410963e90bd2ae9 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 2 Jul 2025 12:00:07 -0400 Subject: [PATCH 38/48] python313Packages.torchio: 0.20.6 -> 0.20.16 --- pkgs/development/python-modules/torchio/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix index 6b5db6ffa925..8422d436f686 100644 --- a/pkgs/development/python-modules/torchio/default.nix +++ b/pkgs/development/python-modules/torchio/default.nix @@ -9,6 +9,7 @@ # dependencies deprecated, + einops, matplotlib, nibabel, numpy, @@ -28,14 +29,14 @@ buildPythonPackage rec { pname = "torchio"; - version = "0.20.6"; + version = "0.20.16"; pyproject = true; src = fetchFromGitHub { owner = "TorchIO-project"; repo = "torchio"; tag = "v${version}"; - hash = "sha256-240MM9w0AdhaUp70JrkmKGQI1abrFrbfybCF4wYX8fg="; + hash = "sha256-BWn4Kg44mMfUs4wtajYZTH6TATWxLVifCfZKfql/hdI="; }; build-system = [ @@ -44,6 +45,7 @@ buildPythonPackage rec { dependencies = [ deprecated + einops humanize nibabel numpy From f74684eed909b83756f0f3ac75d1af4a6f7c3408 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Jul 2025 16:43:46 +0000 Subject: [PATCH 39/48] cockpit: 340 -> 341.1 --- pkgs/by-name/co/cockpit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index c7c279add8ef..c1c4662d25b5 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit"; - version = "340"; + version = "341.1"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; tag = finalAttrs.version; - hash = "sha256-I/T1bovkf2H/GJqocRxsiRxqRw9HMdscKpWQ+M6IdrU="; + hash = "sha256-sJ4GBsBH7FTViVYiJNR8UNv5Fdo33qGJAnZo2zRLc18="; fetchSubmodules = true; }; From d8a7be681c8f786e1c3ede8b5238bb4eb33f9ce4 Mon Sep 17 00:00:00 2001 From: "\"Gaetan Lepage\"" <"gaetan@glepage.com"> Date: Wed, 2 Jul 2025 18:44:51 +0200 Subject: [PATCH 40/48] vimPlugins.claudecode-nvim: init at 2025-06-21 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ba4e615e5b90..eb2769a21f25 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2064,6 +2064,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + claudecode-nvim = buildVimPlugin { + pname = "claudecode.nvim"; + version = "2025-06-21"; + src = fetchFromGitHub { + owner = "coder"; + repo = "claudecode.nvim"; + rev = "91357d810ccf92f6169f3754436901c6ff5237ec"; + sha256 = "1hdzv8wjm0dgam7fimsm2h2kfnc8mp8gi7qyv4qddgfj7mir77l7"; + }; + meta.homepage = "https://github.com/coder/claudecode.nvim/"; + meta.hydraPlatforms = [ ]; + }; + clever-f-vim = buildVimPlugin { pname = "clever-f.vim"; version = "2022-10-15"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 3c5d1078189f..24e664e1caf6 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -157,6 +157,7 @@ https://github.com/projekt0n/circles.nvim/,, https://github.com/zootedb0t/citruszest.nvim/,, https://github.com/xavierd/clang_complete/,, https://github.com/greggh/claude-code.nvim/,HEAD, +https://github.com/coder/claudecode.nvim/,HEAD, https://github.com/rhysd/clever-f.vim/,, https://github.com/bbchung/clighter8/,, https://github.com/ekickx/clipboard-image.nvim/,, From db9033fe4711a971d131dda56ba819e317f8dc1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Jul 2025 16:51:51 +0000 Subject: [PATCH 41/48] libretro.genesis-plus-gx: 0-unstable-2025-06-22 -> 0-unstable-2025-06-27 --- .../emulators/libretro/cores/genesis-plus-gx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index 9ee731557d98..ed405d6257bd 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2025-06-22"; + version = "0-unstable-2025-06-27"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "e1b0d20b66441c0ff220abbb1da8e6a911b9a761"; - hash = "sha256-pvzLI3G6046W11x8Sfev6W5tGYn8/d2EnmIQc99aHN4="; + rev = "7eaca304a77827d4ba0f9bd9e23aca1ed8eb231e"; + hash = "sha256-hcl0iN7AfZEncXFC8GvD6D8olr+NlIOcVV42dZ6G55Y="; }; meta = { From e2a7055c1038a4bfa4b49c32019992c3aba9c09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arcadio=20Rubio=20Garc=C3=ADa?= Date: Sat, 28 Jun 2025 23:54:43 +0200 Subject: [PATCH 42/48] maintainers: arcadio, update email --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 390ea05d886a..963c7245f9c8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1928,7 +1928,7 @@ name = "Arbel Arad"; }; arcadio = { - email = "arc@well.ox.ac.uk"; + email = "git.obtrusive281@passinbox.com"; github = "arcadio"; githubId = 56009; name = "Arcadio Rubio García"; From 9238d3c9d8c8a3a9fa51bc0fd529864c57591934 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 2 Jul 2025 20:37:52 +0200 Subject: [PATCH 43/48] ty: 0.0.1-alpha.12 -> 0.0.1-alpha.13 Diff: https://github.com/astral-sh/ty/compare/refs/tags/0.0.1-alpha.12...refs/tags/0.0.1-alpha.13 Changelog: https://github.com/astral-sh/ty/blob/0.0.1-alpha.13/CHANGELOG.md --- pkgs/by-name/ty/ty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 1d50a3759917..1cc43f5471d0 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.1-alpha.12"; + version = "0.0.1-alpha.13"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-eVOwamhs9ETwqiYMA/smDtmu/c8TRzEZoKy/o/OCKnA="; + hash = "sha256-w+eYclC9X0T1f/oj8MY4KG72lpAVGpMjjchER167sp0="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-T2JQqFRoMU0xbD8D4tqXdxTN1RxcK6u5DYR9uO876xs="; + cargoHash = "sha256-blf+ISQgOFZ99jZIHQec8Bhccb0ajZiNLvl0F1xUi/Y="; nativeBuildInputs = [ installShellFiles ]; From ed6b1eea15b2e7ad6d856957d38dbd1f6c3d6465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 2 Jul 2025 13:33:00 -0500 Subject: [PATCH 44/48] devenv: 1.6.1 -> 1.7 https://github.com/cachix/devenv/releases/tag/v1.7 --- pkgs/by-name/de/devenv/package.nix | 31 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 78d4ec464822..891c0db5ee77 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -14,19 +14,22 @@ }: let - devenv_nix = nixVersions.nix_2_24.overrideAttrs (old: { - version = "2.24-devenv"; - src = fetchFromGitHub { - owner = "domenkozar"; + devenv_nix = + (nixVersions.git.overrideSource (fetchFromGitHub { + owner = "cachix"; repo = "nix"; - rev = "b455edf3505f1bf0172b39a735caef94687d0d9c"; - hash = "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s="; - }; - doCheck = false; - doInstallCheck = false; - }); + rev = "afa41b08df4f67b8d77a8034b037ac28c71c77df"; + hash = "sha256-IDB/oh/P63ZTdhgSkey2LZHzeNhCdoKk+4j7AaPe1SE="; + })).overrideAttrs + (old: { + version = "2.30-devenv"; + doCheck = false; + doInstallCheck = false; + # do override src, but the Nix way so the warning is unaware of it + __intentionallyOverridingVersion = true; + }); - version = "1.6.1"; + version = "1.7"; in rustPlatform.buildRustPackage { pname = "devenv"; @@ -35,12 +38,12 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "cachix"; repo = "devenv"; - rev = "v${version}"; - hash = "sha256-CEVWxRaln3sp0541QpMfcfmI2w+RN72UgNLV5Dy9sco="; + tag = "v${version}"; + hash = "sha256-LzMVgB8izls/22g69KvWPbuQ8C7PRT9PobbvdV3/raI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-t4Cj7JlBVrMP02Dqibq2IgdKy6ejv+CeffmcPAkh7BE="; + cargoHash = "sha256-k/UrnRTI+Z09kdN7PYNOg9+GnumqOdm36F31CKZCGMU="; buildAndTestSubdir = "devenv"; From c6377e48edba21251a3eb7617684f144007deda6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Jul 2025 19:50:25 +0000 Subject: [PATCH 45/48] gh-dash: 4.16.0 -> 4.16.1 --- pkgs/by-name/gh/gh-dash/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index 031878115fae..5ea4400a4937 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.16.0"; + version = "4.16.1"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-qqQ+UmeHvqA57evAn9dBLBeXx1n2z804XcmP82ZgEKc="; + hash = "sha256-yPD4/qCXfDDf5tBEc2HvNFQTwa8NNLBV23KIU6XfLco="; }; - vendorHash = "sha256-9nSuXZyi/+gyU2D1OL+6Bw9GKvYPdsj7dUmBcESHePw="; + vendorHash = "sha256-AeDGtEh+8sAczm0hBebvMdK/vTDzQsSXcB0xIYcQd8o="; ldflags = [ "-s" From 9e90ad6b301d05677ad8a17090c20d8517959917 Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 2 Jul 2025 20:12:49 +0200 Subject: [PATCH 46/48] matrix-alertmanager-receiver: 2025.5.21 -> 2025.7.2 --- .../matrix-alertmanager-receiver/package.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index 83f4095e941e..653e69d6cf86 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -1,29 +1,37 @@ { lib, - buildGo124Module, + buildGoModule, fetchFromGitHub, + versionCheckHook, nix-update-script, }: -buildGo124Module rec { +buildGoModule (finalAttrs: { pname = "matrix-alertmanager-receiver"; - version = "2025.5.21"; + version = "2025.7.2"; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; - tag = version; - hash = "sha256-W0dvaJ1o43un5UskAmpKomZjIHiclOoiOkxGawP0fyk="; + tag = finalAttrs.version; + hash = "sha256-Dz2oP3lNxO75Lqmke0WprvI1yuuQIv3HffNxMYCSJso="; }; - vendorHash = "sha256-ZM7qA73fPPRgs378uDQoYs32e7i8LmBjqZ7RjzWEW28="; + vendorHash = "sha256-+tkxK3h6N45XA4OvdNYrRFNbqJLGflY2v8oF36Gpwm4="; + + env.CGO_ENABLED = "0"; ldflags = [ "-s" - "-w" - "-X main.matrixAlertmanagerReceiverVersion=${version}" + "-X main.matrixAlertmanagerReceiverVersion=${finalAttrs.version}" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + passthru = { updateScript = nix-update-script { }; }; @@ -31,9 +39,9 @@ buildGo124Module rec { meta = { description = "Alertmanager client that forwards alerts to a Matrix room"; homepage = "https://github.com/metio/matrix-alertmanager-receiver"; - changelog = "https://github.com/metio/matrix-alertmanager-receiver/releases/tag/${version}"; + changelog = "https://github.com/metio/matrix-alertmanager-receiver/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ liberodark ]; mainProgram = "matrix-alertmanager-receiver"; }; -} +}) From 6ec81397ae308fb54c12bd5d41e9b0b12e1e350d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 2 Jul 2025 22:48:40 +0200 Subject: [PATCH 47/48] thunderbird-esr: 128.11.1esr -> 128.12.0esr https://www.thunderbird.net/en-US/thunderbird/128.12.0esr/releasenotes/ --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 31eb296037f2..1b2659decf9e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -109,8 +109,8 @@ rec { thunderbird-128 = common { applicationName = "Thunderbird ESR"; - version = "128.11.1esr"; - sha512 = "8fd99f68895b543bdc5bba38d7720f0e48e2a82c9fe5e8ca15534e3918cc40b5b2911666dbbbda0a7911783a03a0d8f7371ea353fd67416baca1e1dffdd25c44"; + version = "128.12.0esr"; + sha512 = "4566ae8347e959612a288524753416f5b730757f10a067b6eb11139055cc1fc5d63d49636e798e9b77588896c8dbc0f2acc189ebd29d95a5166e7bc8f2c35e30"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-128"; From 53701e77df9e6661bd9198646c0f58cb799a3166 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Jul 2025 22:52:27 +0200 Subject: [PATCH 48/48] zigbee2mqtt_2: 2.5.0 -> 2.5.1 https://github.com/Koenkk/zigbee2mqtt/releases/tag/2.5.1 --- pkgs/by-name/zi/zigbee2mqtt_2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix index e5d01efba2ab..20eebac9e1e0 100644 --- a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix +++ b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix @@ -16,18 +16,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "zigbee2mqtt"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; tag = finalAttrs.version; - hash = "sha256-YGsc+QSdlhbVFOGTxHOPpQSxSEDPXmRdQWFJWuTma6Y="; + hash = "sha256-p1KAgDNA2bI/6MSLxcSfHlzFKoe5KrRTKPTNVJNGfDM="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-NU8zTBaQX1YCII7ZIWIfWjhaqs1RNXAetvGjg7AiE34="; + hash = "sha256-OPfs9WiUehKPaAqqgMOiIELoCPVBFYpNKeesfmA8Db0="; }; nativeBuildInputs = [