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

+1 -36
-28
pkgs/tools/misc/coreutils/7.5.nix
··· 1 - {stdenv, fetchurl, aclSupport ? false, acl}: 2 - 3 - stdenv.mkDerivation rec { 4 - name = "coreutils-7.5"; 5 - 6 - src = fetchurl { 7 - url = "mirror://gnu/coreutils/${name}.tar.gz"; 8 - sha256 = "1hf333y85fm0q7f1apx2zjjhivwj620nc8kcifdcm0sg8fwlj7rl"; 9 - }; 10 - 11 - buildInputs = stdenv.lib.optional aclSupport acl; 12 - 13 - meta = { 14 - homepage = http://www.gnu.org/software/coreutils/; 15 - description = "The basic file, shell and text manipulation utilities of the GNU operating system"; 16 - 17 - longDescription = '' 18 - The GNU Core Utilities are the basic file, shell and text 19 - manipulation utilities of the GNU operating system. These are 20 - the core utilities which are expected to exist on every 21 - operating system. 22 - ''; 23 - 24 - license = "GPLv3+"; 25 - 26 - maintainers = [ stdenv.lib.maintainers.ludo ]; 27 - }; 28 - }
+1 -8
pkgs/top-level/all-packages.nix
··· 508 508 inherit fetchurl stdenv ppl; 509 509 }; 510 510 511 - coreutils75_real = makeOverridable (import ../tools/misc/coreutils/7.5.nix) { 512 - inherit fetchurl stdenv acl; 513 - aclSupport = stdenv.isLinux; 514 - }; 515 - 516 511 coreutils_real = makeOverridable (if stdenv ? isDietLibC 517 512 then import ../tools/misc/coreutils-5 518 513 else import ../tools/misc/coreutils) ··· 521 516 aclSupport = stdenv.isLinux; 522 517 }; 523 518 524 - coreutils = useFromStdenv "coreutils" 525 - (if system == "armv5tel-linux" then coreutils75_real 526 - else coreutils_real); 519 + coreutils = useFromStdenv "coreutils" coreutils_real; 527 520 528 521 cpio = import ../tools/archivers/cpio { 529 522 inherit fetchurl stdenv;