From 50a572e12ba0dd4147d9b096cc44e7e62e8ec3a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 29 Apr 2025 21:56:33 +0200 Subject: [PATCH 1/2] nixVersions.nix_2_28: 2.28.2 -> 2.28.3 Diff: https://github.com/NixOS/nix/compare/2.28.2...2.28.3 --- pkgs/tools/package-management/nix/default.nix | 8 +-- ...ignore-system-user-registries-during.patch | 51 ------------------- 2 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 pkgs/tools/package-management/nix/patches/0001-Revert-Actually-ignore-system-user-registries-during.patch diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 846f062cfc98..3d118f98be53 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -184,13 +184,9 @@ lib.makeExtensible ( }; nix_2_28 = commonMeson { - version = "2.28.2"; - hash = "sha256-yl+hlZ/VFHIZwPIDEs4ysOYgprW4VEORfSyvScF7Cwg="; + version = "2.28.3"; + hash = "sha256-TjZp5ITSUvNRAzNznmkZRQxNRzMLiSAplz4bV2T8cbs="; self_attribute_name = "nix_2_28"; - patches = [ - # fixes user/system registries regression: https://github.com/NixOS/nix/issues/13050 - ./patches/0001-Revert-Actually-ignore-system-user-registries-during.patch - ]; }; nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec { diff --git a/pkgs/tools/package-management/nix/patches/0001-Revert-Actually-ignore-system-user-registries-during.patch b/pkgs/tools/package-management/nix/patches/0001-Revert-Actually-ignore-system-user-registries-during.patch deleted file mode 100644 index c38cbb3a8011..000000000000 --- a/pkgs/tools/package-management/nix/patches/0001-Revert-Actually-ignore-system-user-registries-during.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8df4f5db3c71046f5deaeb913e5ec0d16f70b5a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Thu, 24 Apr 2025 14:17:18 +0200 -Subject: [PATCH] Revert "Actually ignore system/user registries during - locking" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit a08477975d90dc0d2c9f89d2a417bedb5b266931. - -Signed-off-by: Jörg Thalheim ---- - src/libflake/flake/flakeref.cc | 2 +- - tests/functional/flakes/flakes.sh | 7 ------- - 2 files changed, 1 insertion(+), 8 deletions(-) - -diff --git a/src/libflake/flake/flakeref.cc b/src/libflake/flake/flakeref.cc -index 1580c2846..6e95eb767 100644 ---- a/src/libflake/flake/flakeref.cc -+++ b/src/libflake/flake/flakeref.cc -@@ -39,7 +39,7 @@ FlakeRef FlakeRef::resolve( - ref store, - const fetchers::RegistryFilter & filter) const - { -- auto [input2, extraAttrs] = lookupInRegistries(store, input, filter); -+ auto [input2, extraAttrs] = lookupInRegistries(store, input); - return FlakeRef(std::move(input2), fetchers::maybeGetStrAttr(extraAttrs, "dir").value_or(subdir)); - } - -diff --git a/tests/functional/flakes/flakes.sh b/tests/functional/flakes/flakes.sh -index b67a0964a..d8c9f254d 100755 ---- a/tests/functional/flakes/flakes.sh -+++ b/tests/functional/flakes/flakes.sh -@@ -220,13 +220,6 @@ nix store gc - nix registry list --flake-registry "file://$registry" --refresh | grepQuiet flake3 - mv "$registry.tmp" "$registry" - --# Ensure that locking ignores the user registry. --mkdir -p "$TEST_HOME/.config/nix" --ln -sfn "$registry" "$TEST_HOME/.config/nix/registry.json" --nix flake metadata flake1 --expectStderr 1 nix flake update --flake-registry '' --flake "$flake3Dir" | grepQuiet "cannot find flake 'flake:flake1' in the flake registries" --rm "$TEST_HOME/.config/nix/registry.json" -- - # Test whether flakes are registered as GC roots for offline use. - # FIXME: use tarballs rather than git. - rm -rf "$TEST_HOME/.cache" --- -2.49.0 - From 7fd4e73000eb673fcca138f6c794e719a6016628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 29 Apr 2025 21:56:34 +0200 Subject: [PATCH 2/2] nix: update nix-fallback-paths to 2.28.3 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 062db2ac3b9d..55a0c46237ed 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,8 +1,8 @@ { - x86_64-linux = "/nix/store/pzwdmrz94mya45m1jnsf294c0g3cwy9m-nix-2.28.2"; - i686-linux = "/nix/store/vzqxry2dwq9nzr2y0jk1q7qv3ygv14m1-nix-2.28.2"; - aarch64-linux = "/nix/store/52zak9psh00w8c8iz8x0ny33in5wwr83-nix-2.28.2"; - riscv64-linux = "/nix/store/rkggav1j9wb55zc8jsl1vg81s831aqj8-nix-riscv64-unknown-linux-gnu-2.28.2"; - x86_64-darwin = "/nix/store/afwsvhzqf936zx5v4i7ynqah2qhq7qyj-nix-2.28.2"; - aarch64-darwin = "/nix/store/djcysgb0pgrigaqfnmraviv6nix786zi-nix-2.28.2"; + x86_64-linux = "/nix/store/pfh6bq2wxbpp3xz5sinymmp44n505zh8-nix-2.28.3"; + i686-linux = "/nix/store/nfxdfb9zcrm9sqkw8xhdqs7vcvrwp1k2-nix-2.28.3"; + aarch64-linux = "/nix/store/7w6fj8s7h4pcmx38m1f51xd93ywizm4i-nix-2.28.3"; + riscv64-linux = "/nix/store/nnynd5vfd6pf9jkp13bmj44rlrd61l3h-nix-riscv64-unknown-linux-gnu-2.28.3"; + x86_64-darwin = "/nix/store/rdxbh5m09c9i2s7zkh7b8g6mnrpmaa19-nix-2.28.3"; + aarch64-darwin = "/nix/store/wjrdsqbaial7pl9vfhqc7cpzd9lqcr6a-nix-2.28.3"; }