* fetchsvn' now requires the MD5 hash (as computed by nix-hash') of

the tree being fetched from a Subversion repository.  The revision
  number is now optional (and defaults to HEAD).

  This makes `fetchsvn' more pure.  First, a URL/revision tuple does
  not uniquely identify a file resource, since the repository itself
  might change.  Second, `svn:external' attributes can cause arbitrary
  resources to be exported.

  A script `nix-prefetch-svn' has been provided to determine the hash
  of a URL.

svn path=/nixpkgs/trunk/; revision=938
This commit is contained in:
Eelco Dolstra 2004-04-14 10:55:33 +00:00
parent f7561cf00e
commit 5c847a370a
4 changed files with 70 additions and 10 deletions

View file

@ -1,8 +1,19 @@
buildinputs="$subversion"
. $stdenv/setup
echo "exporting $url (r$rev) into $out..."
header "exporting $url (r$rev) into $out"
svn export -r $rev "$url" $out || exit 1
prefetch=$(dirname $out)/svn-checkout-tmp-$md5
echo $prefetch
if test -e "$prefetch"; then
mv $prefetch $out
else
svn export -r "$rev" "$url" $out
fi
echo $rev > $out/svn-revision || exit 1
actual=$(nix-hash $out)
if test "$actual" != "$md5"; then
echo "hash is $actual, expected $md5" >&2
exit 1
fi
stopNest

View file

@ -1,7 +1,9 @@
{stdenv, subversion}: {url, rev}: stdenv.mkDerivation {
name = "svn-checkout";
{stdenv, subversion, nix}: {url, rev ? "HEAD", md5}:
stdenv.mkDerivation {
name = "svn-export";
builder = ./builder.sh;
subversion = subversion;
url = url;
rev = rev;
buildInputs = [subversion nix];
id = md5;
inherit url rev md5;
}

View file

@ -0,0 +1,47 @@
#! /bin/sh -e
url=$1
rev=$2
if test -z "$url"; then
echo "syntax: nix-prefetch-svn URL [REVISION]" >&2
exit 1
fi
test -n "$rev" || rev="HEAD"
# !!! hacky; we should have a way to query the location of the store.
if storeDir=$(which nix-store); then
storeDir=$(dirname $(dirname "$storeDir"))/store
else
storeDir=/nix/store
fi
# !!! race? should be relatively safe, `svn export' barfs if $tmpPath exists.
tmpPath1=$storeDir/svn-checkout-tmp-$$
# Perform the checkout.
svn export -r "$rev" "$url" $tmpPath1 >&2
# Compute the hash.
hash=$(nix-hash $tmpPath1)
echo "hash is $hash" >&2
# Rename it so that the fetchsvn builder can find it.
tmpPath2=$storeDir/svn-checkout-tmp-$hash
test -e $tmpPath2 || mv $tmpPath1 $tmpPath2 # !!! race
# Create a Nix expression that does a fetchsvn.
nixExpr=$(dirname $(readlink -f $0))/../../system/i686-linux.nix
storeExpr=$( \
echo "(import $nixExpr).fetchsvn {url=\"$url\"; rev=\"$rev\"; md5=\"$hash\";}" \
| nix-instantiate -)
# Realise it.
finalPath=$(nix-store -qnB --force-realise $storeExpr)
echo "path is $finalPath" >&2
rm -rf $tmpPath2 || true
echo $hash

View file

@ -22,7 +22,7 @@ rec {
};
fetchsvn = (import ../build-support/fetchsvn) {
inherit stdenv subversion;
inherit stdenv subversion nix;
};