From 0b1edac8c06ab84b220d3be365a1ffb108459e09 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 18 Dec 2015 15:48:38 -0600 Subject: 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. --- pkgs/build-support/fetchbzr/nix-prefetch-bzr | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs/build-support/fetchbzr/nix-prefetch-bzr') 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. -- cgit 1.4.1