diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-20 21:01:53 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-20 16:01:53 -0500 |
commit | 127733211e03cb0763246a2ebc0c99e2a438a6ce (patch) | |
tree | aa9601b7da78a16d08e713e4d5e01ffe39dfd8b2 /pkgs/servers | |
parent | ce5052e93174070b3648e02bd3c787668331e9b5 (diff) |
treewide: unzip buildInputs to nativeBuildInputs (#112302)
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/amqp/rabbitmq-server/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/computing/storm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/http/jboss/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/http/tomcat/axis2/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/jellyfin/10.5.x.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/jellyfin/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/nagios/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/monitoring/net-snmp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/nosql/riak/2.2.0.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/rainloop/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/search/elasticsearch/plugins.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/mysql/jdbc/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/web-apps/moodle/moodle-utils.nix | 5 |
13 files changed, 21 insertions, 15 deletions
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 6100498f9bf89..c2d13b00aa83b 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { sha256 = "0b252l9r45h8r5gibdqcn6hhbm8g6rfzhm1k9d39pwhs5x77cjqv"; }; + nativeBuildInputs = [ unzip ]; buildInputs = - [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync glibcLocales ] + [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip rsync glibcLocales ] ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index daebf174fafdc..07c636b6e5bad 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0xc6lfilfkkjyds59b6c770gj21v9srzpln31c9qb3ls6hzic8gn"; }; - buildInputs = [ zip unzip ]; + nativeBuildInputs = [ zip unzip ]; installPhase = '' mkdir -p $out/share/${name} diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index ba89d19db34b1..fda57cb9a549d 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index e383d8f0d1b09..ab05d8cbb0eda 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac"; }; - buildInputs = [ unzip apacheAnt jdk ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ apacheAnt jdk ]; builder = ./builder.sh; meta = { diff --git a/pkgs/servers/jellyfin/10.5.x.nix b/pkgs/servers/jellyfin/10.5.x.nix index da4d2c4c1d582..9bece72566f85 100644 --- a/pkgs/servers/jellyfin/10.5.x.nix +++ b/pkgs/servers/jellyfin/10.5.x.nix @@ -26,8 +26,8 @@ in stdenv.mkDerivation rec { sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27"; }; + nativeBuildInputs = [ unzip ]; buildInputs = [ - unzip makeWrapper ]; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index caca89bfd0db9..a4c47948a6404 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -26,8 +26,8 @@ in stdenv.mkDerivation rec { sha256 = "OqN070aUKPk0dXAy8R/lKUnSWen+si/AJ6tkYh5ibqo="; }; + nativeBuildInputs = [ unzip ]; buildInputs = [ - unzip makeWrapper ]; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 09af13951c9d9..a58ec2bf7b299 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; patches = [ ./nagios.patch ]; - buildInputs = [ php perl gd libpng zlib unzip ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ php perl gd libpng zlib ]; configureFlags = [ "--localstatedir=/var/lib/nagios" ]; buildFlags = [ "all" ]; diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 8f354d4bb46f4..27a6e01dba3db 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" ''; - nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo ]; - buildInputs = with perlPackages; [ file perl unzip openssl ncurses JSON Tk TermReadKey ]; + nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo unzip ]; + buildInputs = with perlPackages; [ file perl openssl ncurses JSON Tk TermReadKey ]; enableParallelBuilding = true; doCheck = false; # tries to use networking diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index efa43f7a844f8..a9a74f0b75f37 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -28,8 +28,9 @@ in stdenv.mkDerivation { name = "riak-2.2.0"; + nativeBuildInputs = [ unzip ]; buildInputs = [ - which unzip erlang pam + which erlang pam ]; src = srcs.riak; diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index 681a9dd38ca35..f86254e93b18b 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -4,7 +4,7 @@ pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}"; version = "1.14.0"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; unpackPhase = '' mkdir rainloop diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index c51b0d2098452..19aac337057f1 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -21,7 +21,7 @@ let # Work around the "unpacker appears to have produced no directories" # case that happens when the archive doesn't have a subdirectory. setSourceRoot = "sourceRoot=$(pwd)"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; meta = a.meta // { platforms = elasticsearch.meta.platforms; maintainers = (a.meta.maintainers or []) ++ (with lib.maintainers; [ offline ]); diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 5aab3000f3742..6b22185cd8003 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm"; }; - buildInputs = [ unzip ant ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ ant ]; meta = { platforms = lib.platforms.unix; diff --git a/pkgs/servers/web-apps/moodle/moodle-utils.nix b/pkgs/servers/web-apps/moodle/moodle-utils.nix index 168482bffe655..090d87cb1ee83 100644 --- a/pkgs/servers/web-apps/moodle/moodle-utils.nix +++ b/pkgs/servers/web-apps/moodle/moodle-utils.nix @@ -8,15 +8,16 @@ let configurePhase ? ":", buildPhase ? ":", buildInputs ? [ ], + nativeBuildInputs ? [ ], ... }: stdenv.mkDerivation (a // { name = name; inherit pluginType; - inherit configurePhase buildPhase; + inherit configurePhase buildPhase buildInputs; - buildInputs = [ unzip ] ++ buildInputs; + nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; installPhase = '' runHook preInstall |