diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-26 13:46:04 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-26 13:46:04 -0400 |
| commit | 9be40841ea4251a09ae7a1023abc1b6d191f61bb (patch) | |
| tree | f45a3e2cc682740887b81517eca4bd4fecd6c1c2 /pkgs/build-support | |
| parent | 8ce4780eff33591ed54b2fb97ca96108e4e7a740 (diff) | |
| parent | ac4c567c3603c5106862f144c21037f6ad76c0ad (diff) | |
| download | nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.gz nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.bz2 nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.lz nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.xz nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.zst nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.zip | |
Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts: pkgs/build-support/cc-wrapper/default.nix pkgs/build-support/gcc-wrapper-old/builder.sh pkgs/build-support/trivial-builders.nix pkgs/desktops/kde-4.14/kde-package/default.nix pkgs/development/compilers/openjdk-darwin/8.nix pkgs/development/compilers/openjdk-darwin/default.nix pkgs/development/compilers/openjdk/7.nix pkgs/development/compilers/openjdk/8.nix pkgs/development/compilers/oraclejdk/jdk-linux-base.nix pkgs/development/compilers/zulu/default.nix pkgs/development/haskell-modules/generic-builder.nix pkgs/misc/misc.nix pkgs/stdenv/generic/builder.sh pkgs/stdenv/generic/setup.sh
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/build-support/fetchpatch/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/build-support/setup-hooks/multiple-outputs.sh | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 506ef7837a2e..0d02897da74a 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -409,8 +409,9 @@ rec { }; result = runCommand "docker-image-${baseName}.tar.gz" { buildInputs = [ jshon pigz coreutils findutils ]; - imageName = name; - imageTag = tag; + # Image name and tag must be lowercase + imageName = lib.toLower name; + imageTag = lib.toLower tag; inherit fromImage baseJson; layerClosure = writeReferencesToFile layer; passthru.buildArgs = args; diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index a6ddf132cd5b..a9bfac320fb8 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -5,7 +5,7 @@ # stripLen acts as the -p parameter when applying a patch. { lib, fetchurl, patchutils }: -{ stripLen ? 0, addPrefixes ? false, ... }@args: +{ stripLen ? 0, addPrefixes ? false, excludes ? [], ... }@args: fetchurl ({ postFetch = '' @@ -21,7 +21,10 @@ fetchurl ({ --addnewprefix=b/ \ ''} \ --clean "$out" > "$tmpfile" - mv "$tmpfile" "$out" + ${patchutils}/bin/filterdiff \ + -p1 \ + ${builtins.toString (builtins.map (x: "-x ${x}") excludes)} \ + "$tmpfile" > "$out" ${args.postFetch or ""} ''; -} // builtins.removeAttrs args ["stripLen" "addPrefixes"]) +} // builtins.removeAttrs args ["stripLen" "addPrefixes" "excludes"]) diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 9abf50f6ea47..62a6491b8dc0 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -202,7 +202,7 @@ _multioutPropagateDev() { mkdir -p "${!propagaterOutput}"/nix-support for output in $propagatedBuildOutputs; do - echo "${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile + echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile done } |