jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2899 from bennofs/nix-prefetch-revision

Browse Source 
nix-prefetch-*: print fetched revision
This commit is contained in:
Austin Seipp 2014-06-11 09:26:35 -05:00
commit 5a44c0a7ce
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/fetchbzr/nix-prefetch-bzr
View File

@ -52,6 +52,8 @@ if test -z "$finalPath"; then
# Perform the checkout. # Perform the checkout.
bzr -Ossl.cert_reqs=none export $revarg --format=dir "$tmpFile" "$url" bzr -Ossl.cert_reqs=none export $revarg --format=dir "$tmpFile" "$url"
echo "bzr revision is $(bzr revno $revarg "$url")"
# Compute the hash. # Compute the hash.
hash=$(nix-hash --type $hashType $hashFormat $tmpFile) hash=$(nix-hash --type $hashType $hashFormat $tmpFile)
if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi

2
pkgs/build-support/fetchgit/nix-prefetch-git
View File

@ -217,7 +217,7 @@ clone_user_rev() {
fi;; fi;;
esac esac
echo "git revision is $(cd $dir && git rev-parse $rev)" echo "git revision is $(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1)"
# Allow doing additional processing before .git removal # Allow doing additional processing before .git removal
eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK" eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"

1
pkgs/build-support/fetchhg/nix-prefetch-hg
View File

@ -51,6 +51,7 @@ if test -z "$finalPath"; then
hg archive -q -y -r "$rev" --cwd $tmpClone $tmpArchive hg archive -q -y -r "$rev" --cwd $tmpClone $tmpArchive
rm -f $tmpArchive/.hg_archival.txt rm -f $tmpArchive/.hg_archival.txt
echo "hg revision is $(cd $tmpClone; hg id -r "$rev" -i)"
# Compute the hash. # Compute the hash.
hash=$(nix-hash --type $hashType $hashFormat $tmpArchive) hash=$(nix-hash --type $hashType $hashFormat $tmpArchive)

1
pkgs/build-support/fetchsvn/nix-prefetch-svn
View File

@ -56,6 +56,7 @@ if test -z "$finalPath"; then
fi fi
echo p | svn "$command" --quiet -r "$rev" "$url" "$tmpFile" >&2 echo p | svn "$command" --quiet -r "$rev" "$url" "$tmpFile" >&2
echo "svn revision is $(svn info -r "$rev" "$url" | grep "Revision: " | cut -d' ' -f2)"
# Compute the hash. # Compute the hash.
hash=$(nix-hash --type $hashType $hashFormat $tmpFile) hash=$(nix-hash --type $hashType $hashFormat $tmpFile)