From 672d3856df5d0e0e5bd5053e59cd5925b85e9f4a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Oct 2009 11:18:54 +0000
Subject: [PATCH] * Unzip 6.0.

svn path=/nixpkgs/trunk/; revision=17687
---
 .../archivers/unzip/{default.nix => 5.52.nix} |  0
 pkgs/tools/archivers/unzip/6.0.nix            | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  9 ++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)
 rename pkgs/tools/archivers/unzip/{default.nix => 5.52.nix} (100%)
 create mode 100644 pkgs/tools/archivers/unzip/6.0.nix

diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/5.52.nix
similarity index 100%
rename from pkgs/tools/archivers/unzip/default.nix
rename to pkgs/tools/archivers/unzip/5.52.nix
diff --git a/pkgs/tools/archivers/unzip/6.0.nix b/pkgs/tools/archivers/unzip/6.0.nix
new file mode 100644
index 000000000000..bfa38e2f9dec
--- /dev/null
+++ b/pkgs/tools/archivers/unzip/6.0.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, bzip2 }:
+
+stdenv.mkDerivation {
+  name = "unzip-6.0";
+  
+  src = fetchurl {
+    url = mirror://sourceforge/infozip/unzip60.tar.gz;
+    sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83";
+  };
+
+  buildInputs = [ bzip2 ];
+
+  makefile = "unix/Makefile";
+
+  NIX_LDFLAGS = "-lbz2";
+
+  buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2";
+
+  installFlags = "prefix=$(out)";
+
+  meta = {
+    homepage = http://www.info-zip.org;
+    description = "An extraction utility for archives compressed in .zip format";
+    license = "free"; # http://www.info-zip.org/license.html
+    meta.platforms = [ stdenv.lib.platforms.all ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0c16ae22033..9b093669b8dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1590,10 +1590,17 @@ let
     inherit fetchurl stdenv zlib;
   };
 
-  unzip = import ../tools/archivers/unzip {
+  unzip = unzip552;
+
+  # TODO: remove in the next stdenv update.
+  unzip552 = import ../tools/archivers/unzip/5.52.nix {
     inherit fetchurl stdenv;
   };
 
+  unzip60 = import ../tools/archivers/unzip/6.0.nix {
+    inherit fetchurl stdenv bzip2;
+  };
+
   uptimed = import ../tools/system/uptimed {
     inherit fetchurl stdenv automake autoconf libtool;
   };