Merge staging-next into staging

2021-03-19 00:41:08 +00:00
parent 07ac0c6d99 d73a492e83
commit 8c03075f07
374 changed files with 6106 additions and 2325 deletions
@@ -18,7 +18,7 @@ in rec {
  bzip2_ = bzip2.override (args: { linkStatic = true; });

  # Avoid messing with libkrb5 and libnghttp2.
-  curl_ = curl.override (args: { gssSupport = false; http2Support = false; });
+  curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; });

  build = stdenv.mkDerivation {
    name = "stdenv-bootstrap-tools";