diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-15 18:30:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-15 18:30:28 +0000 |
| commit | f1b78f86182a4372a4dd1b79301f01eebcd3b49d (patch) | |
| tree | 5b17705058677bdf5eb2ca8fd5d6a8e62d58fb02 /pkgs/tools/package-management | |
| parent | 665732d8779f7edbbc05f7e2428da4f40abcc3a8 (diff) | |
| parent | 059c4b584e1c90636a56ff8f7b5e771de30154d7 (diff) | |
| download | nixpkgs-f1b78f86182a4372a4dd1b79301f01eebcd3b49d.tar nixpkgs-f1b78f86182a4372a4dd1b79301f01eebcd3b49d.tar.gz nixpkgs-f1b78f86182a4372a4dd1b79301f01eebcd3b49d.tar.bz2 nixpkgs-f1b78f86182a4372a4dd1b79301f01eebcd3b49d.tar.lz nixpkgs-f1b78f86182a4372a4dd1b79301f01eebcd3b49d.tar.xz nixpkgs-f1b78f86182a4372a4dd1b79301f01eebcd3b49d.tar.zst nixpkgs-f1b78f86182a4372a4dd1b79301f01eebcd3b49d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 7 |
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 d808eebcc93..ec5099c5f6e 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: { |