Author: eelco
Date: Tue Dec 13 12:57:32 2011
New Revision: 30866
URL: https://nixos.org/websvn/nix/?rev=30866&sc=1
Log:
* Forgot a few utillinuxng references.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/build-support/vm/default.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/hal/default.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nfs-utils/default.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/pmount/default.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/parted/2.3.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/parted/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/build-support/vm/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/build-support/vm/default.nix Tue Dec
13 12:43:11 2011 (r30865)
+++ nixpkgs/branches/stdenv-updates/pkgs/build-support/vm/default.nix Tue Dec
13 12:57:32 2011 (r30866)
@@ -351,7 +351,7 @@
with pkgs; runInLinuxVM (
stdenv.mkDerivation {
name = "extract-file";
- buildInputs = [utillinuxng];
+ buildInputs = [ utillinux ];
buildCommand = ''
ln -s ${linux}/lib /lib
${module_init_tools}/sbin/modprobe loop
@@ -376,7 +376,7 @@
with pkgs; runInLinuxVM (
stdenv.mkDerivation {
name = "extract-file-mtd";
- buildInputs = [utillinuxng mtdutils];
+ buildInputs = [ utillinux mtdutils ];
buildCommand = ''
ln -s ${linux}/lib /lib
${module_init_tools}/sbin/modprobe mtd
Modified: nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/hal/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/hal/default.nix
Tue Dec 13 12:43:11 2011 (r30865)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/hal/default.nix
Tue Dec 13 12:57:32 2011 (r30866)
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, python, pciutils, expat
, libusb, dbus, dbus_glib, glib, libuuid, perl
, perlXMLParser, gettext, zlib, gperf, consolekit, policykit
-, libsmbios, dmidecode, udev, utillinuxng, pmutils, usbutils
+, libsmbios, dmidecode, udev, utillinux, pmutils, usbutils
, eject, upstart
}:
@@ -51,8 +51,8 @@
substituteInPlace $i \
${changeDmidecode} \
${if udev != null then "--replace /sbin/udevadm ${udev}/sbin/udevadm"
else ""} \
- --replace /bin/mount ${utillinuxng}/bin/mount \
- --replace /bin/umount ${utillinuxng}/bin/umount \
+ --replace /bin/mount ${utillinux}/bin/mount \
+ --replace /bin/umount ${utillinux}/bin/umount \
--replace /usr/bin/pm-is-supported ${pmutils}/bin/pm-is-supported \
--replace /usr/sbin/pm ${pmutils}/sbin/pm \
--replace /sbin/shutdown ${upstart}/sbin/shutdown
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nfs-utils/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nfs-utils/default.nix
Tue Dec 13 12:43:11 2011 (r30865)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nfs-utils/default.nix
Tue Dec 13 12:57:32 2011 (r30866)
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, tcpWrapper, utillinuxng, libcap }:
+{ fetchurl, stdenv, tcpWrapper, utillinux, libcap }:
stdenv.mkDerivation rec {
name = "nfs-utils-1.2.3";
@@ -9,7 +9,7 @@
};
# Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'.
- buildInputs = [ tcpWrapper utillinuxng libcap ];
+ buildInputs = [ tcpWrapper utillinux libcap ];
# FIXME: Add the dependencies needed for NFSv4 and TI-RPC.
configureFlags =
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/pmount/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/pmount/default.nix
Tue Dec 13 12:43:11 2011 (r30865)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/pmount/default.nix
Tue Dec 13 12:57:32 2011 (r30866)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cryptsetup, dbus, dbus_glib, hal, intltool, ntfs3g,
utillinuxng
+{ stdenv, fetchurl, cryptsetup, dbus, dbus_glib, hal, intltool, ntfs3g,
utillinux
, mediaDir ? "/media/"
, lockDir ? "/var/lock/pmount"
, whiteList ? "/etc/pmount.allow"
@@ -15,14 +15,14 @@
sha256 =
"db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036";
};
- buildInputs = [ hal intltool utillinuxng ];
+ buildInputs = [ hal intltool utillinux ];
configureFlags = ""
+ " --with-media-dir=${mediaDir}"
+ " --with-lock-dir=${lockDir}"
+ " --with-whitelist=${whiteList}"
- + " --with-mount-prog=${utillinuxng}/bin/mount"
- + " --with-umount-prog=${utillinuxng}/bin/umount"
+ + " --with-mount-prog=${utillinux}/bin/mount"
+ + " --with-umount-prog=${utillinux}/bin/umount"
+ " --with-cryptsetup=${cryptsetup}/sbin/cryptsetup"
+ " --with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g"
+ " --enable-hal";
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/misc/parted/2.3.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/tools/misc/parted/2.3.nix Tue Dec
13 12:43:11 2011 (r30865)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/misc/parted/2.3.nix Tue Dec
13 12:57:32 2011 (r30866)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline
-, utillinuxng, xz, enableStatic ? false, hurd ? null }:
+, utillinux, xz, enableStatic ? false, hurd ? null }:
stdenv.mkDerivation rec {
name = "parted-2.3";
@@ -28,7 +28,7 @@
preCheck =
stdenv.lib.optionalString doCheck
# The `t0400-loop-clobber-infloop.sh' test wants `mkswap'.
- "export PATH=\"${utillinuxng}/sbin:$PATH\"";
+ "export PATH=\"${utillinux}/sbin:$PATH\"";
meta = {
description = "GNU Parted, a tool to create, destroy, resize, check, and
copy partitions";
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/misc/parted/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/tools/misc/parted/default.nix Tue Dec
13 12:43:11 2011 (r30865)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/misc/parted/default.nix Tue Dec
13 12:57:32 2011 (r30866)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline
-, utillinuxng, xz, check, enableStatic ? false, hurd ? null }:
+, utillinux, xz, check, enableStatic ? false, hurd ? null }:
stdenv.mkDerivation rec {
name = "parted-3.0";
@@ -29,7 +29,7 @@
preCheck =
stdenv.lib.optionalString doCheck
# The `t0400-loop-clobber-infloop.sh' test wants `mkswap'.
- "export PATH=\"${utillinuxng}/sbin:$PATH\"";
+ "export PATH=\"${utillinux}/sbin:$PATH\"";
meta = {
description = "GNU Parted, a tool to create, destroy, resize, check, and
copy partitions";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
