treewide: remove unzip where not needed
This commit is contained in:
parent
75c67d6be9
commit
c5a669d3f7
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, python2Packages, makeWrapper, unzip
|
{ lib, stdenv, fetchurl, python2Packages, makeWrapper
|
||||||
, guiSupport ? false, tk ? null
|
, guiSupport ? false, tk ? null
|
||||||
, ApplicationServices
|
, ApplicationServices
|
||||||
, mercurialSrc ? fetchurl rec {
|
, mercurialSrc ? fetchurl rec {
|
||||||
|
@ -21,7 +21,7 @@ in python2Packages.buildPythonApplication {
|
||||||
|
|
||||||
inherit python; # pass it so that the same version can be used in hg2git
|
inherit python; # pass it so that the same version can be used in hg2git
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper unzip ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
buildInputs = [ docutils ]
|
buildInputs = [ docutils ]
|
||||||
++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
|
++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
|
{ lib, stdenv, fetchurl, libjpeg, libtiff, zlib
|
||||||
, postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl
|
, postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl
|
||||||
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
|
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
|
||||||
, libiconv, libxml2
|
, libiconv, libxml2
|
||||||
|
@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3";
|
sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
|
||||||
buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
|
buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
|
||||||
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
|
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
|
||||||
++ (with python2Packages; [ python numpy wrapPython ])
|
++ (with python2Packages; [ python numpy wrapPython ])
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
{ lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
|
{ lib, mkDerivation, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
version = "unstable-20-06-26";
|
version = "unstable-20-06-26";
|
||||||
pname = "herqq";
|
pname = "herqq";
|
||||||
|
|
||||||
nativeBuildInputs = [ qmake unzip ];
|
nativeBuildInputs = [ qmake ];
|
||||||
buildInputs = [ qtbase qtmultimedia ];
|
buildInputs = [ qtbase qtmultimedia ];
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }:
|
{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }:
|
||||||
|
|
||||||
let
|
let
|
||||||
common = import ./common.nix { inherit fetchzip; };
|
common = import ./common.nix { inherit fetchzip; };
|
||||||
|
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
|
||||||
mkdir -p $out/lib
|
mkdir -p $out/lib
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
|
||||||
buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ];
|
buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -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
|
let
|
||||||
common = import ./common.nix { inherit fetchzip; };
|
common = import ./common.nix { inherit fetchzip; };
|
||||||
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||||
"-DIRRLICHT_BUILD_TOOLS=OFF"
|
"-DIRRLICHT_BUILD_TOOLS=OFF"
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake unzip ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ OpenGL Cocoa IOKit ];
|
buildInputs = [ OpenGL Cocoa IOKit ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -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 } :
|
boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } :
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
|
||||||
sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w";
|
sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config unzip ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
buildInputs = [ libX11 ois freetype libuuid boost ]
|
buildInputs = [ libX11 ois freetype libuuid boost ]
|
||||||
++ (if withOgre then [ ogre ] else [ libGL libGLU ]);
|
++ (if withOgre then [ ogre ] else [ libGL libGLU ]);
|
||||||
|
|
||||||
|
|
|
@ -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 {
|
stdenv.mkDerivation {
|
||||||
pname = "openexrid-unstable";
|
pname = "openexrid-unstable";
|
||||||
|
@ -25,7 +25,6 @@ stdenv.mkDerivation {
|
||||||
-I${openfx.dev}/include/OpenFX
|
-I${openfx.dev}/include/OpenFX
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
|
||||||
buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ];
|
buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, unzip }:
|
{ lib, stdenv, fetchFromGitHub }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "openfx";
|
pname = "openfx";
|
||||||
|
@ -11,8 +11,6 @@ stdenv.mkDerivation {
|
||||||
sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548";
|
sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
|
||||||
|
|
||||||
outputs = [ "dev" "out" ];
|
outputs = [ "dev" "out" ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
|
@ -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
|
stdenv.mkDerivation rec
|
||||||
{
|
{
|
||||||
|
@ -14,7 +14,6 @@ stdenv.mkDerivation rec
|
||||||
|
|
||||||
outputs = [ "out" ];
|
outputs = [ "out" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
|
||||||
buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ];
|
buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ];
|
||||||
|
|
||||||
setSourceRoot = ''
|
setSourceRoot = ''
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{ lib, buildPythonPackage, fetchPypi
|
{ lib, buildPythonPackage, fetchPypi }:
|
||||||
, unzip }:
|
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "python-simple-hipchat";
|
pname = "python-simple-hipchat";
|
||||||
|
@ -10,8 +9,6 @@ buildPythonPackage rec {
|
||||||
sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav";
|
sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Easy peasy wrapper for HipChat's v1 API";
|
description = "Easy peasy wrapper for HipChat's v1 API";
|
||||||
homepage = "https://github.com/kurttheviking/simple-hipchat-py";
|
homepage = "https://github.com/kurttheviking/simple-hipchat-py";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, unzip, zip }:
|
{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, zip }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "jscoverage-0.5.1";
|
name = "jscoverage-0.5.1";
|
||||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||||
./jsfalse_to_null.patch
|
./jsfalse_to_null.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip perl python3 zip ];
|
nativeBuildInputs = [ perl python3 zip ];
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
|
|
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "foo2zjs";
|
pname = "foo2zjs";
|
||||||
|
@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "14x3wizvncdy0xgvmcx541qanwb7bg76abygqy17bxycn1zh5r1x";
|
sha256 = "14x3wizvncdy0xgvmcx541qanwb7bg76abygqy17bxycn1zh5r1x";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
|
||||||
buildInputs = [ foomatic-filters bc ghostscript systemd vim ];
|
buildInputs = [ foomatic-filters bc ghostscript systemd vim ];
|
||||||
|
|
||||||
patches = [ ./no-hardcode-fw.diff ];
|
patches = [ ./no-hardcode-fw.diff ];
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook
|
{ lib, stdenv, fetchFromGitHub, autoreconfHook
|
||||||
, unzip, zlib, SDL, readline, libGLU, libGL, libX11 }:
|
, zlib, SDL, readline, libGLU, libGL, libX11 }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy";
|
sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook unzip ];
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
|
|
||||||
buildInputs = [ zlib SDL readline libGLU libGL libX11 ];
|
buildInputs = [ zlib SDL readline libGLU libGL libX11 ];
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, unzip, jdk }:
|
{ lib, stdenv, fetchurl, jdk }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "jboss-as-7.1.1.Final";
|
name = "jboss-as-7.1.1.Final";
|
||||||
|
@ -7,8 +7,6 @@ stdenv.mkDerivation {
|
||||||
sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8";
|
sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
|
||||||
|
|
||||||
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
|
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, perl, unzip }:
|
{ lib, stdenv, fetchFromGitHub, perl }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "zpaq";
|
pname = "zpaq";
|
||||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4";
|
sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ perl /* for pod2man */ unzip ];
|
nativeBuildInputs = [ perl /* for pod2man */ ];
|
||||||
|
|
||||||
preBuild = let
|
preBuild = let
|
||||||
CPPFLAGS = with stdenv; ""
|
CPPFLAGS = with stdenv; ""
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{lib, stdenv, fetchurl, unzip, xz, dpkg
|
{lib, stdenv, fetchurl, xz, dpkg
|
||||||
, libxslt, docbook_xsl, makeWrapper
|
, libxslt, docbook_xsl, makeWrapper
|
||||||
, python3Packages
|
, python3Packages
|
||||||
, perlPackages, curl, gnupg, diffutils
|
, perlPackages, curl, gnupg, diffutils
|
||||||
|
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
|
||||||
sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1";
|
sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper unzip ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++
|
buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++
|
||||||
(with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]);
|
(with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]);
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, unzip, libogg, libvorbis }:
|
{ lib, stdenv, fetchurl, libogg, libvorbis }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "vorbisgain-0.37";
|
name = "vorbisgain-0.37";
|
||||||
|
@ -10,7 +10,6 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
|
||||||
buildInputs = [ libogg libvorbis ];
|
buildInputs = [ libogg libvorbis ];
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, mono
|
, mono
|
||||||
, fsharp
|
, fsharp
|
||||||
, unzip
|
|
||||||
, overrides ? {}
|
, overrides ? {}
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -897,8 +896,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
|
||||||
sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
|
sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
|
||||||
|
|
||||||
phases = [ "unpackPhase" "installPhase" ];
|
phases = [ "unpackPhase" "installPhase" ];
|
||||||
|
|
||||||
outputFiles = [ "*" ];
|
outputFiles = [ "*" ];
|
||||||
|
|
Loading…
Reference in New Issue