about summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-05-15 18:30:31 +0000
committerGitHub <noreply@github.com>2021-05-15 18:30:31 +0000
commitc10600230eab03563ed16c6f73ae16437cb69471 (patch)
tree76bb72d04c8cfd2f494f169c2c5a3d49ee004d49 /pkgs/tools/package-management
parentd151b2fb41340951e56d205e084e5ec0014a95e3 (diff)
parentf1b78f86182a4372a4dd1b79301f01eebcd3b49d (diff)
downloadnixlib-c10600230eab03563ed16c6f73ae16437cb69471.tar
nixlib-c10600230eab03563ed16c6f73ae16437cb69471.tar.gz
nixlib-c10600230eab03563ed16c6f73ae16437cb69471.tar.bz2
nixlib-c10600230eab03563ed16c6f73ae16437cb69471.tar.lz
nixlib-c10600230eab03563ed16c6f73ae16437cb69471.tar.xz
nixlib-c10600230eab03563ed16c6f73ae16437cb69471.tar.zst
nixlib-c10600230eab03563ed16c6f73ae16437cb69471.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/nix/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index d808eebcc936..ec5099c5f6ee 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -218,6 +218,13 @@ in rec {
     };
 
     inherit storeDir stateDir confDir boehmgc;
+
+    patches = [
+      (fetchpatch {
+        url = "https://github.com/NixOS/nix/commit/8c7e043de2f673bc355d83f1e873baa93f30be62.patch";
+        sha256 = "sha256-aTcUnZXheewnyCT7yQKnTqQDKS2uDoN9plMQgxJH8Ag=";
+      })
+    ];
   });
 
   nixExperimental = nixUnstable.overrideAttrs (prev: {