public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* util-linux 2.20.1.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30860
This commit is contained in:
Eelco Dolstra 2011-12-12 19:56:17 +00:00
parent 28e2c7e2f5
commit da3eea5c9e
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/util-linux-ng/default.nix → pkgs/os-specific/linux/util-linux/default.nix
View File

@ -1,11 +1,13 @@
{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null }: { stdenv, fetchurl, zlib, ncurses ? null, perl ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "util-linux-ng-2.18"; name = "util-linux-2.20.1";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux-ng/v2.18/${name}.tar.bz2"; # This used to be mirror://kernel/linux/utils/util-linux, but it
sha256 = "1k1in1ba9kvh0kplri9765wh0yk68qrkk1a55dqsm21qfryc1idq"; # disappeared in the kernel.org meltdown.
url = "mirror://gentoo/distfiles/${name}.tar.bz2";
sha256 = "1q5vjcvw4f067c63vj2n3xggvk5prm11571x6vnqiav47vdbqvni";
}; };
# !!! It would be better to obtain the path to the mount helpers # !!! It would be better to obtain the path to the mount helpers

14
pkgs/top-level/all-packages.nix
View File

@ -5227,8 +5227,8 @@ let
libuuid = libuuid =
if crossSystem != null && crossSystem.config == "i586-pc-gnu" if crossSystem != null && crossSystem.config == "i586-pc-gnu"
then (utillinuxng // { then (utillinux // {
hostDrv = lib.overrideDerivation utillinuxng.hostDrv (args: { hostDrv = lib.overrideDerivation utillinux.hostDrv (args: {
# `libblkid' fails to build on GNU/Hurd. # `libblkid' fails to build on GNU/Hurd.
configureFlags = args.configureFlags configureFlags = args.configureFlags
+ " --disable-libblkid --disable-mount --disable-libmount" + " --disable-libblkid --disable-mount --disable-libmount"
@ -5241,7 +5241,7 @@ let
}); });
}) })
else if stdenv.isLinux else if stdenv.isLinux
then utillinuxng then utillinux
else null; else null;
e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { }; e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { };
@ -6090,16 +6090,12 @@ let
usbutils = callPackage ../os-specific/linux/usbutils { }; usbutils = callPackage ../os-specific/linux/usbutils { };
utillinux = utillinuxng; utillinux = lowPrio (callPackage ../os-specific/linux/util-linux {
utillinuxCurses = utillinuxngCurses;
utillinuxng = lowPrio (callPackage ../os-specific/linux/util-linux-ng {
ncurses = null; ncurses = null;
perl = null; perl = null;
}); });
utillinuxngCurses = utillinuxng.override { utillinuxCurses = utillinux.override {
inherit ncurses perl; inherit ncurses perl;
}; };