* fetchcvs: cleanup, use nix-store --add-fixed like fetchurl/svn.

Argument "url" renamed to "cvsRoot" (it's not a URL).

svn path=/nixpkgs/trunk/; revision=10889

pkgs/applications/misc/synergy/default.nix

@@ -3,7 +3,7 @@ stdenv.mkDerivation {
   name = "synergy-cvs";
 
   src = fetchcvs {
-    url = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2";
+    cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2";
     module = "synergy";
     date = "NOW";
     sha256 = "ef8e2ebfda6e43240051a7af9417092b2af50ece8b5c6c3fbd908ba91c4fe068";

pkgs/build-support/fetchcvs/builder.sh

@@ -6,18 +6,17 @@ source $stdenv/setup
 # should work (but didn't - got no response on #cvs)
 # See als man Page for those options
 
-ensureDir $out export
-set -x
+ensureDir export
 if [ -n "$tag" ]; then
-  tag="-r $tag"
+    tag="-r $tag"
 else
-  if [ -n "$date" ]; then
-    tag="-D $date"
-  else
-    tag="-D NOW"
-  fi
+    if [ -n "$date" ]; then
+        tag="-D $date"
+    else
+        tag="-D NOW"
+    fi
 fi
-cd export; cvs -f -d "$url" export $tag "$module"
-mv */* $out
+(cd export && cvs -f -z0 -d "$cvsRoot" export $tag "$module")
+mv export/* $out
 
 stopNest

pkgs/build-support/fetchcvs/default.nix

@@ -3,11 +3,18 @@
 # tag="<tagname>" (get version by tag name)
 # If you don't specify neither one date="NOW" will be used (get latest)
 
-{stdenv, cvs, nix}: {url, module, tag ? null, date ? null, sha256}:
+{stdenv, cvs}:
+
+{cvsRoot, module, tag ? null, date ? null, sha256}:
 
 stdenv.mkDerivation {
   name = "cvs-export";
   builder = ./builder.sh;
-  buildInputs = [cvs nix];
-  inherit url module sha256 tag date;
+  buildInputs = [cvs];
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = sha256;
+  
+  inherit cvsRoot module sha256 tag date;
 }

pkgs/build-support/fetchcvs/nix-prefetch-cvs

@@ -1,89 +1,80 @@
 #! /bin/sh -e
 
-url=$1
+cvsRoot=$1
 module=$2
 tag=$3
-hash=$4
+expHash=$4
 
-if test -z "$url"; then
-    echo "syntax: nix-prefetch-cvs URL MODULE [TAG [HASH]]" >&2
+hashType=$NIX_HASH_ALGO
+if test -z "$hashType"; then
+    hashType=sha256
+fi
+
+if test -z "$cvsRoot"; then
+    echo "syntax: nix-prefetch-cvs CVSROOT MODULE [TAG [HASH]]" >&2
     exit 1
 elif test -z "$module"; then
-    echo "syntax: nix-prefetch-cvs URL MODULE [TAG [HASH]]" >&2
+    echo "syntax: nix-prefetch-cvs CVSROOT MODULE [TAG [HASH]]" >&2
     exit 1
 fi
 
-# Use a restrictive umask to ensure that the output in the Nix store
-# is not group- or world-writable.  Nix 0.10 complains about this.
-umask 0022
 
-# Determine the hash, unless it was given.
-if test -z "$hash"; then
+mkTempDir() {
+    tmpPath=$(mktemp -d -t nix-prefetch-cvs-XXXXXXXX)
+    trap removeTempDir EXIT SIGINT SIGQUIT
+}
 
-    # !!! 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
+removeTempDir() {
+    if test -n "$tmpPath"; then
+        rm -rf "$tmpPath" || true
     fi
+}
 
-    # !!! race? should be relatively safe, `svn export' barfs if $tmpPath exists.
-    cvsPath="cvs-checkout-tmp-$$"
-    tmpPath1=$storeDir/$cvsPath
 
-    # Test whether we have write permission in the store.  If not,
-    # fetch to /tmp and don't copy to the store.  This is a hack to
-    # make this script at least work somewhat in setuid installations.
-    if ! touch $tmpPath1 2> /dev/null; then
-        echo "(cannot write to the store, result won't be cached)" >&2
-        dummyMode=1
-        tmpPath1=/tmp/nix-prefetch-cvs-$$ # !!! security?
+# If the hash was given, a file with that hash may already be in the
+# store.
+if test -n "$expHash"; then
+    finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" cvs-export)
+    if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
+        finalPath=
     fi
-    rm -f $tmpPath1
+    hash=$expHash
+fi
+
+
+# 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.
+if test -z "$finalPath"; then
+
+    mkTempDir
+    tmpFile=$tmpPath/cvs-export
+    #mkdir $tmpPath
 
     # Perform the checkout.
     if test -z "$tag"; then
-      rtag="-DNOW"
+        rtag="-DNOW"
     else
-      rtag="-r $tag"
+        rtag="-r $tag"
     fi
-    # CVS has a problem with absolute paths, so cd into the nix store
-    current=$(pwd)
-    cd $storeDir
-    cvs -f -d $url export $rtag -d $cvsPath $module >&2
-    # Change back to the original directory
-    cd $current
+    (cd "$tmpPath" && cvs -f -z7 -d $cvsRoot export $rtag -d cvs-export $module >&2)
 
     # Compute the hash.
-    hash=$(nix-hash $tmpPath1)
-    echo "hash is $hash" >&2
+    hash=$(nix-hash --type $hashType $hashFormat $tmpFile)
+    if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
 
-    # Rename it so that the fetchcvs builder can find it.
-    if test "$dummyMode" != 1; then
-        tmpPath2=$storeDir/cvs-checkout-tmp-$hash
-        test -e $tmpPath2 || mv $tmpPath1 $tmpPath2 # !!! race
+    # Add the downloaded file to the Nix store.
+    finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpFile)
+
+    if test -n "$expHash" -a "$expHash" != "$hash"; then
+        echo "hash mismatch for CVS root \`$cvsRoot'"
+        exit 1
     fi
 fi
 
-# Create a Nix expression that does a fetchcvs.
-nixExpr=$(dirname $0)/../../top-level/all-packages.nix
-storeExpr=$( \
-  echo "(import $nixExpr {}).fetchcvs {url=\"$url\"; module=\"$module\"; tag=\"$tag\"; md5=\"$hash\";}" \
-  | nix-instantiate -)
+if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi
 
-# Realise it.
-finalPath=$(nix-store -r $storeExpr)
-
-echo "path is $finalPath" >&2
-
-if test -n "$tmpPath1" -o -n "$tmpPath2"; then
-    rm -rf $tmpPath1 $tmpPath2 || true
-fi
-
-echo "debug hash is $hash" >&2
 echo $hash
 
 if test -n "$PRINT_PATH"; then
-    echo "debug path is $finalPath" >&2
     echo $finalPath
 fi

pkgs/build-support/fetchsvn/default.nix

@@ -9,9 +9,9 @@ stdenv.mkDerivation {
   # Nix <= 0.7 compatibility.
   /*id = if sha256 == "" then md5 else sha256;*/
 
-  outputHashAlgo = if sha256=="" then "md5" else "sha256";
+  outputHashAlgo = if sha256 == "" then "md5" else "sha256";
   outputHashMode = "recursive";
-  outputHash = if sha256 =="" then md5 else sha256;
+  outputHash = if sha256 == "" then md5 else sha256;
   
   inherit url rev sshSupport openssh;
 }

pkgs/build-support/fetchsvn/nix-prefetch-svn

@@ -16,10 +16,6 @@ fi
 
 test -n "$rev" || rev="HEAD"
 
-# Use a restrictive umask to ensure that the output in the Nix store
-# is not group- or world-writable.  Nix 0.10 complains about this.
-umask 0022
-
 
 # If the hash was given, a file with that hash may already be in the
 # store.

pkgs/top-level/all-packages.nix

@@ -297,7 +297,7 @@ rec {
   };
   
   fetchcvs = import ../build-support/fetchcvs {
-    inherit stdenv cvs nix;
+    inherit stdenv cvs;
   };
 
   fetchdarcs = import ../build-support/fetchdarcs {