diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-07-18 12:19:31 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-07-20 15:13:18 +0000 |
| commit | 792c0160c61576e349b2b4f59e201695b5dc17c6 (patch) | |
| tree | 058ffcb539fd0ef9ab1c767aef7c801fcd0c95f0 | |
| parent | Merge pull request #130775 from NixOS/backport-128095-to-release-21.05 (diff) | |
| download | nixpkgs-792c0160c61576e349b2b4f59e201695b5dc17c6.tar.gz | |
nixStable: 2.3.12 -> 2.3.14
Changes: https://github.com/NixOS/nix/compare/2.3.12...2.3.14
Since this is a bugfix release that wasn't pushed to `nixpkgs`, I
decided to take care of it.
As it's usually done in `upload-release.pl`[1], I updated the
fallback-paths accordingly and used eval `1687468`[2] for this with Nix
2.3.14.
Also added a fallback-path for `aarch64-darwin` as Nix 2.3.14 seems to
support this now[3].
[1] https://github.com/NixOS/nix/blob/2.3-maintenance/maintainers/upload-release.pl
[2] https://hydra.nixos.org/eval/1687468
[3] https://github.com/NixOS/nix/commit/14262b86cc5825deae095c14553d623af498124c
(cherry picked from commit e66237af154f63998eaf45233763b2e535b78b95)
| -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 801e28cec44a..e3576074a5b7 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 598d43bb8406..2658d4f44a82 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -199,10 +199,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; |