chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-11 18:32:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/nixos-unstable' into nixos-unstable
Some checks failed
Periodic Merges (6h) / master → staging-next (push) Has been cancelled
Periodic Merges (6h) / staging-next → staging (push) Has been cancelled
Periodic Merges (24h) / master → staging-next-25.05 (push) Has been cancelled
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Has been cancelled
Periodic Merges (24h) / release-24.11 → staging-next-24.11 (push) Has been cancelled
Periodic Merges (24h) / staging-next-24.11 → staging-24.11 (push) Has been cancelled
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Has been cancelled

Browse Source
This commit is contained in:
Jörg Thalheim
2025-06-24 17:43:08 +02:00
committed by chn
parent caea7c0514
commit b263408b62
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/installer/tools/nix-fallback-paths.nix
View File

@@ -1,8 +1,8 @@
{
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";
x86_64-linux = "/nix/store/gy397nw6h414f4l4vxny1wg8cn4i955d-nix-2.28.4";
i686-linux = "/nix/store/k192aqw8zh71zrli5abqd5wg01bqwmh9-nix-2.28.4";
aarch64-linux = "/nix/store/cp0bzvj8vf5y2z0nimq57crcq6h419fj-nix-2.28.4";
riscv64-linux = "/nix/store/zav2zzhxld8fqvj7hb5z83ggd3ij6888-nix-riscv64-unknown-linux-gnu-2.28.4";
x86_64-darwin = "/nix/store/gj4y690ligr5gawmpnkiw2qs087m068w-nix-2.28.4";
aarch64-darwin = "/nix/store/nb6nkjac7nj242j3m56pkdkbikfjw343-nix-2.28.4";
}

4
pkgs/tools/package-management/nix/default.nix
View File

@@ -181,8 +181,8 @@ lib.makeExtensible (
};
nix_2_28 = commonMeson {
version = "2.28.3";
hash = "sha256-TjZp5ITSUvNRAzNznmkZRQxNRzMLiSAplz4bV2T8cbs=";
version = "2.28.4";
hash = "sha256-V1tPrBkPteqF8VWUgpotNFYJ2Xm6WmB3aMPexuEHl9I=";
self_attribute_name = "nix_2_28";
};