diff options
| author | Domen Kožar <domen@dev.si> | 2021-07-20 17:09:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 17:09:20 +0200 |
| commit | 314f595ab1cd09a27ad66dd1283344fa5745e473 (patch) | |
| tree | ecc7050afb9734b71453db18cd3a082d11913d2f | |
| parent | cac897c10b679904939bcb567ebe99ce2f53e10c (diff) | |
| parent | e66237af154f63998eaf45233763b2e535b78b95 (diff) | |
| download | nixpkgs-314f595ab1cd09a27ad66dd1283344fa5745e473.tar nixpkgs-314f595ab1cd09a27ad66dd1283344fa5745e473.tar.gz nixpkgs-314f595ab1cd09a27ad66dd1283344fa5745e473.tar.bz2 nixpkgs-314f595ab1cd09a27ad66dd1283344fa5745e473.tar.lz nixpkgs-314f595ab1cd09a27ad66dd1283344fa5745e473.tar.xz nixpkgs-314f595ab1cd09a27ad66dd1283344fa5745e473.tar.zst nixpkgs-314f595ab1cd09a27ad66dd1283344fa5745e473.zip | |
Merge pull request #130538 from Ma27/bump-nixstable
nixStable: 2.3.12 -> 2.3.14
| -rw-r--r-- | nixos/modules/installer/tools/nix-fallback-paths.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 801e28cec44..e3576074a5b 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,7 @@ { - x86_64-linux = "/nix/store/d1ppfhjhdwcsb4npfzyifv5z8i00fzsk-nix-2.3.11"; - i686-linux = "/nix/store/c6ikndcrzwpfn2sb5b9xb1f17p9b8iga-nix-2.3.11"; - aarch64-linux = "/nix/store/fb0lfrn0m8s197d264jzd64vhz9c8zbx-nix-2.3.11"; - x86_64-darwin = "/nix/store/qvb86ffv08q3r66qbd6nqifz425lyyhf-nix-2.3.11"; + x86_64-linux = "/nix/store/qsgz2hhn6mzlzp53a7pwf9z2pq3l5z6h-nix-2.3.14"; + i686-linux = "/nix/store/1yw40bj04lykisw2jilq06lir3k9ga4a-nix-2.3.14"; + aarch64-linux = "/nix/store/32yzwmynmjxfrkb6y6l55liaqdrgkj4a-nix-2.3.14"; + x86_64-darwin = "/nix/store/06j0vi2d13w4l0p3jsigq7lk4x6gkycj-nix-2.3.14"; + aarch64-darwin = "/nix/store/77wi7vpbrghw5rgws25w30bwb8yggnk9-nix-2.3.14"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 6ba5135fdd6..108f24ce514 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -203,10 +203,10 @@ in rec { nixStable = callPackage common (rec { pname = "nix"; - version = "2.3.12"; + version = "2.3.14"; src = fetchurl { url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ITp9ScRhB5syNh5NAI0kjX9o400syTR/Oo/5Ap+a+10="; + sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk="; }; inherit storeDir stateDir confDir boehmgc; |