diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-03 16:24:30 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-03 16:35:36 -0400 |
| commit | cf06e42d1cad2732ca23264dee19bbc0d7172b3b (patch) | |
| tree | 624d0854c8f07c4d3ba2eb28590076b0486684a3 /pkgs/os-specific/linux/systemd | |
| parent | cbe21ac614285160a18fe21b8a804f3a2f80c51b (diff) | |
| parent | b45ef79b74d267891a11c1775a473c610ecebe78 (diff) | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/cryptsetup-generator.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index f69269347e3..d02a531f67f 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -1,7 +1,5 @@ { stdenv, systemd, cryptsetup }: -assert stdenv.isLinux; - stdenv.lib.overrideDerivation systemd (p: { version = p.version; name = "systemd-cryptsetup-generator"; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index ad8f5fb08e0..1c5dd6dadf1 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -13,8 +13,6 @@ , withSelinux ? false, libselinux }: -assert stdenv.isLinux; - let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); |