Updating from trunk

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

11 files changed, 181 insertions, 80 deletions

diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index 8e14ff17866..1700f03d7bd 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -1,45 +1,24 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation ({
-  name = "cpio-2.11";
-
+stdenv.mkDerivation {
+  name = "cpio-2.9";
+  
   src = fetchurl {
-    url = mirror://gnu/cpio/cpio-2.11.tar.bz2;
-    sha256 = "1gavgpzqwgkpagjxw72xgxz52y1ifgz0ckqh8g7cckz7jvyhp0mv";
+    url = mirror://gnu/cpio/cpio-2.9.tar.bz2;
+    sha256 = "01s7f9hg8kgpis96j99hgkiqgdy53pm7qi7bhm3fzx58jfk5z6mv";
   };
 
-  # Tests fail on Darwin, see
-  # <http://lists.gnu.org/archive/html/bug-cpio/2010-07/msg00012.html> for
-  # details.
-  doCheck = !stdenv.isDarwin;
+  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";
+    })
+  ];
 
   meta = {
     homepage = http://www.gnu.org/software/cpio/;
-    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;
+    description = "A program to create or extract from cpio archives";
   };
 }
-
-//
-
-(if stdenv.isLinux
- then {}
- else { patches = [ ./darwin-fix.patch ]; }))
diff --git a/pkgs/tools/archivers/cpio/latest.nix b/pkgs/tools/archivers/cpio/latest.nix
new file mode 100644
index 00000000000..8e14ff17866
--- /dev/null
+++ b/pkgs/tools/archivers/cpio/latest.nix
@@ -0,0 +1,45 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation ({
+  name = "cpio-2.11";
+
+  src = fetchurl {
+    url = mirror://gnu/cpio/cpio-2.11.tar.bz2;
+    sha256 = "1gavgpzqwgkpagjxw72xgxz52y1ifgz0ckqh8g7cckz7jvyhp0mv";
+  };
+
+  # 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 = "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/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 2bd6313202e..bb9743e8e5d 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -1,16 +1,17 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "p7zip-9.04";
+stdenv.mkDerivation rec {
+  name = "p7zip-9.13";
   
   src = fetchurl {
-    url = mirror://sourceforge/p7zip/p7zip_9.04_src_all.tar.bz2;
-    sha256 = "1azr73vlj602hl6siagnqd1rn8sw73lny292jqgspg0lb9wvdyyx";
+    url = mirror://sourceforge/p7zip/p7zip_9.13_src_all.tar.bz2;
+    sha256 = "08yr0cfbjx60r1ia7vhphzvc3gax62xhgsn3vdm7sdmxxai0z77w";
   };
-  
+
   preConfigure =
     ''
       makeFlagsArray=(DEST_HOME=$out)
+      buildFlags=all3
     '';
 
   meta = {
diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
new file mode 100644
index 00000000000..9b4e7fd914c
--- /dev/null
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }:
+
+let version = "485"; in
+
+stdenv.mkDerivation rec {
+  name = "unetbootin-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
+    sha256 = "1nyzy1wrql0l6zkmrd1l3qqvbdkv0534axdz6vy3cyksp157jxc8";
+  };
+
+  sourceRoot = ".";
+
+  buildInputs = [ makeWrapper qt4 ];
+
+  # Lots of nice hard-coded paths...
+  postUnpack =
+    ''
+      substituteInPlace unetbootin.cpp \
+          --replace /sbin/fdisk ${utillinux}/sbin/fdisk \
+          --replace /sbin/sfdisk ${utillinux}/sbin/sfdisk \
+          --replace /sbin/blkid ${utillinux}/sbin/blkid \
+          --replace /bin/df ${coreutils}/bin/df \
+          --replace /usr/bin/syslinux ${syslinux}/bin/syslinux \
+          --replace /usr/bin/extlinux ${syslinux}/sbin/extlinux \
+          --replace /usr/share/syslinux ${syslinux}/share/syslinux
+      substituteInPlace main.cpp \
+          --replace /usr/share/unetbootin $out/share/unetbootin
+      substituteInPlace unetbootin.desktop \
+          --replace /usr/bin $out/bin
+    '';
+
+  buildPhase =
+    ''
+      lupdate unetbootin.pro
+      lrelease unetbootin.pro
+      qmake
+      make
+    '';
+
+  installPhase =
+    ''
+      ensureDir $out/bin
+      cp unetbootin $out/bin
+      
+      ensureDir $out/share/unetbootin
+      cp unetbootin_*.qm  $out/share/unetbootin
+
+      ensureDir $out/share/applications
+      cp unetbootin.desktop $out/share/applications
+      
+      wrapProgram $out/bin/unetbootin \
+          --prefix PATH : ${which}/bin:${p7zip}/bin:${mtools}/bin
+    '';
+
+  meta = {
+    homepage = http://unetbootin.sourceforge.net/;
+    description = "A tool to create bootable live USB drives from ISO images";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 7ef741753ba..f5e51430af3 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,24 +1,18 @@
-{builderDefs}: with builderDefs;
-       let localDefs = builderDefs.passthru.function (rec {
-         src = /* put a fetchurl here */
-           fetchurl {
-            url = http://www.daniel-baumann.ch/software/dosfstools/dosfstools-3.0.1.tar.bz2;
-            sha256 = "7fab0de42391277028071d01ff4da83ff9a399408ccf29958cdee62ffe746d45";
-           };
+{ stdenv, fetchurl }:
 
-        buildInputs = [];
-        configureFlags = [];
-        makeFlags = " PREFIX=$out ";
-    });
-    in with localDefs;
 stdenv.mkDerivation rec {
-    name = "dosfstools-3.01";
-    builder = writeScript (name + "-builder")
-        (textClosure localDefs 
-            ["doMakeInstall" doForceShare doPropagate]);
-    meta = {
-        description = "Dosfstools - utilities for vfat file system.";
-	homepage = "http://www.daniel-baumann.ch/software/dosfstools/";
-        inherit src;
-    };
+  name = "dosfstools-3.0.9";
+
+  src = fetchurl {
+    url = "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2";
+    sha256 = "13s5s0hvhmn7r4ppqmw8nqgdm5v5vc6r5j44kn87wl5cmrpnfqrz";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  meta = {
+    description = "Utilities for creating and checking FAT and VFAT file systems";
+    homepage = http://www.daniel-baumann.ch/software/dosfstools/;
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
new file mode 100644
index 00000000000..5bb5bbc6d9a
--- /dev/null
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "mtools-4.0.13";
+
+  src = fetchurl {
+    url = "mirror://gnu/mtools/${name}.tar.bz2";
+    sha256 = "1nj7lc2q1g66l3ma8z1c95nglf9himnr6k85b5rry99f9za7npbg";
+  };
+
+  buildInputs = [ texinfo ];
+
+  meta = {
+    homepage = http://www.gnu.org/software/mtools/;
+    description = "Utilities to access MS-DOS disks without mounting them";
+  };
+}
diff --git a/pkgs/tools/graphics/asymptote/src-for-default.nix b/pkgs/tools/graphics/asymptote/src-for-default.nix
index 2a274de0c10..e960b74655b 100644
--- a/pkgs/tools/graphics/asymptote/src-for-default.nix
+++ b/pkgs/tools/graphics/asymptote/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.96";
-   name="asymptote-1.96";
-   hash="0rs2h77j3nq36w0vr131yvlp8lqsanidhf9fvd4bggz5j5r8r850";
+   version="2.03";
+   name="asymptote-2.03";
+   hash="1npj9igf4b9dy1frriqc20ihm1s0f3yw2pgs0xc4rv514rp0wkpx";
    url="http://downloads.sourceforge.net/project/asymptote/asymptote/${version}/asymptote-${version}.src.tgz";
-   advertisedUrl="http://downloads.sourceforge.net/project/asymptote/asymptote/1.96/asymptote-1.96.src.tgz";
+   advertisedUrl="http://downloads.sourceforge.net/project/asymptote/asymptote/2.03/asymptote-2.03.src.tgz";
   
   
 }
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 7d545e8c7fb..33f11cdede5 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,34 +1,37 @@
 { stdenv, fetchurl
-, zlibSupport ? false, zlib ? null
-, sslSupport ? false, openssl ? null
+, zlibSupport ? false, zlib
+, sslSupport ? false, openssl
+, scpSupport ? false, libssh2
 , linkStatic ? false
 }:
 
 assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;
+assert scpSupport -> libssh2 != null;
 
 stdenv.mkDerivation rec {
   name = "curl-7.21.0";
-  
+
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
     sha256 = "1fl7sh38i746b57aqjqjaykwq4rhm2p1phzrgnc2h6wm2k2b95gy";
   };
-  
+
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
   # "-lz -lssl", which aren't necessary direct build inputs of
   # applications that use Curl.
   propagatedBuildInputs =
     stdenv.lib.optional zlibSupport zlib ++
     stdenv.lib.optional sslSupport openssl;
-    
+
   configureFlags = ''
     ${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"}
+    ${if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2"}
     ${if linkStatic then "--enable-static --disable-shared" else ""}
   '';
 
   dontDisableStatic = if linkStatic then true else false;
-  
+
   CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else "";
   LDFLAGS = if linkStatic then "-static" else "";
   CXX = "g++";
diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 49a2de6e08f..67997c700e9 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nettools, iputils, iproute, makeWrapper }:
+{ stdenv, fetchurl, nettools, iputils, iproute, makeWrapper, coreutils, gnused }:
 
 stdenv.mkDerivation rec {
   name = "dhcp-4.1.1-P1";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       substituteInPlace $out/sbin/dhclient-script \
         --replace /sbin/ip ${iproute}/sbin/ip
       wrapProgram "$out/sbin/dhclient-script" --prefix PATH : \
-        "${nettools}/bin:${nettools}/sbin:${iputils}/bin:${stdenv.coreutils}/bin:${stdenv.gnused}/bin"
+        "${nettools}/bin:${nettools}/sbin:${iputils}/bin:${coreutils}/bin:${gnused}/bin"
     '';
 
   preConfigure =
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 551d2109f28..2a634f9a2dc 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, glib}:
 
 stdenv.mkDerivation rec {
-  name = "nbd-2.9.15";
+  name = "nbd-2.9.17";
 
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-    sha256 = "26e2ef18cc2f214d666eef1cfb31df1ba8ee6eaa78390afd6d18f2cce9c0c704";
+    sha256 = "07423fba4b1a6d394008505b86fe41d1978956035f49c1197de648fbaa7fb7ff";
   };
 
   buildInputs = [pkgconfig glib];
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "map arbitrary files as block devices over the network";
     license = "GPLv2";
     maintainers = [ stdenv.lib.maintainers.simons  ];
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix
index 8fe65ad3936..b6b87633249 100644
--- a/pkgs/tools/package-management/nix/sqlite.nix
+++ b/pkgs/tools/package-management/nix/sqlite.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-0.16pre22378";
+  name = "nix-0.16pre22953";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/467032/download/4/${name}.tar.bz2";
-    sha256 = "1bd3645da0bc03b70e4b0d687c6c0868bb1522b01b6acf4af858556f8f21ee57";
+    url = "http://hydra.nixos.org/build/527157/download/4/${name}.tar.bz2";
+    sha256 = "7fe185f49bda5281274b203467d206a6a76a762f742a93adeca71ba63470f71e";
   };
 
   buildInputs = [ perl curl openssl ];