* Merged the stdenv branch

  (https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073

9 files changed, 68 insertions, 61 deletions

diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 7242f32f71c9..e2d9b9eee8ba 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "gnutar-1.19";
+  name = "gnutar-1.20";
   
   src = fetchurl {
-    url = mirror://gnu/tar/tar-1.19.tar.bz2;
-    sha256 = "1d4wh27wlgryz3ld6gp6fn56knh7dmny93bmgixy07kvlxnx9466";
+    url = mirror://gnu/tar/tar-1.20.tar.bz2;
+    sha256 = "1swx3whm2vh0qzq8v04vgwk5zds6zlznk52xwivj7p2szcxg72xy";
   };
   
   patches = [./implausible.patch];
diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix
index 8cd660adc8c6..0c4f4b494fb0 100644
--- a/pkgs/tools/backup/rdiff-backup/default.nix
+++ b/pkgs/tools/backup/rdiff-backup/default.nix
@@ -7,18 +7,18 @@ stdenv.mkDerivation {
     sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h";
   };
 
-  phases="installPhase";
-  installPhase="python setup.py install --prefix=\$out || fail
-  sed -i \$out/bin/rdiff-backup -e \\
-    \"/import sys/ asys.path += [ \\\"\$out/lib/python2.4/site-packages/\\\" ]\"
-    
-  ";
+  phases = "installPhase";
+  installPhase = ''
+    python setup.py install --prefix=$out
+    sed -i $out/bin/rdiff-backup -e \
+      "/import sys/ asys.path += [ \"$out/lib/python2.4/site-packages/\" ]"
+  '';
 
   buildInputs = [python librsync gnused ];
 
   meta = {
-      description = "backup system trying to combine best a mirror and an incremental backup system";
-      homepage = http://rdiff-backup.nongnu.org/;
-      license = "GPL-2";
-    };
+    description = "backup system trying to combine best a mirror and an incremental backup system";
+    homepage = http://rdiff-backup.nongnu.org/;
+    license = "GPL-2";
+  };
 }
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index 9ed3e941bf6e..eedcf242bcab 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -1,16 +1,18 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "bzip2-1.0.4";
+  name = "bzip2-1.0.5";
+  
   builder = ./builder.sh;
     
   src = fetchurl {
-    url = http://www.bzip.org/1.0.4/bzip2-1.0.4.tar.gz;
-    md5 = "fc310b254f6ba5fbb5da018f04533688";
+    url = http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz;
+    sha256 = "08py2s9vw6dgw457lbklh1vsr3b8x8dlv7d8ygdfaxlx61l57gzp";
   };
 
   sharedLibrary =
     !stdenv.isDarwin && !(stdenv ? isDietLibC) && stdenv.system != "i686-cygwin";
