diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-06 13:43:57 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-06 14:10:54 +0100 |
| commit | 92656e5f526402b2a18751c365e6b1a47731dfbb (patch) | |
| tree | c67850a06f0e861b953c243e0a0f49f9be902f18 /pkgs/tools/misc/coreutils | |
| parent | d7abc31f5a26bf61b43beb01ff6e079bc29229ac (diff) | |
| download | nixlib-92656e5f526402b2a18751c365e6b1a47731dfbb.tar nixlib-92656e5f526402b2a18751c365e6b1a47731dfbb.tar.gz nixlib-92656e5f526402b2a18751c365e6b1a47731dfbb.tar.bz2 nixlib-92656e5f526402b2a18751c365e6b1a47731dfbb.tar.lz nixlib-92656e5f526402b2a18751c365e6b1a47731dfbb.tar.xz nixlib-92656e5f526402b2a18751c365e6b1a47731dfbb.tar.zst nixlib-92656e5f526402b2a18751c365e6b1a47731dfbb.zip | |
coreutils: Update to 8.21
Now "df" finally hides bind mounts and rootfs!
Diffstat (limited to 'pkgs/tools/misc/coreutils')
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 9fd1d86ff82a..065d237a0731 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -7,11 +7,11 @@ assert aclSupport -> acl != null; assert selinuxSupport -> libselinux != null && libsepol != null; stdenv.mkDerivation rec { - name = "coreutils-8.20"; + name = "coreutils-8.21"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "1cly97xdy3v4nbbx631k43smqw0nnpn651kkprs0yyl2cj3pkjyv"; + sha256 = "064f512185iysqqcvhnhaf3bfmzrvcgs7n405qsyp99zmfyl9amd"; }; nativeBuildInputs = [ perl ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional selinuxSupport libselinux ++ stdenv.lib.optional selinuxSupport libsepol; - crossAttrs = ({ + crossAttrs = { buildInputs = [ gmp ] ++ stdenv.lib.optional aclSupport acl.crossDrv ++ stdenv.lib.optional selinuxSupport libselinux.crossDrv @@ -32,14 +32,7 @@ stdenv.mkDerivation rec { # I don't know why it is not properly detected cross building with glibc. configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ]; doCheck = false; - } - - // - - # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. - (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { - patches = [ ./gets-undeclared.patch ]; - })); + }; # The tests are known broken on Cygwin # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), @@ -67,4 +60,3 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.ludo ]; }; } - |