diff options
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/misc/coreutils/uclibc.patch | 35 |
2 files changed, 5 insertions, 42 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 020995c6f545..e8755f11d494 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,11 +1,9 @@ {stdenv, fetchurl}: -stdenv.mkDerivation ({ - name = "coreutils-5.97"; +stdenv.mkDerivation { + name = "coreutils-6.4"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/coreutils-5.97.tar.gz; - md5 = "bdec4b75c76ac9bf51b6dd1747d3b06e"; + url = http://ftp.gnu.org/pub/gnu/coreutils/coreutils-6.4.tar.bz2; + md5 = "a3806c709c7f063b80612be846a9d88c"; }; -} // (if stdenv ? isDietLibC then { - patches = [./uclibc.patch]; -} else {})) +} diff --git a/pkgs/tools/misc/coreutils/uclibc.patch b/pkgs/tools/misc/coreutils/uclibc.patch deleted file mode 100644 index 232737c2f354..000000000000 --- a/pkgs/tools/misc/coreutils/uclibc.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -rc coreutils-5.97-orig/lib/strftime.c coreutils-5.97/lib/strftime.c -*** coreutils-5.97-orig/lib/strftime.c 2006-10-18 17:10:16.000000000 +0200 ---- coreutils-5.97/lib/strftime.c 2006-10-18 17:19:10.000000000 +0200 -*************** -*** 180,185 **** ---- 180,191 ---- - # define memset_zero(P, Len) (memset (P, '0', Len), (P) += (Len)) - #endif - -+ #if FPRINTFTIME -+ #define advance(p, _n) ; -+ #else -+ #define advance(p, _n) p += _n; -+ #endif -+ - #define add(n, f) \ - do \ - { \ -*************** -*** 198,204 **** - memset_space (p, _delta); \ - } \ - f; \ -! p += FPRINTFTIME ? 0 : _n; \ - } \ - i += _incr; \ - } while (0) ---- 204,210 ---- - memset_space (p, _delta); \ - } \ - f; \ -! advance(p, _n); \ - } \ - i += _incr; \ - } while (0) |