Merging from trunk.

I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


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

3 files changed, 62 insertions, 23 deletions

diff --git a/pkgs/tools/archivers/cpio/darwin-fix.patch b/pkgs/tools/archivers/cpio/darwin-fix.patch
new file mode 100644
index 00000000000..0e8ff168c52
--- /dev/null
+++ b/pkgs/tools/archivers/cpio/darwin-fix.patch
@@ -0,0 +1,15 @@
+Fix Darwin builds.
+
+From <http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=3a7a1820d4cecbd77c7b74c785af5942510bf080>.
+See also <http://lists.gnu.org/archive/html/bug-cpio/2010-07/msg00001.html>.
+
+diff --git a/src/filetypes.h b/src/filetypes.h
+index f80faab..81f0c32 100644
+--- a/src/filetypes.h
++++ b/src/filetypes.h
+@@ -81,5 +81,3 @@
+ #ifndef S_ISLNK
+ #define lstat stat
+ #endif
+-int lstat ();
+-int stat ();
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index 1700f03d7bd..8e14ff17866 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -1,24 +1,45 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "cpio-2.9";
-  
+stdenv.mkDerivation ({
+  name = "cpio-2.11";
+
   src = fetchurl {
-    url = mirror://gnu/cpio/cpio-2.9.tar.bz2;
-    sha256 = "01s7f9hg8kgpis96j99hgkiqgdy53pm7qi7bhm3fzx58jfk5z6mv";
+    url = mirror://gnu/cpio/cpio-2.11.tar.bz2;
+    sha256 = "1gavgpzqwgkpagjxw72xgxz52y1ifgz0ckqh8g7cckz7jvyhp0mv";
   };
 
-  patches = [
-    # Make it compile on GCC 4.3.
-    (fetchurl {
-      name = "cpio-2.9-gnu-inline.patch";
-      url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-arch/cpio/files/cpio-2.9-gnu-inline.patch?rev=1.1";
-      sha256 = "1167hrq64h9lh3qhgasm2rivfzkkgx6fik92b017qfa0q61ff8c3";
-    })
-  ];
+  # Tests fail on Darwin, see
+  # <http://lists.gnu.org/archive/html/bug-cpio/2010-07/msg00012.html> for
+  # details.
+  doCheck = !stdenv.isDarwin;
 
   meta = {
     homepage = http://www.gnu.org/software/cpio/;
-    description = "A program to create or extract from cpio archives";
+    description = "GNU cpio, a program to create or extract from cpio archives";
+
+    longDescription =
+      '' GNU cpio copies files into or out of a cpio or tar archive.  The
+         archive can be another file on the disk, a magnetic tape, or a pipe.
+
+         GNU cpio supports the following archive formats: binary, old ASCII,
+         new ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1
+         tar.  The tar format is provided for compatability with the tar
+         program.  By default, cpio creates binary format archives, for
+         compatibility with older cpio programs.  When extracting from
+         archives, cpio automatically recognizes which kind of archive it is
+         reading and can read archives created on machines with a different
+         byte-order.
+      '';
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
+
+//
+
+(if stdenv.isLinux
+ then {}
+ else { patches = [ ./darwin-fix.patch ]; }))
diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix
index e096313a4c1..49c56d075d3 100644
--- a/pkgs/tools/archivers/dar/default.nix
+++ b/pkgs/tools/archivers/dar/default.nix
@@ -1,18 +1,21 @@
-{stdenv, fetchurl, zlib, bzip2, openssl}:
+{ stdenv, fetchurl, zlib, bzip2, openssl, attr }:
 
 stdenv.mkDerivation rec {
-  name = "dar-2.3.9";
+  name = "dar-2.3.10";
+  
   src = fetchurl {
-    url = "mirror://sourceforge/dar/dar-2.3.9.tar.gz";
-    sha256 = "037ak6wckqyn52000m8bapgnf70rw776dl3s61i9bdq548slq6yc";
+    url = "mirror://sourceforge/dar/${name}.tar.gz";
+    sha256 = "04qzdcz97bzz414khfj82hn8s1i1ry7qxaikq8lj1069gvhc6qjn";
   };
 
-  buildInputs = [zlib bzip2 openssl];
+  buildInputs = [ zlib bzip2 openssl attr ];
+
+  configureFlags = "--disable-dar-static";
 
   meta = {
-	  homepage = http://dar.linux.free.fr/;
-	  description = "Disk ARchiver, allows backing up files into indexed archives";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    homepage = http://dar.linux.free.fr/;
+    description = "Disk ARchiver, allows backing up files into indexed archives";
+    maintainers = [ stdenv.lib.maintainers.viric ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }