alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Got rid of the old util-linux; use util-linux-ng instead.

Browse source 
svn path=/nixpkgs/trunk/; revision=14799
This commit is contained in:
Eelco Dolstra 2009-03-31 09:26:47 +00:00
parent 5a594ea219
commit acca11b49c
3 changed files with 8 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/os-specific/linux/util-linux-ng/default.nix
View file

@ -12,11 +12,11 @@
}: }:
stdenv.mkDerivation { 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 { src = fetchurl {
url = mirror://kernel/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14.1.tar.bz2; url = mirror://kernel/linux/utils/util-linux-ng/v2.14/util-linux-ng-2.14.2.tar.bz2;
sha256 = "0b40xwdqpp16fcy1vfzqigl41d9slq32kzv2jr6nfy5bk59rqa5z"; sha256 = "03k3w0f1ljwvv31glnxkk1f66fzyw0wdshgqxz0aixh7l3ln73hh";
}; };
configureFlags = '' configureFlags = ''

56
pkgs/os-specific/linux/util-linux/default.nix
View file

@ -1,56 +0,0 @@
{ stdenv, fetchurl, ncurses ? null
, # Build mount/umount only.
buildMountOnly ? false
, # A directory containing mount helpers programs
# (i.e. `mount.<fstype>') 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";
}

19
pkgs/top-level/all-packages.nix
View file

@ -7418,25 +7418,16 @@ let
inherit fetchurl stdenv libusb; inherit fetchurl stdenv libusb;
}; };
utillinux = composedArgsAndFun (import ../os-specific/linux/util-linux) { utillinux = utillinuxng;
inherit fetchurl stdenv;
};
utillinuxCurses = import ../os-specific/linux/util-linux { utillinuxCurses = utillinuxngCurses;
inherit fetchurl stdenv ncurses;
};
utillinuxStatic = lowPrio (appendToName "static" (import ../os-specific/linux/util-linux { utillinuxng = makeOverridable (import ../os-specific/linux/util-linux-ng) {
inherit fetchurl;
stdenv = makeStaticBinaries stdenv;
}));
utillinuxng = composedArgsAndFun (import ../os-specific/linux/util-linux-ng) {
inherit fetchurl stdenv e2fsprogs; inherit fetchurl stdenv e2fsprogs;
}; };
utillinuxngCurses = composedArgsAndFun (import ../os-specific/linux/util-linux-ng) { utillinuxngCurses = utillinuxng.override {
inherit fetchurl stdenv e2fsprogs ncurses; inherit ncurses;
}; };
wesnoth = import ../games/wesnoth { wesnoth = import ../games/wesnoth {