Merge trunk right before reintegrating

svn path=/nixpkgs/branches/libpng15/; revision=32758

pkgs/tools/archivers/gnutar/default.nix

@@ -1,6 +1,8 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, withMan ? false, help2man ? null}:
 
-stdenv.mkDerivation rec {
+assert withMan -> help2man != null;
+
+stdenv.mkDerivation (rec {
   name = "gnutar-1.25";
 
   src = fetchurl {
@@ -32,4 +34,10 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.ludo ];
     platforms = stdenv.lib.platforms.all;
   };
-}
+} // (if withMan then {
+  buildInputs = [ help2man ];
+  postInstall = ''
+    ensureDir $out/share/man/man1
+    help2man $out/bin/tar > $out/share/man/man1/tar.1
+  '';
+} else {}))

pkgs/tools/compression/lzop/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lzo}:
 
 stdenv.mkDerivation {
-  name = "lzop-1.02rc1";
+  name = "lzop-1.03";
   src = fetchurl {
-    url = http://www.lzop.org/download/lzop-1.02rc1.tar.gz;
-    sha256 = "1dc32bfd82b130727bcec1de3b8a7cf090b78b3f14981d375ceb862b1e0e6873";
+    url = http://www.lzop.org/download/lzop-1.03.tar.gz;
+    sha256 = "1jdjvc4yjndf7ihmlcsyln2rbnbaxa86q4jskmkmm7ylfy65nhn1";
   };
 
   buildInputs = [ lzo ];

pkgs/tools/package-management/nix/unstable.nix

@@ -4,12 +4,12 @@
 , stateDir ? "/nix/var"
 }:
 
-stdenv.mkDerivation (rec {
-  name = "nix-1.0pre31851";
+stdenv.mkDerivation rec {
+  name = "nix-1.0pre2606_8afd28a";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/1937677/download/4/${name}.tar.bz2";
-    sha256 = "36f07b6b701da74f07d8c8cc43044306e570b6837555ad523701d86e5f567568";
+    url = "http://hydra.nixos.org/build/2183656/download/4/${name}.tar.bz2";
+    sha256 = "4f21d01563ab9e949e09997ddaa89066c40a13b27e028a6fdffc67b97dd90dcb";
   };
 
   buildNativeInputs = [ perl pkgconfig ];
@@ -46,11 +46,13 @@ stdenv.mkDerivation (rec {
 
   doCheck = true;
 
+  # Hack to get the check to succeed on Darwin.
+  phases = stdenv.lib.optionalString stdenv.isDarwin
+    "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases";
+
   meta = {
     description = "The Nix Deployment System";
     homepage = http://nixos.org/;
     license = "LGPLv2+";
   };
-} // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      phases = "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases";
-})
+}