diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4')
4 files changed, 10 insertions, 10 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 6ba29cb98d40..15d6686fbc33 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -1,7 +1,7 @@ # FIXME: Unify with pkgs/development/python-modules/blivet/default.nix. { stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock -, libselinux, cryptsetup, multipath_tools, lsof, utillinux +, libselinux, cryptsetup, multipath_tools, lsof, util-linux , useNixUdev ? true, systemd ? null # useNixUdev is here for bw compatibility }: @@ -24,11 +24,11 @@ buildPythonApplication rec { sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ blivet/devicelibs/mpath.py blivet/devices.py sed -i -e '/"wipefs"/ { - s|wipefs|${utillinux.bin}/sbin/wipefs| + s|wipefs|${util-linux.bin}/sbin/wipefs| s/-f/--force/ }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py - sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py + sed -i -r -e 's|"(u?mount)"|"${util-linux.bin}/bin/\1"|' blivet/util.py sed -i -e '/find_library/,/find_library/ { c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1" }' blivet/pyudev.py diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix index 1f672701d382..703d918f92a9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -13,7 +13,7 @@ let inherit stdenv fetchurl buildPythonApplication; inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools; inherit useNixUdev; - inherit (pkgs) lsof utillinux systemd; + inherit (pkgs) lsof util-linux systemd; }; cryptsetup = import ./cryptsetup.nix { @@ -27,7 +27,7 @@ let lvm2 = import ./lvm2.nix { inherit stdenv fetchurl; - inherit (pkgs) fetchpatch pkgconfig utillinux systemd coreutils; + inherit (pkgs) fetchpatch pkgconfig util-linux systemd coreutils; }; multipath_tools = import ./multipath-tools.nix { @@ -37,7 +37,7 @@ let parted = import ./parted.nix { inherit stdenv fetchurl; - inherit (pkgs) fetchpatch utillinux readline libuuid gettext check lvm2; + inherit (pkgs) fetchpatch util-linux readline libuuid gettext check lvm2; }; pyblock = import ./pyblock.nix { diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index fc0005a14d45..4369d659034e 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, utillinux, coreutils }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, util-linux, coreutils }: let v = "2.02.106"; @@ -60,7 +60,7 @@ stdenv.mkDerivation { postInstall = '' substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \ - --replace $out/sbin/blkid ${utillinux.bin}/sbin/blkid + --replace $out/sbin/blkid ${util-linux.bin}/sbin/blkid # Systemd stuff mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators diff --git a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 16f3a57ea147..7fe1b7454668 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline -, utillinux, check, enableStatic ? false }: +, util-linux, check, enableStatic ? false }: stdenv.mkDerivation rec { name = "parted-3.1"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableStatic "--enable-static"; doCheck = true; - checkInputs = [ check utillinux ]; + checkInputs = [ check util-linux ]; meta = { description = "Create, destroy, resize, check, and copy partitions"; |