diff options
| author | Peter Simons <simons@cryp.to> | 2014-09-02 12:31:03 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-09-02 12:31:03 +0200 |
| commit | 1c0d15b90ef67363f798d67d12dd31ed5fccb411 (patch) | |
| tree | 3693dd49b591dbbba261e95fc4b78650f1675578 /pkgs/build-support | |
| parent | bb61b45d92bad2435e80dcac855a78bda57ec7e8 (diff) | |
| parent | 2fc76ea05417671306d27f9ba83ef1b8d4049f3d (diff) | |
| download | nixlib-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar nixlib-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.gz nixlib-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.bz2 nixlib-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.lz nixlib-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.xz nixlib-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.zst nixlib-1c0d15b90ef67363f798d67d12dd31ed5fccb411.zip | |
Merge branch 'origin/master' into staging.
Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix
Diffstat (limited to 'pkgs/build-support')
3 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index 41f2a59246d1..dd43068be279 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -96,7 +96,10 @@ filterExisting() { # Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...> wrapProgram() { local prog="$1" - local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped + local progBasename=$(basename $prog) + local hiddenDir="$(dirname $prog)/../wrapped-bin/.$progBasename-wrapped-bin" + mkdir -p $hiddenDir + local hidden="$(cd "$hiddenDir"; pwd)/$progBasename" mv $prog $hidden makeWrapper $hidden $prog "$@" } diff --git a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh index 28c28f695875..b66001073f27 100644 --- a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh +++ b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh @@ -8,6 +8,10 @@ SF_version_dir () { version_link 'http://sourceforge.net/.+/'"$1"'[0-9.]+/$' } +SF_version_tarball () { + version_link '[.]tar[.].*/download$' +} + GH_latest () { prefetch_command_rel ../fetchgit/nix-prefetch-git revision "$("$(dirname "$0")/urls-from-page.sh" "$CURRENT_URL/commits" | grep /commit/ | head -n 1 | xargs basename )" diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh index e11eb722e0e4..e60499b60f27 100755 --- a/pkgs/build-support/upstream-updater/update-walker.sh +++ b/pkgs/build-support/upstream-updater/update-walker.sh @@ -280,6 +280,12 @@ do_overwrite_just_version () { set_var_value sha256 $CURRENT_HASH } +minimize_overwrite() { + do_overwrite(){ + do_overwrite_just_version + } +} + process_config () { CONFIG_DIR="$(directory_of "$1")" CONFIG_NAME="$(basename "$1")" @@ -297,9 +303,7 @@ process_config () { exit 1; } [ -z "$(retrieve_meta fullRegenerate)" ] && eval " - do_overwrite(){ - do_overwrite_just_version - } + minimize_overwrite " fi ensure_attribute_name |