Merge master into staging-next

2018-12-07 15:22:35 +01:00
parent 13ee78018c cb2a447c51
commit 5f554279ec
224 changed files with 5366 additions and 4075 deletions
@@ -4,7 +4,7 @@
 # compiler and linker that do not search in default locations,
 # ensuring purity of components produced by it.
 { lib
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []

 , bootstrapFiles ?
  let table = {
@@ -32,7 +32,7 @@
  in files
 }:

-assert crossSystem == null;
+assert crossSystem == localSystem;

 let
  inherit (localSystem) system platform;