b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

treewide: Fixed output fetch* derivations should use nativeBuildInputs

Browse source
This commit is contained in:
John Ericson 2018-01-09 15:36:14 -05:00
parent c98e6b6771
commit 3d59b4d285
16 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/build-support/fetchbower/default.nix
View file

@ -23,7 +23,7 @@ let
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
inherit outputHash; inherit outputHash;
buildInputs = [ bower2nix ]; nativeBuildInputs = [ bower2nix ];
}; };
in fetchbower in fetchbower

2
pkgs/build-support/fetchbzr/default.nix
View file

@ -5,7 +5,7 @@ stdenv.mkDerivation {
name = "bzr-export"; name = "bzr-export";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [ bazaar ]; nativeBuildInputs = [ bazaar ];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

2
pkgs/build-support/fetchcvs/default.nix
View file

@ -10,7 +10,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cvs-export"; name = "cvs-export";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [cvs]; nativeBuildInputs = [cvs];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

2
pkgs/build-support/fetchdarcs/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation {
name = "fetchdarcs"; name = "fetchdarcs";
NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [darcs]; nativeBuildInputs = [darcs];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

2
pkgs/build-support/fetchegg/default.nix
View file

@ -10,7 +10,7 @@ else
stdenv.mkDerivation { stdenv.mkDerivation {
name = "chicken-${name}-export"; name = "chicken-${name}-export";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [ chicken ]; nativeBuildInputs = [ chicken ];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

2
pkgs/build-support/fetchfossil/default.nix
View file

@ -5,7 +5,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "fossil-archive" + (if name != null then "-${name}" else ""); name = "fossil-archive" + (if name != null then "-${name}" else "");
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [fossil]; nativeBuildInputs = [fossil];
# Envvar docs are hard to find. A link for the future: # Envvar docs are hard to find. A link for the future:
# https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md # https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md

2
pkgs/build-support/fetchgit/default.nix
View file

@ -52,7 +52,7 @@ stdenv.mkDerivation {
inherit name; inherit name;
builder = ./builder.sh; builder = ./builder.sh;
fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash. fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash.
buildInputs = [git]; nativeBuildInputs = [git];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

2
pkgs/build-support/fetchgit/private.nix
View file

@ -17,7 +17,7 @@
in builtins.toString sshConfigFile}''; in builtins.toString sshConfigFile}'';
ssh-wrapped = runCommand "fetchgit-ssh" { ssh-wrapped = runCommand "fetchgit-ssh" {
buildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
} '' } ''
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${openssh}/bin/ssh $out/bin/ssh --prefix PATH : "$out/bin" --add-flags "-F ${config}" "$@" makeWrapper ${openssh}/bin/ssh $out/bin/ssh --prefix PATH : "$out/bin" --add-flags "-F ${config}" "$@"

2
pkgs/build-support/fetchgx/default.nix
View file

@ -6,7 +6,7 @@ stdenv.mkDerivation {
name = "${name}-gxdeps"; name = "${name}-gxdeps";
inherit src; inherit src;
buildInputs = [ go gx gx-go ]; nativeBuildInputs = [ go gx gx-go ];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

2
pkgs/build-support/fetchhg/default.nix
View file

@ -7,7 +7,7 @@ else
stdenv.mkDerivation { stdenv.mkDerivation {
name = "hg-archive" + (if name != null then "-${name}" else ""); name = "hg-archive" + (if name != null then "-${name}" else "");
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [mercurial]; nativeBuildInputs = [mercurial];
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;

2
pkgs/build-support/fetchipfs/default.nix
View file

@ -28,7 +28,7 @@ in
if (!hasHash) then throw "Specify sha for fetchipfs fixed-output derivation" else stdenv.mkDerivation { if (!hasHash) then throw "Specify sha for fetchipfs fixed-output derivation" else stdenv.mkDerivation {
name = ipfs; name = ipfs;
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [ curl ]; nativeBuildInputs = [ curl ];
# New-style output content requirements. # New-style output content requirements.
outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else

2
pkgs/build-support/fetchrepoproject/default.nix
View file

@ -44,7 +44,7 @@ in stdenv.mkDerivation {
"GIT_PROXY_COMMAND" "SOCKS_SERVER" "GIT_PROXY_COMMAND" "SOCKS_SERVER"
]; ];
buildInputs = [ gitRepo cacert ]; nativeBuildInputs = [ gitRepo cacert ];
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";

2
pkgs/build-support/fetchs3/default.nix
View file

@ -16,7 +16,7 @@ let
AWS_SESSION_TOKEN = credentials.session_token ? null; AWS_SESSION_TOKEN = credentials.session_token ? null;
}; };
in runCommand "foo" ({ in runCommand "foo" ({
buildInputs = [ awscli ]; nativeBuildInputs = [ awscli ];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = sha256; outputHash = sha256;
outputHashMode = if recursiveHash then "recursive" else "flat"; outputHashMode = if recursiveHash then "recursive" else "flat";

2
pkgs/build-support/fetchsvn/default.nix
View file

@ -31,7 +31,7 @@ else
stdenv.mkDerivation { stdenv.mkDerivation {
name = name_; name = name_;
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [ subversion glibcLocales ]; nativeBuildInputs = [ subversion glibcLocales ];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

2
pkgs/build-support/fetchsvnssh/default.nix
View file

@ -8,7 +8,7 @@ else
stdenv.mkDerivation { stdenv.mkDerivation {
name = "svn-export-ssh"; name = "svn-export-ssh";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [subversion expect]; nativeBuildInputs = [subversion expect];
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";

2
pkgs/build-support/fetchurl/default.nix
View file

@ -112,7 +112,7 @@ else stdenv.mkDerivation {
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [ curl ]; nativeBuildInputs = [ curl ];
urls = urls_; urls = urls_;