diff options
Diffstat (limited to 'pkgs/build-support')
-rwxr-xr-x | pkgs/build-support/upstream-updater/create-src-info-git.sh | 24 | ||||
-rwxr-xr-x | pkgs/build-support/upstream-updater/update-upstream-data.sh | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/pkgs/build-support/upstream-updater/create-src-info-git.sh b/pkgs/build-support/upstream-updater/create-src-info-git.sh new file mode 100755 index 000000000000..6687a1f8f411 --- /dev/null +++ b/pkgs/build-support/upstream-updater/create-src-info-git.sh @@ -0,0 +1,24 @@ +#! /bin/sh + +[ -z "$1" ] && { + echo "Use $0 expression-basename repo-url branch-name package-base-name" + echo "Like:" + echo "$0 default http://git.example.com/repo origin/master hello" + exit 1; +} >&2 + +own_dir="$(cd "$(dirname "$0")"; sh -c pwd)" + +cp "$own_dir/../builder-defs/template-bdp-uud.nix" "$1.nix" +sed -e "s@src-for-default.nix@src-for-$1.nix@g; + s@fetchUrlFromSrcInfo@fetchGitFromSrcInfo@g" -i "$1.nix" +echo '{}' > "src-for-$1.nix" +cat << EOF > src-info-for-$1.nix +{ + repoUrl = "$2"; + rev = "$3"; + baseName = "$4"; + method = "fetchgit"; +} +EOF + diff --git a/pkgs/build-support/upstream-updater/update-upstream-data.sh b/pkgs/build-support/upstream-updater/update-upstream-data.sh index b81a0da48400..f4861aa11d1e 100755 --- a/pkgs/build-support/upstream-updater/update-upstream-data.sh +++ b/pkgs/build-support/upstream-updater/update-upstream-data.sh @@ -75,7 +75,7 @@ prefetchClause="" " export NIX_HASH_ALGO=sha256 rev="$(getAttr rev '')"; - rev_and_hash="$("$own_dir"/../fetchgit/nix-prefetch-git "$repoUrl" "$rev" | tail -2)" + rev_and_hash="$("$own_dir"/../fetchgit/nix-prefetch-git "$repoUrl" "$rev" | tee /dev/stderr | tail -2)" rev="$(echo "$rev_and_hash" | head -1)" url="$repoUrl"; |