From 7cae967c7cb1359f075740492a23f1ba1de8a98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 8 Dec 2009 10:04:43 +0000 Subject: [PATCH] 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 --- pkgs/tools/misc/coreutils/7.5.nix | 28 ---------------------------- pkgs/top-level/all-packages.nix | 9 +-------- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/tools/misc/coreutils/7.5.nix diff --git a/pkgs/tools/misc/coreutils/7.5.nix b/pkgs/tools/misc/coreutils/7.5.nix deleted file mode 100644 index 90223c35483..00000000000 --- a/pkgs/tools/misc/coreutils/7.5.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfc5fa7cc8a..0ef5a2bb0e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;