diff options
author | Marc Weber <marco-oweber@gmx.de> | 2007-11-11 08:16:23 +0000 |
---|---|---|
committer | Marc Weber <marco-oweber@gmx.de> | 2007-11-11 08:16:23 +0000 |
commit | 7a9d92486f846f222ed04622f4d1424b237710eb (patch) | |
tree | 4caa12e879adf8a074f703478e6841a866a80779 /pkgs/build-support/fetchcvs | |
parent | 61f4326752b238072fecfac164f7b9b1028f651d (diff) |
Synergy added and fetchcvs modified (see mailinglist post)
svn path=/nixpkgs/trunk/; revision=9624
Diffstat (limited to 'pkgs/build-support/fetchcvs')
-rw-r--r-- | pkgs/build-support/fetchcvs/builder.sh | 28 | ||||
-rw-r--r-- | pkgs/build-support/fetchcvs/default.nix | 15 |
2 files changed, 16 insertions, 27 deletions
diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index 55a87c1660ade..16aad96116d58 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -1,24 +1,16 @@ source $stdenv/setup -header "exporting $url $module into $out" - -prefetch=$(dirname $out)/cvs-checkout-tmp-$outputHash -echo $prefetch -if test -e "$prefetch"; then - mv $prefetch $out -else - if test -z "$tag"; then - rtag="-DNOW" - else - rtag="-r $tag" - fi - cvs -f -d $url export $rtag -d $out $module +if test -z "$tag"; then + tag="-DNOW" fi +# creating the export drictory and checking out there only to be able to +# move the content without the root directory into $out ... +# cvs -f -d "$url" export $tag -d "$out" "$module" +# should work (but didn't - got no response on #cvs) +# See als man Page for those options -actual=$(nix-hash $out) -if test "$actual" != "$outputHash"; then - echo "hash is $actual, expected $outputHash" >&2 - exit 1 -fi +ensureDir $out export +cd export; cvs -f -d "$url" export $tag "$module" +mv */* $out stopNest diff --git a/pkgs/build-support/fetchcvs/default.nix b/pkgs/build-support/fetchcvs/default.nix index a97e9d927efa8..6cd31ddaade71 100644 --- a/pkgs/build-support/fetchcvs/default.nix +++ b/pkgs/build-support/fetchcvs/default.nix @@ -1,16 +1,13 @@ -{stdenv, cvs, nix}: {url, module, tag, md5}: +# example tags: +# "-DNOW" (get current version) +# "-D2007-20-10" (get the last version before given date) +# "-r <tagname>" (get version by tag name) +{stdenv, cvs, nix}: {url, module, tag, sha256}: stdenv.mkDerivation { name = "cvs-export"; builder = ./builder.sh; buildInputs = [cvs nix]; - # Nix <= 0.7 compatibility. - id = md5; - - outputHashAlgo = "md5"; - outputHashMode = "recursive"; - outputHash = md5; - - inherit url module tag; + inherit url module tag sha256; } |