From 123ab78ee037f80a7ed98010f95168c48b2aa78b Mon Sep 17 00:00:00 2001 From: Danie Roux Date: Sat, 7 Sep 2013 16:42:04 +0200 Subject: coreutils: Remove 8.19 reference --- pkgs/tools/misc/coreutils/8.19.nix | 72 --------------------------------- pkgs/tools/misc/coreutils/stpncpy.patch | 11 ----- 2 files changed, 83 deletions(-) delete mode 100644 pkgs/tools/misc/coreutils/8.19.nix delete mode 100644 pkgs/tools/misc/coreutils/stpncpy.patch (limited to 'pkgs/tools/misc/coreutils') diff --git a/pkgs/tools/misc/coreutils/8.19.nix b/pkgs/tools/misc/coreutils/8.19.nix deleted file mode 100644 index 59602e69d1d6..000000000000 --- a/pkgs/tools/misc/coreutils/8.19.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv, fetchurl, perl, gmp ? null -, aclSupport ? false, acl ? null -, selinuxSupport? false, libselinux ? null, libsepol ? null -}: - -assert aclSupport -> acl != null; -assert selinuxSupport -> libselinux != null && libsepol != null; - -stdenv.mkDerivation rec { - name = "coreutils-8.19"; - - src = fetchurl { - url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "1rx9x3fp848w4nny7irdkcpkan9fcx24d99v5dkwgkyq7wc76f5d"; - }; - - patches = [ ./stpncpy.patch ]; - - nativeBuildInputs = [ perl ]; - buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl - ++ stdenv.lib.optional selinuxSupport libselinux - ++ stdenv.lib.optional selinuxSupport libsepol; - - crossAttrs = ({ - buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl.crossDrv - ++ stdenv.lib.optional selinuxSupport libselinux.crossDrv - ++ stdenv.lib.optional selinuxSupport libsepol.crossDrv - ++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) - stdenv.gccCross.libc.libiconv.crossDrv; - - # Needed for fstatfs() - # 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), - # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), - # and {Open,Free}BSD. - doCheck = stdenv ? glibc; - - enableParallelBuilding = true; - - NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol"; - - 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 = [ ]; - }; -} - diff --git a/pkgs/tools/misc/coreutils/stpncpy.patch b/pkgs/tools/misc/coreutils/stpncpy.patch deleted file mode 100644 index d4a0e0ee0e1a..000000000000 --- a/pkgs/tools/misc/coreutils/stpncpy.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- coreutils-8.19/lib/stpncpy.c.orig 2013-09-02 18:20:00.000000000 +0200 -+++ coreutils-8.19/lib/stpncpy.c 2013-09-02 18:20:31.000000000 +0200 -@@ -31,7 +31,7 @@ - /* Copy no more than N bytes of SRC to DST, returning a pointer past the - last non-NUL byte written into DST. */ - char * --__stpncpy (char *dest, const char *src, size_t n) -+(__stpncpy) (char *dest, const char *src, size_t n) - { - char c; - char *s = dest; -- cgit 1.4.1