From e861fb2bcde5413c90c52d2db3b9fcea468bef0e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 04:53:21 +0000
Subject: [PATCH] Remove unzip 5.52, make unzip 6.0 default

As per TODO in all-packages.nix comments

svn path=/nixpkgs/branches/stdenv-updates/; revision=28101
---
 pkgs/tools/archivers/unzip/5.52.nix            | 18 ------------------
 .../archivers/unzip/{6.0.nix => default.nix}   |  0
 pkgs/top-level/all-packages.nix                |  7 +------
 3 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 pkgs/tools/archivers/unzip/5.52.nix
 rename pkgs/tools/archivers/unzip/{6.0.nix => default.nix} (100%)

diff --git a/pkgs/tools/archivers/unzip/5.52.nix b/pkgs/tools/archivers/unzip/5.52.nix
deleted file mode 100644
index c72def3731a3..000000000000
--- a/pkgs/tools/archivers/unzip/5.52.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "unzip-5.52";
-  
-  src = fetchurl {
-    url = http://nixos.org/tarballs/unzip552.tar.gz;
-    md5 = "9d23919999d6eac9217d1f41472034a9";
-  };
-
-  buildPhase = "make -f unix/Makefile generic";
-
-  installPhase = "make -f unix/Makefile prefix=$out install";
-
-  meta = {
-    homepage = http://www.info-zip.org;
-  };
-}
diff --git a/pkgs/tools/archivers/unzip/6.0.nix b/pkgs/tools/archivers/unzip/default.nix
similarity index 100%
rename from pkgs/tools/archivers/unzip/6.0.nix
rename to pkgs/tools/archivers/unzip/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd88d0e38130..917926aa3658 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1346,12 +1346,7 @@ let
 
   unshield = callPackage ../tools/archivers/unshield { };
 
-  unzip = unzip552;
-
-  # TODO: remove in the next stdenv update.
-  unzip552 = callPackage ../tools/archivers/unzip/5.52.nix { };
-
-  unzip60 = callPackage ../tools/archivers/unzip/6.0.nix { };
+  unzip = callPackage ../tools/archivers/unzip { };
 
   uptimed = callPackage ../tools/system/uptimed { };