lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

git-export -> source

Browse source
This commit is contained in:
Eelco Dolstra 2017-12-25 14:30:18 +01:00
parent 7ccec0900b
commit 0d79f16fd5
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/script/nix-prefetch-bzr
View file

@ -26,8 +26,7 @@ repoName=$(echo $url | sed '
s,.*/\([^/]\+\)/tags/\([^/]\+\)/*$,\1-\2,;t s,.*/\([^/]\+\)/tags/\([^/]\+\)/*$,\1-\2,;t
s,.*/\([^/]\+\)/*$,\1,;t s,.*/\([^/]\+\)/*$,\1,;t
') ')
dstFile=$repoName-r$rev dstFile=source
test -n "$rev" || dstFile=$repoName
# If the hash was given, a file with that hash may already be in the # If the hash was given, a file with that hash may already be in the
# store. # store.

2
src/script/nix-prefetch-git
View file

@ -226,7 +226,7 @@ else
# If the hash was given, a file with that hash may already be in the # If the hash was given, a file with that hash may already be in the
# store. # store.
if test -n "$expHash"; then if test -n "$expHash"; then
finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" git-export) finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" source)
if ! nix-store --check-validity "$finalPath" 2> /dev/null; then if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
finalPath= finalPath=
fi fi

2
src/script/nix-prefetch-hg
View file

@ -23,7 +23,7 @@ test -n "$rev" || rev="tip"
# If the hash was given, a file with that hash may already be in the # If the hash was given, a file with that hash may already be in the
# store. # store.
if test -n "$expHash"; then if test -n "$expHash"; then
finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" hg-archive) finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" source)
if ! nix-store --check-validity "$finalPath" 2> /dev/null; then if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
finalPath= finalPath=
fi fi