Merge remote-tracking branch 'upstream/master' into staging

2018-05-03 16:35:36 -04:00
parent cbe21ac614 b45ef79b74
commit cf06e42d1c
330 changed files with 20106 additions and 16120 deletions
@@ -1,7 +1,5 @@
 { stdenv, systemd, cryptsetup }:

-assert stdenv.isLinux;
-
 stdenv.lib.overrideDerivation systemd (p: {
  version = p.version;
  name = "systemd-cryptsetup-generator";
@@ -13,8 +13,6 @@
 , withSelinux ? false, libselinux
 }:

-assert stdenv.isLinux;
-
 let
  pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);