forked from mirrors/nixpkgs
Removing the coreutils-7.5, which were needed in armv5tel in contrast to
coreutils 7.6, which did not build well. The newer coreutils 8.1 work perfectly, and we don't need to rely in older versions. svn path=/nixpkgs/branches/stdenv-updates/; revision=18836
This commit is contained in:
parent
a2b2e6542f
commit
7cae967c7c
|
@ -1,28 +0,0 @@
|
|||
{stdenv, fetchurl, aclSupport ? false, acl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "coreutils-7.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/coreutils/${name}.tar.gz";
|
||||
sha256 = "1hf333y85fm0q7f1apx2zjjhivwj620nc8kcifdcm0sg8fwlj7rl";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optional aclSupport acl;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/coreutils/;
|
||||
description = "The basic file, shell and text manipulation utilities of the GNU operating system";
|
||||
|
||||
longDescription = ''
|
||||
The GNU Core Utilities are the basic file, shell and text
|
||||
manipulation utilities of the GNU operating system. These are
|
||||
the core utilities which are expected to exist on every
|
||||
operating system.
|
||||
'';
|
||||
|
||||
license = "GPLv3+";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
};
|
||||
}
|
|
@ -508,11 +508,6 @@ let
|
|||
inherit fetchurl stdenv ppl;
|
||||
};
|
||||
|
||||
coreutils75_real = makeOverridable (import ../tools/misc/coreutils/7.5.nix) {
|
||||
inherit fetchurl stdenv acl;
|
||||
aclSupport = stdenv.isLinux;
|
||||
};
|
||||
|
||||
coreutils_real = makeOverridable (if stdenv ? isDietLibC
|
||||
then import ../tools/misc/coreutils-5
|
||||
else import ../tools/misc/coreutils)
|
||||
|
@ -521,9 +516,7 @@ let
|
|||
aclSupport = stdenv.isLinux;
|
||||
};
|
||||
|
||||
coreutils = useFromStdenv "coreutils"
|
||||
(if system == "armv5tel-linux" then coreutils75_real
|
||||
else coreutils_real);
|
||||
coreutils = useFromStdenv "coreutils" coreutils_real;
|
||||
|
||||
cpio = import ../tools/archivers/cpio {
|
||||
inherit fetchurl stdenv;
|
||||
|
|
Loading…
Reference in a new issue