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

Change fetchsvn as well as nix-prefect-svn to use the repository name and 

the revision number inside the derivation name.

svn path=/nixpkgs/trunk/; revision=17677
This commit is contained in:
Nicolas Pierron 2009-10-06 13:36:52 +00:00
parent e528b920bb
commit d7897d0d1a
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/build-support/fetchsvn/default.nix
View File

@ -1,8 +1,27 @@
{stdenv, subversion, sshSupport ? false, openssh ? null}: {stdenv, subversion, sshSupport ? false, openssh ? null}:
{url, rev ? "HEAD", md5 ? "", sha256 ? ""}: {url, rev ? "HEAD", md5 ? "", sha256 ? ""}:
let
repoName = with stdenv.lib;
let
fst = head;
snd = l: head (tail l);
trd = l: head (tail (tail l));
path_ = reverseList (splitString "/" url);
path = if head path_ == "" then tail path_ else path_;
in
# ../repo/trunk -> repo
if fst path == "trunk" then snd path
# ../repo/branches/branch -> repo-branch
else if snd path == "branches" then "${trd path}-${fst path}"
# ../repo/tags/tag -> repo-tag
else if snd path == "tags" then "${trd path}-${fst path}"
# ../repo (no trunk) -> repo
else fst path;
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "svn-export"; name = "${repoName}-r${toString rev}";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [subversion]; buildInputs = [subversion];

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

@ -19,11 +19,18 @@ fi
test -n "$rev" || rev="HEAD" test -n "$rev" || rev="HEAD"
repoName=$(echo $url | sed '
s,.*/\([^/]\+\)/trunk/*$,\1,;t
s,.*/\([^/]\+\)/branches/\([^/]\+\)/*$,\1-\2,;t
s,.*/\([^/]\+\)/tags/\([^/]\+\)/*$,\1-\2,;t
s,.*/\([^/]\+\)/*$,\1,;t
')
dstFile=$repoName-r$rev
# 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" svn-export) finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" $dstFile)
if ! nix-store --check-validity "$finalPath" 2> /dev/null; then if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
finalPath= finalPath=
fi fi
@ -34,9 +41,8 @@ fi
# If we don't know the hash or a path with that hash doesn't exist, # If we don't know the hash or a path with that hash doesn't exist,
# download the file and add it to the store. # download the file and add it to the store.
if test -z "$finalPath"; then if test -z "$finalPath"; then
tmpPath=/tmp/svn-checkout-tmp-$$ tmpPath=/tmp/svn-checkout-tmp-$$
tmpFile=$tmpPath/svn-export tmpFile=$tmpPath/$dstFile
mkdir $tmpPath mkdir $tmpPath
trap "rm -rf $tmpPath" EXIT trap "rm -rf $tmpPath" EXIT