diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2025-04-07 12:33:19 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2025-04-07 13:23:41 +0000 |
| commit | dc1d33c2851fe4cf0fcbc734871376c1f74f0793 (patch) | |
| tree | 973faf9dab005a0cca8cd8f34eb715041ca51693 | |
| parent | [backport release-24.11] pgadmin: 8.12 -> 9.2 (#396379) (diff) | |
| download | nixpkgs-dc1d33c2851fe4cf0fcbc734871376c1f74f0793.tar.gz | |
nixVersions.nix_2_24: 2.24.13 -> 2.24.14origin/backport-396792-to-release-24.11
Diff: https://github.com/NixOS/nix/compare/2.24.13...2.24.14
(cherry picked from commit ae8f07e1dd48246f902d50a38c4431e92b51a396)
| -rw-r--r-- | nixos/modules/installer/tools/nix-fallback-paths.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 93c52da399ff..c94e0fe4699a 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/00a7rdfwhm6avqkgj68grddbzyz3h6ql-nix-2.24.13"; - i686-linux = "/nix/store/s6c620v60hfishzi1lbfpryk65lbvg8g-nix-2.24.13"; - aarch64-linux = "/nix/store/7yg9is1shh3383iwi6qynz3vh91l1f9d-nix-2.24.13"; - riscv64-linux = "/nix/store/fagjkrx5r6p52xp8qb5581bmnlgp01sn-nix-riscv64-unknown-linux-gnu-2.24.13"; - x86_64-darwin = "/nix/store/ifby7rrgkkly5pzjnyac90lzvrak3i9y-nix-2.24.13"; - aarch64-darwin = "/nix/store/b0rbdp6ba2fprprpgsw1a8pplzg0j324-nix-2.24.13"; + x86_64-linux = "/nix/store/kvqnqgjw3k0xmv3ypzajz3c5wf1pxnbs-nix-2.24.14"; + i686-linux = "/nix/store/292xy9z1vjmy0888bzadmj9fmq1ccapv-nix-2.24.14"; + aarch64-linux = "/nix/store/qsy62z6rk31s8s937nvkcdhn0ds62yax-nix-2.24.14"; + riscv64-linux = "/nix/store/zvrzwzv534zcmhw4ai1hbc4iz229hk3p-nix-riscv64-unknown-linux-gnu-2.24.14"; + x86_64-darwin = "/nix/store/jc7x6906wyy6csgf6br1gbwkw56nxm4l-nix-2.24.14"; + aarch64-darwin = "/nix/store/sfrmn30fijs6qpfi7ckjkv2vdr4z590h-nix-2.24.14"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4c9ffc6a0f14..c18293143e5a 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -291,8 +291,8 @@ lib.makeExtensible ( }; nix_2_24 = common { - version = "2.24.13"; - hash = "sha256-lUsK8lAwaaTEM+KFML/6sYwaVAiSf70g1EfSDJNNrU0="; + version = "2.24.14"; + hash = "sha256-SthMCsj6POjawLnJq9+lj/UzObX9skaeN1UGmMZiwTY="; self_attribute_name = "nix_2_24"; }; |