Merge staging-next into staging

2019-08-31 10:04:20 +02:00
parent ebe4fd146b fc74ba8291
commit ad1d58c622
364 changed files with 8970 additions and 6854 deletions
@@ -8,7 +8,9 @@ let

  nix = cfg.package.out;

-  isNix20 = versionAtLeast (getVersion nix) "2.0pre";
+  nixVersion = getVersion nix;
+
+  isNix20 = versionAtLeast nixVersion "2.0pre";

  makeNixBuildUser = nr:
    { name = "nixbld${toString nr}";
@@ -61,6 +63,9 @@ let
          builders =
        ''}
        system-features = ${toString cfg.systemFeatures}
+        ${optionalString (versionAtLeast nixVersion "2.3pre") ''
+          sandbox-fallback = false
+        ''}
        $extraOptions
        END
      '' + optionalString cfg.checkConfig (