+    
   meta = {
     homepage = http://www.bzip.org;
   };
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 5bff7815eba3..0e2fa198a862 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, x11, mesa, libXext}:
+{stdenv, fetchurl, x11, mesa}:
 
 stdenv.mkDerivation {
   name = "glxinfo-6.5.2";
@@ -20,10 +20,4 @@ stdenv.mkDerivation {
     ensureDir $out/bin
     cp glxinfo glxgears $out/bin
   ";
-
-  postFixup = "
-    for i in $out/bin/*; do
-      patchelf --set-rpath /var/run/opengl-driver/lib:${libXext}/lib:$(patchelf --print-rpath $i) $i
-    done
-  ";
 }
diff --git a/pkgs/tools/graphics/transfig/builder.sh b/pkgs/tools/graphics/transfig/builder.sh
index 8a91d78a089b..d00aa90c61f0 100644
--- a/pkgs/tools/graphics/transfig/builder.sh
+++ b/pkgs/tools/graphics/transfig/builder.sh
@@ -4,7 +4,7 @@ patchPhase=patchPhase
 patchPhase() {
     for i in $patches; do
         header "applying patch $i" 3
-        patch -p0 < $i || fail
+        patch -p0 < $i
         stopNest
     done
 
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 8292c56f0ea8..fb55325dcb79 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,15 +1,17 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, aclSupport ? false, acl}:
 
 stdenv.mkDerivation {
-  name = "coreutils-6.10";
+  name = "coreutils-6.12";
   
   src = fetchurl {
-    url = mirror://gnu/coreutils/coreutils-6.10.tar.gz;
-    sha256 = "0zpbxfl16sq45s53fxw43i9i8lrdcc845714c1j5f84zi13ka08x";
+    url = mirror://gnu/coreutils/coreutils-6.12.tar.gz;
+    sha256 = "12pi7i2mxff5jab48pqpwlz2pi0j6sp9p7bgrcl663iiw81zglj9";
   };
 
   meta = {
     homepage = http://www.gnu.org/software/coreutils/;
     description = "The basic file, shell and text manipulation utilities of the GNU operating system";
   };
+
+  buildInputs = stdenv.lib.optional aclSupport acl;
 }
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index acfbf90d9464..34667f596ed7 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, coreutils}:
 
 stdenv.mkDerivation {
-  name = "findutils-4.2.32";
+  name = "findutils-4.2.33";
   src = fetchurl {
-    url = mirror://gnu/findutils/findutils-4.2.32.tar.gz;
-    sha256 = "05sj0154kl4mbqg7dcabiaa16snjv2ppfwwhcvl2zyn2yc28igc7";
+    url = mirror://gnu/findutils/findutils-4.2.33.tar.gz;
+    sha256 = "0y0gmdc55kknf5438c1da5xsvpch3v800r79rgz5rv6fb90djg41";
   };
   buildInputs = [coreutils];
 
diff --git a/pkgs/tools/networking/curl/connect-timeout.patch b/pkgs/tools/networking/curl/connect-timeout.patch
index 829c724c30e1..339930e03f6b 100644
--- a/pkgs/tools/networking/curl/connect-timeout.patch
+++ b/pkgs/tools/networking/curl/connect-timeout.patch
@@ -1,6 +1,6 @@
-diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
-*** curl-7.17.1-orig/lib/connect.c	2007-10-22 16:30:17.000000000 +0200
---- curl-7.17.1/lib/connect.c	2007-12-19 18:30:32.000000000 +0100
+diff -rc curl-7.18.1-orig/lib/connect.c curl-7.18.1/lib/connect.c
+*** curl-7.18.1-orig/lib/connect.c	2008-02-07 23:25:04.000000000 +0100
+--- curl-7.18.1/lib/connect.c	2008-04-23 11:25:30.000000000 +0200
 ***************
 *** 99,105 ****
   singleipconnect(struct connectdata *conn,
@@ -9,7 +9,7 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
 !                 bool *connected);
   
   /*
-   * Curl_nonblock() set the given socket to either blocking or non-blocking
+   * Curl_timeleft() returns the amount of milliseconds left allowed for the
 --- 99,106 ----
   singleipconnect(struct connectdata *conn,
                   const Curl_addrinfo *ai, /* start connecting to this */
@@ -18,10 +18,10 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
 !                 bool *timed_out);
   
   /*
-   * Curl_nonblock() set the given socket to either blocking or non-blocking
+   * Curl_timeleft() returns the amount of milliseconds left allowed for the
 ***************
-*** 492,497 ****
---- 493,499 ----
+*** 552,557 ****
+--- 553,559 ----
   {
     curl_socket_t sockfd;
     Curl_addrinfo *ai;
@@ -30,24 +30,24 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
     /* first close the failed socket */
     sclose(conn->sock[sockindex]);
 ***************
-*** 505,511 ****
+*** 565,571 ****
     ai = conn->ip_addr->ai_next;
   
-    while (ai) {
+    while(ai) {
 !     sockfd = singleipconnect(conn, ai, 0L, connected);
       if(sockfd != CURL_SOCKET_BAD) {
         /* store the new socket descriptor */
         conn->sock[sockindex] = sockfd;
---- 507,513 ----
+--- 567,573 ----
     ai = conn->ip_addr->ai_next;
   
-    while (ai) {
+    while(ai) {
 !     sockfd = singleipconnect(conn, ai, 0L, connected, &timed_out);
       if(sockfd != CURL_SOCKET_BAD) {
         /* store the new socket descriptor */
         conn->sock[sockindex] = sockfd;
 ***************
-*** 669,675 ****
+*** 720,726 ****
   singleipconnect(struct connectdata *conn,
                   const Curl_addrinfo *ai,
                   long timeout_ms,
@@ -55,7 +55,7 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
   {
     char addr_buf[128];
     int rc;
---- 671,678 ----
+--- 722,729 ----
   singleipconnect(struct connectdata *conn,
                   const Curl_addrinfo *ai,
                   long timeout_ms,
@@ -65,8 +65,8 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
     char addr_buf[128];
     int rc;
 ***************
-*** 689,694 ****
---- 692,699 ----
+*** 740,745 ****
+--- 743,750 ----
     struct curl_sockaddr *addr=(struct curl_sockaddr*)&addr_storage;
     const void *iptoprint;
   
@@ -76,7 +76,7 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
     addr->socktype=conn->socktype;
     addr->protocol=ai->ai_protocol;
 ***************
-*** 790,797 ****
+*** 841,848 ****
       infof(data, "connected\n");
       return sockfd;
     }
@@ -85,7 +85,7 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
     else {
       data->state.os_errno = error;
       infof(data, "%s\n", Curl_strerror(conn, error));
---- 795,804 ----
+--- 846,855 ----
       infof(data, "connected\n");
       return sockfd;
     }
@@ -97,26 +97,26 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
       data->state.os_errno = error;
       infof(data, "%s\n", Curl_strerror(conn, error));
 ***************
-*** 822,829 ****
+*** 872,879 ****
+    int num_addr;
     Curl_addrinfo *ai;
     Curl_addrinfo *curr_addr;
-    int timeout_set = 0;
   
 -   struct timeval after;
     struct timeval before = Curl_tvnow();
   
     /*************************************************************
---- 829,836 ----
+--- 879,886 ----
+    int num_addr;
     Curl_addrinfo *ai;
     Curl_addrinfo *curr_addr;
-    int timeout_set = 0;
 +   bool timed_out;
   
     struct timeval before = Curl_tvnow();
   
     /*************************************************************
 ***************
-*** 891,909 ****
+*** 915,933 ****
          curr_addr = curr_addr->ai_next, aliasindex++) {
   
       /* start connecting to the IP curr_addr points to */
@@ -135,8 +135,8 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
 -     before = after;
     }  /* end of connect-to-each-address loop */
   
-    if (sockfd == CURL_SOCKET_BAD) {
---- 898,914 ----
+    if(sockfd == CURL_SOCKET_BAD) {
+--- 922,938 ----
          curr_addr = curr_addr->ai_next, aliasindex++) {
   
       /* start connecting to the IP curr_addr points to */
@@ -153,4 +153,4 @@ diff -rc curl-7.17.1-orig/lib/connect.c curl-7.17.1/lib/connect.c
       }
     }  /* end of connect-to-each-address loop */
   
-    if (sockfd == CURL_SOCKET_BAD) {
+    if(sockfd == CURL_SOCKET_BAD) {
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 85a9ab957d6c..a429e1c95141 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -4,17 +4,21 @@ assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation {
-  name = "curl-7.17.1";
+  name = "curl-7.18.1";
+  
   src = fetchurl {
-    url = http://curl.haxx.se/download/curl-7.17.1.tar.bz2;
-    sha256 = "0yz50r75jhfr2ya6wqi6n90bn4ij30299pjglmlckzq6jp28wrkz";
+    url = http://curl.haxx.se/download/curl-7.18.1.tar.bz2;
+    sha256 = "0v5fpr4bsdlg262nsgrijlfhp3vgr1ypir1rrkmhxcsnpv4frw6c";
   };
+  
   buildInputs =
     stdenv.lib.optional zlibSupport zlib ++
     stdenv.lib.optional sslSupport openssl;
-  configureFlags = "
+    
+  configureFlags = ''
     ${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"}
-  ";
+  '';
+  
   CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else "";
   CXX = "g++";
   CXXCPP = "g++ -E";
@@ -37,4 +41,9 @@ stdenv.mkDerivation {
        considered non-transient so it won't retry. */
     ./connect-timeout.patch
   ];
+
+  meta = {
+    description = "A command line tool for transferring files with URL syntax";
+    homepage = http://curl.haxx.se/;
+  };
 }