diff options
author | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-17 16:11:16 -0400 |
---|---|---|
committer | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-18 23:25:20 -0400 |
commit | 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch) | |
tree | 0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/tools/filesystems/nixpart | |
parent | d7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff) | |
download | nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.gz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.bz2 nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.lz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.xz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.zst nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.zip |
treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases = true;}'’ work in Nixpkgs. Misc... - qtikz: use libsForQt5.callPackage This ensures we get the right poppler. - rewrites: docbook5_xsl -> docbook_xsl_ns docbook_xml_xslt -> docbook_xsl diffpdf: fixup
Diffstat (limited to 'pkgs/tools/filesystems/nixpart')
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/dmraid.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/parted.nix | 6 |
4 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 24eec2f0dc46..b0c33212edb3 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt +{ stdenv, fetchurl, lvm2, libgcrypt, libuuid, pkgconfig, popt , enablePython ? true, python ? null }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enablePython "--enable-python"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ devicemapper libgcrypt libuuid popt ] + buildInputs = [ lvm2 libgcrypt libuuid popt ] ++ stdenv.lib.optional enablePython python; meta = { diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 5ae32093e7f7..217056117ea7 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -18,13 +18,11 @@ let cryptsetup = import ./cryptsetup.nix { inherit stdenv fetchurl python; - inherit (pkgs) pkgconfig libgcrypt libuuid popt; - devicemapper = lvm2; + inherit (pkgs) pkgconfig libgcrypt libuuid popt lvm2; }; dmraid = import ./dmraid.nix { - inherit stdenv fetchurl; - devicemapper = lvm2; + inherit stdenv fetchurl lvm2; }; lvm2 = import ./lvm2.nix { @@ -39,8 +37,7 @@ let parted = import ./parted.nix { inherit stdenv fetchurl; - inherit (pkgs) utillinux readline libuuid gettext check; - devicemapper = lvm2; + inherit (pkgs) utillinux readline libuuid gettext check lvm2; }; pyblock = import ./pyblock.nix { diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix index defdf6702ea7..a4dcb408e058 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper }: +{ stdenv, fetchurl, lvm2 }: stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc15"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { preConfigure = "cd */"; - buildInputs = [ devicemapper ]; + buildInputs = [ lvm2 ]; meta = { description = "Old-style RAID configuration utility"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 04859020e36e..3f43fdc0c395 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline +{ stdenv, fetchurl, lvm2, libuuid, gettext, readline , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (devicemapper != null) devicemapper + ++ stdenv.lib.optional (lvm2 != null) lvm2 ++ stdenv.lib.optional (hurd != null) hurd ++ stdenv.lib.optional doCheck check; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { (if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ]) - ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" + ++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper" ++ stdenv.lib.optional enableStatic "--enable-static"; doCheck = true; |