* 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

2 files changed, 2 insertions, 6 deletions

diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index ce6a1e61d9c..d1435dc4fb6 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/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;
 }
diff --git a/pkgs/build-support/fetchsvn/nix-prefetch-svn b/pkgs/build-support/fetchsvn/nix-prefetch-svn
index cfefee70b03..f7a0ccc7b7b 100755
--- a/pkgs/build-support/fetchsvn/nix-prefetch-svn
+++ b/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.