* Updated various stdenv packages (grep, gawk, tar, cpio, findutils,

pcre).

svn path=/nixpkgs/branches/stdenv-updates/; revision=9758

pkgs/development/libraries/pcre/default.nix

@@ -1,14 +1,13 @@
 args: with args;
 
-stdenv.mkDerivation ({
-  name = "pcre-7.1";
+stdenv.mkDerivation {
+  name = "pcre-7.4";
   src = fetchurl {
-    url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.1.tar.bz2;
-    sha256 = "0rpkcw07jas3fw6ava3ni5zcrmbncwa8xlsa0lzq6z2iph5510li";
+    url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.4.tar.bz2;
+    sha256 = "1rdks2h5f3p2d71c4jnxaic1c9gmgsfky80djnafcdbdrhzkiyx5";
   };
+  configureFlags =
+    if unicodeSupport then
+      "--enable-unicode-properties --enable-shared --disable-static"
+    else "";
 }
-// (if unicodeSupport then
-{
-  configureFlags = "--enable-unicode-properties --enable-shared --disable-static";
-}
-else {}))

pkgs/os-specific/linux/kernel-headers/2.6.23.8.nix

@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "linux-headers-2.6.23.1";
+  name = "linux-headers-2.6.23.8";
   builder = ./builder.sh;
   src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.23.1.tar.bz2";
-    sha256 = "0737g83h7jbrlss8782b17mhc3nfn8qfbh5s71flz8pjxmbbmg1m";
+    url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.23.8.tar.bz2";
+    sha256 = "1sp2ww2ya0wyyyq0vdxbn6ydllv9gpmzw2yz66llgvgv32cix534";
   };
 
   platform = 

pkgs/os-specific/linux/kernel-headers/default.nix

@@ -1,21 +0,0 @@
-{stdenv, fetchurl}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation {
-  name = "linux-headers-2.6.20.11";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.20.11.tar.bz2";
-    sha256 = "1n0xgqckj64ga3l53l8lk1591lfcn6zcrqg3phz2m0y841ck5qlk";
-  };
-
-  platform = 
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    if stdenv.system == "powerpc-linux" then "powerpc" else
-    abort "don't know what the kernel include directory is called for this platform";
-
-  extraIncludeDirs =
-    if stdenv.system == "powerpc-linux" then ["ppc"] else [];
-}

pkgs/tools/archivers/cpio/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "cpio-2.7";
+  name = "cpio-2.9";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/cpio/cpio-2.7.tar.bz2;
-    md5 = "69ad6cb3d288aafe5f969f68d9fd0fb7";
+    url = mirror://gnu/cpio/cpio-2.9.tar.bz2;
+    sha256 = "01s7f9hg8kgpis96j99hgkiqgdy53pm7qi7bhm3fzx58jfk5z6mv";
   };
   patches = [./symlink.patch ./gnulib-futimens.patch];
 }

pkgs/tools/archivers/gnutar/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "gnutar-1.16.1";
+  name = "gnutar-1.19";
   src = fetchurl {
-    url = mirror://gnu/tar/tar-1.16.1.tar.bz2;
-    md5 = "d51593461c5ef1f7e37134f22338bb9e";
+    url = mirror://gnu/tar/tar-1.19.tar.bz2;
+    sha256 = "1d4wh27wlgryz3ld6gp6fn56knh7dmny93bmgixy07kvlxnx9466";
   };
-  patches = [./implausible.patch ./gnulib-futimens.patch];
+  patches = [./implausible.patch];
 }

pkgs/tools/archivers/gnutar/gnulib-futimens.patch

