* Rename new unzip.

svn path=/nixpkgs/trunk/; revision=2515
2005-04-11 08:26:36 +00:00 · 2005-04-11 08:26:36 +00:00 · 1af17b9d7f
commit 1af17b9d7f
parent d8a0bdebf2
4 changed files with 2 additions and 9 deletions
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@ -90,14 +90,7 @@ rec {
    inherit fetchurl stdenv;
  };

-  # !!! fix this
-  unzip = if stdenv.system == "i686-linux" then unzip550 else unzip552;
-
-  unzip550 = (import ../tools/archivers/unzip) {
-    inherit fetchurl stdenv;
-  };
-
-  unzip552 = (import ../tools/archivers/unzip-5.52) {
+  unzip = import ../tools/archivers/unzip {
    inherit fetchurl stdenv;
  };

--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@ -92,7 +92,7 @@ let {
  ;};

  powerpcDarwinPkgs = {inherit (import ./powerpc-darwin.nix)
-    unzip552
+    unzip
    aterm
    subversion
    bisonnew
--- a/pkgs/tools/archivers/unzip-5.52/builder.sh
+++ b/pkgs/tools/archivers/unzip-5.52/builder.sh
--- a/pkgs/tools/archivers/unzip-5.52/default.nix
+++ b/pkgs/tools/archivers/unzip-5.52/default.nix