diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index d2511e27863..030a35212ec 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages, makeWrapper, unzip +{ lib, stdenv, fetchurl, python2Packages, makeWrapper , guiSupport ? false, tk ? null , ApplicationServices , mercurialSrc ? fetchurl rec { @@ -21,7 +21,7 @@ in python2Packages.buildPythonApplication { inherit python; # pass it so that the same version can be used in hg2git - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ docutils ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; diff --git a/pkgs/development/libraries/gdal/2.4.nix b/pkgs/development/libraries/gdal/2.4.nix index 70ae3b2b12a..234d986b21f 100644 --- a/pkgs/development/libraries/gdal/2.4.nix +++ b/pkgs/development/libraries/gdal/2.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib +{ lib, stdenv, fetchurl, libjpeg, libtiff, zlib , postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2 @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3"; }; - nativeBuildInputs = [ unzip ]; buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] ++ (with python2Packages; [ python numpy wrapPython ]) diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index f35d7528f4e..65eacd7fffe 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -1,10 +1,10 @@ -{ lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtmultimedia, qtbase }: mkDerivation rec { version = "unstable-20-06-26"; pname = "herqq"; - nativeBuildInputs = [ qmake unzip ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtmultimedia ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 63310845971..260be948ce1 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }: +{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }: let common = import ./common.nix { inherit fetchzip; }; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - nativeBuildInputs = [ unzip ]; buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ]; meta = { diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index 1235941b2dc..a7901466081 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: +{ lib, stdenv, fetchzip, libGLU, libGL, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: let common = import ./common.nix { inherit fetchzip; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "-DIRRLICHT_BUILD_TOOLS=OFF" ]; - nativeBuildInputs = [ cmake unzip ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ OpenGL Cocoa IOKit ]; meta = { diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 8e63cb68120..740c1fec883 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid, +{ lib, stdenv, fetchFromGitHub, libX11, cmake, ois, freetype, libuuid, boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } : let @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w"; }; - nativeBuildInputs = [ cmake pkg-config unzip ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libX11 ois freetype libuuid boost ] ++ (if withOgre then [ ogre ] else [ libGL libGLU ]); diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index 1e3ee989644..47b2f639547 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }: +{ lib, stdenv, fetchFromGitHub, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }: stdenv.mkDerivation { pname = "openexrid-unstable"; @@ -25,7 +25,6 @@ stdenv.mkDerivation { -I${openfx.dev}/include/OpenFX ''; - nativeBuildInputs = [ unzip ]; buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix index a26e97798ae..201bf16ad64 100644 --- a/pkgs/development/libraries/openfx/default.nix +++ b/pkgs/development/libraries/openfx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "openfx"; @@ -11,8 +11,6 @@ stdenv.mkDerivation { sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548"; }; - nativeBuildInputs = [ unzip ]; - outputs = [ "dev" "out" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index b5317ce9aae..655d664d8fa 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: +{ lib, stdenv, fetchFromGitHub, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: stdenv.mkDerivation rec { @@ -14,7 +14,6 @@ stdenv.mkDerivation rec outputs = [ "out" ]; - nativeBuildInputs = [ unzip ]; buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ]; setSourceRoot = '' diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix index 904437bdcf6..1a7974ecd26 100644 --- a/pkgs/development/python-modules/python-simple-hipchat/default.nix +++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix @@ -1,5 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi -, unzip }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "python-simple-hipchat"; @@ -10,8 +9,6 @@ buildPythonPackage rec { sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav"; }; - nativeBuildInputs = [ unzip ]; - meta = with lib; { description = "Easy peasy wrapper for HipChat's v1 API"; homepage = "https://github.com/kurttheviking/simple-hipchat-py"; diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index 217cbe5e029..dbcb8d52f1b 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -1,4 +1,4 @@ -{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, unzip, zip }: +{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, zip }: stdenv.mkDerivation rec { name = "jscoverage-0.5.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { ./jsfalse_to_null.patch ]; - nativeBuildInputs = [ unzip perl python3 zip ]; + nativeBuildInputs = [ perl python3 zip ]; strictDeps = true; diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 7302cfb25bc..6e4a38ed171 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim, time }: +{ lib, stdenv, fetchurl, foomatic-filters, bc, ghostscript, systemd, vim, time }: stdenv.mkDerivation rec { pname = "foo2zjs"; @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { sha256 = "14x3wizvncdy0xgvmcx541qanwb7bg76abygqy17bxycn1zh5r1x"; }; - nativeBuildInputs = [ unzip ]; buildInputs = [ foomatic-filters bc ghostscript systemd vim ]; patches = [ ./no-hardcode-fw.diff ]; diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 53f1009cfad..37e0d83f140 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook -, unzip, zlib, SDL, readline, libGLU, libGL, libX11 }: +, zlib, SDL, readline, libGLU, libGL, libX11 }: with lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy"; }; - nativeBuildInputs = [ autoreconfHook unzip ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib SDL readline libGLU libGL libX11 ]; diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index fda57cb9a54..162d018e729 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, jdk }: +{ lib, stdenv, fetchurl, jdk }: stdenv.mkDerivation { name = "jboss-as-7.1.1.Final"; @@ -7,8 +7,6 @@ stdenv.mkDerivation { sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; - nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; installPhase = '' diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index a7663bbd231..08d98716f1f 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl, unzip }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { pname = "zpaq"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4"; }; - nativeBuildInputs = [ perl /* for pod2man */ unzip ]; + nativeBuildInputs = [ perl /* for pod2man */ ]; preBuild = let CPPFLAGS = with stdenv; "" diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index b2e753342d9..858c114f68c 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, unzip, xz, dpkg +{lib, stdenv, fetchurl, xz, dpkg , libxslt, docbook_xsl, makeWrapper , python3Packages , perlPackages, curl, gnupg, diffutils @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1"; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++ (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]); diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix index 6cc13e6f87e..7aebfeab2ce 100644 --- a/pkgs/tools/misc/vorbisgain/default.nix +++ b/pkgs/tools/misc/vorbisgain/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, libogg, libvorbis }: +{ lib, stdenv, fetchurl, libogg, libvorbis }: stdenv.mkDerivation rec { name = "vorbisgain-0.37"; @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ unzip ]; buildInputs = [ libogg libvorbis ]; patchPhase = '' diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 660ba01bcd4..f1eaff5ec87 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -9,7 +9,6 @@ , pkg-config , mono , fsharp -, unzip , overrides ? {} }: @@ -897,8 +896,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz"; }; - nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; outputFiles = [ "*" ];