summary refs log tree commit diff
path: root/pkgs/build-support/fetchbzr
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2015-12-18 15:48:38 -0600
committerThomas Tuegel <ttuegel@gmail.com>2015-12-19 09:32:22 -0600
commit0b1edac8c06ab84b220d3be365a1ffb108459e09 (patch)
tree6f68c6c8e9a0f6e5a8ec1ccedd95e32f5d8b53b2 /pkgs/build-support/fetchbzr
parent55544c1e68c79911ca7eafd638a6ac9254c25dc5 (diff)
downloadnixpkgs-0b1edac8c06ab84b220d3be365a1ffb108459e09.tar
nixpkgs-0b1edac8c06ab84b220d3be365a1ffb108459e09.tar.gz
nixpkgs-0b1edac8c06ab84b220d3be365a1ffb108459e09.tar.bz2
nixpkgs-0b1edac8c06ab84b220d3be365a1ffb108459e09.tar.lz
nixpkgs-0b1edac8c06ab84b220d3be365a1ffb108459e09.tar.xz
nixpkgs-0b1edac8c06ab84b220d3be365a1ffb108459e09.tar.zst
nixpkgs-0b1edac8c06ab84b220d3be365a1ffb108459e09.zip
nix-prefetch-bzr: match path name to fetchbzr name
fetchbzr always uses the derivation name `bzr-export`. nix-prefetch-bzr
should use the same name for its output. This avoids duplicate downloads
and problems with forbidden characters in bazaar repository names.
Diffstat (limited to 'pkgs/build-support/fetchbzr')
-rwxr-xr-xpkgs/build-support/fetchbzr/nix-prefetch-bzr3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/pkgs/build-support/fetchbzr/nix-prefetch-bzr
index 8143fca7025..dbe8a7ef801 100755
--- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr
+++ b/pkgs/build-support/fetchbzr/nix-prefetch-bzr
@@ -26,8 +26,7 @@ repoName=$(echo $url | sed '
   s,.*/\([^/]\+\)/tags/\([^/]\+\)/*$,\1-\2,;t
   s,.*/\([^/]\+\)/*$,\1,;t
 ')
-dstFile=$repoName-r$rev
-test -n "$rev" || dstFile=$repoName
+dstFile="bzr-export"
 
 # If the hash was given, a file with that hash may already be in the
 # store.