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: 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 ------------------
 pkgs/tools/archivers/unzip/6.0.nix     | 27 ---------------------------
 pkgs/tools/archivers/unzip/default.nix | 27 +++++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/tools/archivers/unzip/5.52.nix
 delete mode 100644 pkgs/tools/archivers/unzip/6.0.nix
 create mode 100644 pkgs/tools/archivers/unzip/default.nix

(limited to 'pkgs/tools/archivers/unzip')

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/6.0.nix
deleted file mode 100644
index 803832f52d82..000000000000
--- a/pkgs/tools/archivers/unzip/6.0.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ 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/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
new file mode 100644
index 000000000000..803832f52d82
--- /dev/null
+++ b/pkgs/tools/archivers/unzip/default.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;
+  };
+}
-- 
cgit 1.4.1