From acca11b49c04ecc05e6eb279357b5d0808767f40 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 31 Mar 2009 09:26:47 +0000 Subject: [PATCH] * Got rid of the old util-linux; use util-linux-ng instead. svn path=/nixpkgs/trunk/; revision=14799 --- .../linux/util-linux-ng/default.nix | 6 +- pkgs/os-specific/linux/util-linux/default.nix | 56 ------------------- pkgs/top-level/all-packages.nix | 19 ++----- 3 files changed, 8 insertions(+), 73 deletions(-) delete mode 100644 pkgs/os-specific/linux/util-linux/default.nix diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix index 8c77cf297af..aa0b99a2526 100644 --- a/pkgs/os-specific/linux/util-linux-ng/default.nix +++ b/pkgs/os-specific/linux/util-linux-ng/default.nix @@ -12,11 +12,11 @@ }: stdenv.mkDerivation { - name = (if buildMountOnly then "mount-" else "") + "util-linux-ng-2.14.1"; + name = (if buildMountOnly then "mount-" else "") + "util-linux-ng-2.14.2"; src = fetchurl { - url = mirror://kernel/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14.1.tar.bz2; - sha256 = "0b40xwdqpp16fcy1vfzqigl41d9slq32kzv2jr6nfy5bk59rqa5z"; + url = mirror://kernel/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14.2.tar.bz2; + sha256 = "03k3w0f1ljwvv31glnxkk1f66fzyw0wdshgqxz0aixh7l3ln73hh"; }; configureFlags = '' diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix deleted file mode 100644 index d9fd0028c79..00000000000 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, ncurses ? null - -, # Build mount/umount only. - buildMountOnly ? false - -, # A directory containing mount helpers programs - # (i.e. `mount.') to be used instead of /sbin. - mountHelpers ? null -}: - -stdenv.mkDerivation { - name = (if buildMountOnly then "mount-" else "") + "util-linux-2.13-pre7"; - - src = fetchurl { - url = mirror://kernel/linux/utils/util-linux/testing/util-linux-2.13-pre7.tar.bz2; - md5 = "13cdf4b76533e8421dc49de188f85291"; - }; - - patches = [ - # Fix for a local root exploit via mount/umount - # (http://www.gentoo.org/security/en/glsa/glsa-200710-18.xml). - (fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-apps/util-linux/files/util-linux-2.13-setuid-checks.patch?rev=1.1"; - sha256 = "02ky7ljzqpx8ii3dfmjydw8nnhshpw2inwh6w1vqllz8mhn81jdf"; - }) - ]; - - configureFlags = "--disable-use-tty-group"; - - buildInputs = stdenv.lib.optional (ncurses != null) ncurses; - - inherit mountHelpers; - - preConfigure = '' - makeFlagsArray=(usrbinexecdir=$out/bin usrsbinexecdir=$out/sbin datadir=$out/share exampledir=$out/share/getopt) - if test -n "$mountHelpers"; then - substituteInPlace mount/mount.c --replace /sbin/mount. $mountHelpers/mount. - substituteInPlace mount/umount.c --replace /sbin/umount. $mountHelpers/umount. - fi - ''; - - buildPhase = - if buildMountOnly then '' - make "''${makeFlagsArray[@]}" -C lib - make "''${makeFlagsArray[@]}" -C mount - '' else ""; - - installPhase = - if buildMountOnly then '' - make "''${makeFlagsArray[@]}" -C lib install - make "''${makeFlagsArray[@]}" -C mount install - '' else ""; - - # Hack to get static builds to work. - NIX_CFLAGS_COMPILE = "-DHAVE___PROGNAME=1"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21f5ca3eaa7..40ca3a7840e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7418,25 +7418,16 @@ let inherit fetchurl stdenv libusb; }; - utillinux = composedArgsAndFun (import ../os-specific/linux/util-linux) { - inherit fetchurl stdenv; - }; + utillinux = utillinuxng; - utillinuxCurses = import ../os-specific/linux/util-linux { - inherit fetchurl stdenv ncurses; - }; + utillinuxCurses = utillinuxngCurses; - utillinuxStatic = lowPrio (appendToName "static" (import ../os-specific/linux/util-linux { - inherit fetchurl; - stdenv = makeStaticBinaries stdenv; - })); - - utillinuxng = composedArgsAndFun (import ../os-specific/linux/util-linux-ng) { + utillinuxng = makeOverridable (import ../os-specific/linux/util-linux-ng) { inherit fetchurl stdenv e2fsprogs; }; - utillinuxngCurses = composedArgsAndFun (import ../os-specific/linux/util-linux-ng) { - inherit fetchurl stdenv e2fsprogs ncurses; + utillinuxngCurses = utillinuxng.override { + inherit ncurses; }; wesnoth = import ../games/wesnoth {