@@ -1,42 +0,0 @@
-now hat glibc-2.6  declares futimens.
-http://lists.gnu.org/archive/html/bug-gnulib/2007-05/msg00089.html
-
-diff -ru cpio-2.7.orig/lib/utimens.c cpio-2.7/lib/utimens.c
---- cpio-2.7.orig/lib/utimens.c	2007-05-20 21:23:57.000000000 +0900
-+++ cpio-2.7/lib/utimens.c	2007-05-21 08:40:22.000000000 +0900
-@@ -73,7 +73,7 @@
-    Return 0 on success, -1 (setting errno) on failure.  */
- 
- int
--futimens (int fd ATTRIBUTE_UNUSED,
-+gl_futimens (int fd ATTRIBUTE_UNUSED,
- 	  char const *file, struct timespec const timespec[2])
- {
-   /* There's currently no interface to set file timestamps with
-@@ -166,5 +166,5 @@
- int
- utimens (char const *file, struct timespec const timespec[2])
- {
--  return futimens (-1, file, timespec);
-+  return gl_futimens (-1, file, timespec);
- }
-diff -ru cpio-2.7.orig/lib/utimens.h cpio-2.7/lib/utimens.h
---- cpio-2.7.orig/lib/utimens.h	2007-05-20 21:23:57.000000000 +0900
-+++ cpio-2.7/lib/utimens.h	2007-05-21 08:39:57.000000000 +0900
-@@ -1,3 +1,3 @@
- #include "timespec.h"
--int futimens (int, char const *, struct timespec const [2]);
-+int gl_futimens (int, char const *, struct timespec const [2]);
- int utimens (char const *, struct timespec const [2]);
-diff -ur tar-1.16.1.orig/src/misc.c tar-1.16.1/src/misc.c
---- tar-1.16.1.orig/src/misc.c	2007-05-21 08:57:02.000000000 +0900
-+++ tar-1.16.1/src/misc.c	2007-05-21 08:57:16.000000000 +0900
-@@ -518,7 +518,7 @@
-     }
- #endif
- 
--  return futimens (fd, file, timespec);
-+  return gl_futimens (fd, file, timespec);
- }
- 
- /* A description of a working directory.  */

pkgs/tools/misc/findutils/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, coreutils}:
 
 stdenv.mkDerivation {
-  name = "findutils-4.2.30";
+  name = "findutils-4.2.31";
   src = fetchurl {
-    url = mirror://gnu/findutils/findutils-4.2.30.tar.gz;
-    sha256 = "1x1s0h1gf4hxh6xi6vq336sz8zsh4hvnsslc7607z41l82xrqjrl";
+    url = mirror://gnu/findutils/findutils-4.2.31.tar.gz;
+    sha256 = "01329mrgg7pc2069hdbcl45jzrzvi94nnv1zf2hcrcx0mj7lplz0";
   };
   buildInputs = [coreutils];
 

pkgs/tools/text/gawk/default.nix

@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "gawk-3.1.5";
+  name = "gawk-3.1.6";
   src = fetchurl {
-    url = ftp://ftp.gnu.org/gnu/gawk/gawk-3.1.5.tar.bz2;
-    md5 = "5703f72d0eea1d463f735aad8222655f";
+    url = mirror://gnu/gawk/gawk-3.1.6.tar.bz2;
+    sha256 = "0v6ba4hxfiiy3bny5japd3zmzxlh8vdkmswk96yngd6i1dddsgsi";
   };
 }

pkgs/tools/text/gnugrep/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pcre}:
 
 stdenv.mkDerivation {
-  name = "gnugrep-2.5.1a";
+  name = "gnugrep-2.5.3";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/grep/grep-2.5.1a.tar.bz2;
-    md5 = "52202fe462770fa6be1bb667bd6cf30c";
+    url = http://nix.cs.uu.nl/dist/tarballs/grep-2.5.3-with-info.tar.bz2;
+    sha256 = "0rg9dipksqzbg8v1xalib1n3xkkycc5r1l2gb9cxy1cz3cjip5l8";
   };
   buildInputs = [pcre];
 }

pkgs/top-level/all-packages.nix

@@ -922,8 +922,6 @@ rec {
     profiledCompiler = false;
   });
 
-  gcc41NPTL = wrapGCCWithGlibc gcc41.gcc glibcNPTL;
-
   gcc42 = useFromStdenv (stdenv ? gcc) stdenv.gcc (wrapGCC (import ../development/compilers/gcc-4.2 {
     inherit fetchurl stdenv noSysDirs;
     profiledCompiler = true;
@@ -1745,15 +1743,11 @@ rec {
   };
 
   glibc = useFromStdenv (stdenv ? glibc) stdenv.glibc
-    (import ../development/libraries/glibc {
+    (import ../development/libraries/glibc-2.5 {
       inherit fetchurl stdenv kernelHeaders;
       #installLocales = false;
     });
 
-  glibcNPTL = import ../development/libraries/glibc-nptl {
-    inherit fetchurl stdenv kernelHeaders;
-  };
-
   glibmm = import ../development/libraries/gtk-libs-2.6/glibmm {
     inherit fetchurl stdenv pkgconfig libsigcxx;
     inherit (gtkLibs26) glib;
@@ -2912,15 +2906,13 @@ rec {
     inherit fetchurl stdenv bison flex;
   };
 
-  kernelHeaders = import ../os-specific/linux/kernel-headers {
+  kernelHeaders = kernelHeaders_2_6_23;
+
+  kernelHeaders_2_6_21 = import ../os-specific/linux/kernel-headers/2.6.21.1.nix {
     inherit fetchurl stdenv;
   };
 
-  kernelHeaders_2_6_21 = import ../os-specific/linux/kernel-headers/2.6.21.3.nix {
-    inherit fetchurl stdenv;
-  };
-
-  kernelHeaders_2_6_23 = import ../os-specific/linux/kernel-headers/2.6.23.1.nix {
+  kernelHeaders_2_6_23 = import ../os-specific/linux/kernel-headers/2.6.23.8.nix {
     inherit fetchurl stdenv;
   };
 
@@ -3436,12 +3428,11 @@ rec {
   };
 
   audacity = import ../applications/audio/audacity {
-    inherit fetchurl libogg libvorbis libsndfile libmad 
-	pkgconfig gettext;
-	inherit (gtkLibs) gtk glib;
-	wxGTK = wxGTK28deps;
-    stdenv = overrideGCC stdenv gcc41NPTL;
-	inherit builderDefs stringsWithDeps;
+    inherit fetchurl stdenv libogg libvorbis libsndfile libmad 
+      pkgconfig gettext;
+    inherit (gtkLibs) gtk glib;
+    wxGTK = wxGTK28deps;
+    inherit builderDefs stringsWithDeps;
   };
 
   batik = import ../applications/graphics/batik {
@@ -4574,8 +4565,7 @@ rec {
   };
 
   wine = import ../misc/emulators/wine {
-    stdenv = overrideGCC stdenv gcc41NPTL;
-    inherit fetchurl flex bison mesa ncurses
+    inherit fetchurl stdenv flex bison mesa ncurses
       libpng libjpeg alsaLib lcms xlibs freetype
       fontconfig fontforge;
   };