Updating from trunk

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

pkgs/tools/compression/bsdiff/default.nix

@@ -1,11 +1,14 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, bzip2}:
 
 stdenv.mkDerivation {
-  name = "bsdiff-4.2";
+  name = "bsdiff-4.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.daemonology.net/bsdiff/bsdiff-4.2.tar.gz;
-    md5 = "9f582a77eb76d116d82d1ad268ef48fa";
+    url = http://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz;
+    sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq";
   };
-  patches = [./makefile.patch];
+  buildInputs = [ bzip2 ];
+  patchPhase = ''
+    sed 's/^\.//g' -i Makefile
+  '';
 }

pkgs/tools/compression/bsdiff/makefile.patch

@@ -1,22 +0,0 @@
-diff -rc bsdiff-orig/Makefile bsdiff-4.2/Makefile
-*** bsdiff-orig/Makefile	2004-07-11 20:10:02.000000000 +0200
---- bsdiff-4.2/Makefile	2004-11-29 22:15:05.000000000 +0100
-***************
-*** 1,7 ****
-  CFLAGS		+=	-O3
-- .ifdef BZIP2
-- CFLAGS		+=	-DBZIP2=\"${BZIP2}\"
-- .endif
-  
-  PREFIX		?=	/usr/local
-  INSTALL_PROGRAM	?=	${INSTALL} -c -s -m 555
---- 1,4 ----
-***************
-*** 13,18 ****
-  
-  install:
-  	${INSTALL_PROGRAM} bsdiff bspatch ${PREFIX}/bin
-- .ifndef WITHOUT_MAN
-  	${INSTALL_MAN} bsdiff.1 bspatch.1 ${PREFIX}/man/man1
-- .endif
---- 10,13 ----

pkgs/tools/compression/zsync/default.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "zsync-0.6.1";
+
+  src = fetchurl {
+    url = "http://zsync.moria.org.uk/download/${name}.tar.bz2";
+    sha256 = "13rbq2m2d4c4qqzadr1cfzrryqxvjgafr8cmask9w2acc0zpv7v1";
+  };
+
+  meta = {
+    homepage = http://zsync.moria.org.uk/;
+    description = "File distribution system using the rsync algorithm";
+    license = "free";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}