Author: eelco
Date: Mon Dec 12 19:56:17 2011
New Revision: 30860
URL: https://nixos.org/websvn/nix/?rev=30860&sc=1
Log:
* util-linux 2.20.1.
Added:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux/
- copied from r30852,
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux-ng/
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux-ng/
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux-ng/default.nix
Mon Dec 12 16:54:35 2011 (r30852)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux/default.nix
Mon Dec 12 19:56:17 2011 (r30860)
@@ -1,11 +1,13 @@
{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null }:
stdenv.mkDerivation rec {
- name = "util-linux-ng-2.18";
+ name = "util-linux-2.20.1";
src = fetchurl {
- url = "mirror://kernel/linux/utils/util-linux-ng/v2.18/${name}.tar.bz2";
- sha256 = "1k1in1ba9kvh0kplri9765wh0yk68qrkk1a55dqsm21qfryc1idq";
+ # This used to be mirror://kernel/linux/utils/util-linux, but it
+ # 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
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Mon Dec
12 19:56:04 2011 (r30859)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Mon Dec
12 19:56:17 2011 (r30860)
@@ -5227,8 +5227,8 @@
libuuid =
if crossSystem != null && crossSystem.config == "i586-pc-gnu"
- then (utillinuxng // {
- hostDrv = lib.overrideDerivation utillinuxng.hostDrv (args: {
+ then (utillinux // {
+ hostDrv = lib.overrideDerivation utillinux.hostDrv (args: {
# `libblkid' fails to build on GNU/Hurd.
configureFlags = args.configureFlags
+ " --disable-libblkid --disable-mount --disable-libmount"
@@ -5241,7 +5241,7 @@
});
})
else if stdenv.isLinux
- then utillinuxng
+ then utillinux
else null;
e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { };
@@ -6090,16 +6090,12 @@
usbutils = callPackage ../os-specific/linux/usbutils { };
- utillinux = utillinuxng;
-
- utillinuxCurses = utillinuxngCurses;
-
- utillinuxng = lowPrio (callPackage ../os-specific/linux/util-linux-ng {
+ utillinux = lowPrio (callPackage ../os-specific/linux/util-linux {
ncurses = null;
perl = null;
});
- utillinuxngCurses = utillinuxng.override {
+ utillinuxCurses = utillinux.override {
inherit ncurses perl;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
