summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2021-09-02 14:24:20 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-09-11 17:07:42 +0000
commit21c1c063dabc31acfff13e0e8f824288c976849b (patch)
tree516dc2df85e5ab22cd73e0fd7db04c9a92acce61
parentnss_latest: 3.68 -> 3.70 (diff)
downloadnixpkgs-origin/backport-136463-to-release-21.05.tar.gz
nixUnstable: 2.4pre20210802_47e96bb -> 2.4pre20210908_3c56f62origin/backport-136463-to-release-21.05
Main motivation for is the bugfix regarding flake-follows and path-inputs[1]. An overview over all changes - mostly bugfixes - can be found on GitHub[2]. [1] https://github.com/NixOS/nix/pull/4641 [2] https://github.com/NixOS/nix/compare/47e96bb...3c56f62093601143838af923195f630d8ffae2d4 (cherry picked from commit 04b552c32312e8067ab5e3948513ce4624f35c4d)
-rw-r--r--pkgs/tools/package-management/nix/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index f9a476f6be6b..ad2fe6bb97bd 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -228,13 +228,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix";
version = "2.4${suffix}";
- suffix = "pre20210802_47e96bb";
+ suffix = "pre20210908_${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "47e96bb533f8cacc171bec9b688b134de31a48a9";
- sha256 = "sha256-vwj1fAGn3Pl9Vr/qSL+oDxuwbRzEdI3dsEg6o3xTmWg=";
+ rev = "3c56f62093601143838af923195f630d8ffae2d4";
+ sha256 = "sha256-pjdzLOEt8i1NQe4drLpp8+LrRd2MgsISSQEsMebz2kc=";
};
boehmgc = boehmgc_nixUnstable;