From 1af17b9d7ff154bb65f15905c9e4c8a7a427aa00 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Apr 2005 08:26:36 +0000 Subject: [PATCH] * Rename new unzip. svn path=/nixpkgs/trunk/; revision=2515 --- pkgs/system/all-packages-generic.nix | 9 +-------- pkgs/system/populate-cache.nix | 2 +- pkgs/tools/archivers/{unzip-5.52 => unzip}/builder.sh | 0 pkgs/tools/archivers/{unzip-5.52 => unzip}/default.nix | 0 4 files changed, 2 insertions(+), 9 deletions(-) rename pkgs/tools/archivers/{unzip-5.52 => unzip}/builder.sh (100%) rename pkgs/tools/archivers/{unzip-5.52 => unzip}/default.nix (100%) diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index af444eb87a45..6ea3663e8282 100644 --- 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; }; diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index 070d3eb82a20..41216d1719df 100644 --- 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 diff --git a/pkgs/tools/archivers/unzip-5.52/builder.sh b/pkgs/tools/archivers/unzip/builder.sh similarity index 100% rename from pkgs/tools/archivers/unzip-5.52/builder.sh rename to pkgs/tools/archivers/unzip/builder.sh diff --git a/pkgs/tools/archivers/unzip-5.52/default.nix b/pkgs/tools/archivers/unzip/default.nix similarity index 100% rename from pkgs/tools/archivers/unzip-5.52/default.nix rename to pkgs/tools/archivers/unzip/default.nix