diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-22 15:26:58 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-22 16:56:33 +0000 |
commit | 542f80867c380b0ac79250b6e5358dda8bc49e0d (patch) | |
tree | aa5903f228b2f32c524a9a6e4f6dd94f8c5b869e /nixpkgs/pkgs/tools/filesystems/nixpart/0.4 | |
parent | f69898c7d5b757342e6ab90d5fcc7c9aea9f5ff4 (diff) | |
parent | 90441b4b47fc7280de6a5bd1a228017caaa0f97f (diff) | |
download | nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.gz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.bz2 nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.lz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.xz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.zst nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.zip |
Merge commit '90441b4b47fc7280de6a5bd1a228017caaa0f97f'
Diffstat (limited to 'nixpkgs/pkgs/tools/filesystems/nixpart/0.4')
-rw-r--r-- | nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index da2dff6b77a9..003a0e24fb52 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - pykickstart pyparted pyblock libselinux.py cryptsetup + pykickstart pyparted pyblock libselinux cryptsetup ] ++ stdenv.lib.optional useNixUdev systemd; # tests are currently _heavily_ broken upstream diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix index 129283e83ebe..5d7a9dd14ec0 100644 --- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, python, buildPythonApplication +, libselinux # Propagated to blivet , useNixUdev ? true # Needed by NixOps @@ -10,10 +11,9 @@ let blivet = import ./blivet.nix { inherit stdenv fetchurl buildPythonApplication; - inherit pykickstart pyparted pyblock cryptsetup multipath_tools; + inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools; inherit useNixUdev; inherit (pkgs) lsof utillinux systemd; - libselinux = pkgs.libselinux.override { enablePython = true; }; }; cryptsetup = import ./cryptsetup.nix { |