Merge master into staging-next

2021-05-15 18:30:28 +00:00
parent 665732d877 059c4b584e
commit f1b78f8618
43 changed files with 928 additions and 316 deletions
@@ -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: {