diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-05-02 08:11:42 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-05-02 09:12:51 +0200 |
commit | 9478ec747c459cf96a46f2ae4148cc3451df65c5 (patch) | |
tree | 7ab754b54e32c69fd8f35ffc1fb51f84a16be290 /pkgs/build-support | |
parent | b27e64c703ab5e53498e43ee1e34c61212b01e50 (diff) | |
parent | cec6e7362c864813ab21453b3e078728cf7223c7 (diff) |
Merge branch 'staging-next-2022-04-23'
Close #169965: the PR and real 'staging-next' branch contained extra systemd rebuild that I wanted to avoid in this iteration. (to save Hydra's work)
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/docker/default.nix | 3 | ||||
-rw-r--r-- | pkgs/build-support/fetchfirefoxaddon/default.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/fetchnextcloudapp/default.nix | 7 | ||||
-rw-r--r-- | pkgs/build-support/writers/default.nix | 4 |
4 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 5a4e30ede8a3e..75e0d52d921b3 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -8,7 +8,6 @@ , fakechroot , fakeNss , fakeroot -, findutils , go , jq , jshon @@ -556,7 +555,7 @@ rec { }; result = runCommand "docker-image-${baseName}.tar.gz" { - nativeBuildInputs = [ jshon pigz coreutils findutils jq moreutils ]; + nativeBuildInputs = [ jshon pigz jq moreutils ]; # Image name must be lowercase imageName = lib.toLower name; imageTag = if tag == null then "" else tag; diff --git a/pkgs/build-support/fetchfirefoxaddon/default.nix b/pkgs/build-support/fetchfirefoxaddon/default.nix index 79014fd23c482..0fa51e69840cd 100644 --- a/pkgs/build-support/fetchfirefoxaddon/default.nix +++ b/pkgs/build-support/fetchfirefoxaddon/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, coreutils, unzip, jq, zip, fetchurl,writeScript, ...}: +{stdenv, unzip, jq, zip, fetchurl,writeScript, ...}: { name @@ -40,5 +40,5 @@ stdenv.mkDerivation { zip -r -q -FS "$out/$UUID.xpi" * rm -r "$out/$UUID" ''; - nativeBuildInputs = [ coreutils unzip zip jq ]; + nativeBuildInputs = [ unzip zip jq ]; } diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix index 7fe5b35e25969..094228ad3aabc 100644 --- a/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/pkgs/build-support/fetchnextcloudapp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gnutar, findutils, fetchurl, ... }: +{ stdenv, fetchurl, ... }: { name , url , version @@ -13,11 +13,6 @@ stdenv.mkDerivation { inherit url sha256; }; - nativeBuildInputs = [ - gnutar - findutils - ]; - unpackPhase = '' tar -xzpf $src ''; diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 2eb021236f9f5..cf9362ca072cf 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gawk, gnused, gixy }: +{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }: let aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {}; @@ -205,7 +205,7 @@ let writeNginxConfig = name: text: pkgs.runCommandLocal name { inherit text; passAsFile = [ "text" ]; - nativeBuildInputs = [ gawk gnused gixy ]; + nativeBuildInputs = [ gixy ]; } /* sh */ '' # nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16 awk -f ${awkFormatNginx} "$textPath" | sed '/^\s*$/d' > $out |