* Another sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15269

4 files changed, 13 insertions, 37 deletions

diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix
index be68791cd2d..c0efa78553b 100644
--- a/pkgs/applications/version-management/darcs/darcs-2.nix
+++ b/pkgs/applications/version-management/darcs/darcs-2.nix
@@ -1,19 +1,17 @@
-{stdenv, fetchurl, ghc, zlib, ncurses, curl, perl}:
+{cabal, html, mtl, parsec, regexCompat, zlib, curl} :
 
-stdenv.mkDerivation {
-  name = "darcs-2.1.0";
-  src = fetchurl {
-    url = http://www.darcs.net/darcs-2.1.0.tar.gz;
-    sha256 = "d5a63e62bceb45905163d508c6b25158dab6aca367015566d8c539ec37107ab4";
-  };
-
-  buildInputs = [ghc zlib ncurses curl perl];
+cabal.mkDerivation (self : {
+  pname = "darcs";
+  name = self.fname;
+  version = "2.2.1";
+  sha256 = "0iy4d4qls6yhwmgv87pz4kmr5jh4bwigz1wfwzns71b68csynnsp";
 
-  NIX_LDFLAGS = "-lz";
+  extraBuildInputs = [html mtl parsec regexCompat zlib curl];
 
   meta = {
+    homepage = http://darcs.net/;
     description = "Patch-based version management system";
   };
 
   patches = ./bash-completion.patch; # I didn't have "have"
-}
+})
diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
deleted file mode 100644
index 336d37ad2c8..00000000000
--- a/pkgs/applications/version-management/darcs/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, ghc, zlib, ncurses, curl, getConfig}:
-
-# you really should consider using darcs2 and updating your darcs-1 repos ..
-# many performance improvements have been made if you use the darcs-2 or hashed format
-# (darcs-2 is default now when runnig darcs 2.1.0)
-# lookup darcs convert and make sure you understand the one way conversion..
-assert getConfig ["darcs" "IreallyWantDarcsOne"] false;
-
-stdenv.mkDerivation {
-  name = "darcs-1.0.9";
-  src = fetchurl {
-    url = http://www.darcs.net/darcs-1.0.9.tar.gz;
-    sha256 = "a5fe4d5a743d8052d6cbfcea480a44593f821afd8a42e6d6d4ae37d40ed23cd8";
-  };
-  buildInputs = [ghc zlib ncurses curl];
-
-  NIX_LDFLAGS = "-lz";
-
-  meta = {
-    description = "Patch-based version management system";
-  };
-}
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index d16b166416f..562fd3a91f9 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -15,7 +15,7 @@ rec {
       cpio tcl tk makeWrapper subversion;
     svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
     guiSupport = getConfig ["git" "guiSupport"] false;
-    perlLibs = [perlLWP perlURI perlTermReadKey subversion];
+    perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
   };
 
   gitGit = import ./git/git-git.nix {
@@ -26,7 +26,7 @@ rec {
     inherit (bleedingEdgeRepos) sourceByName;
     svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
     guiSupport = getConfig ["git" "guiSupport"] false;
-    perlLibs = [perlLWP perlURI perlTermReadKey subversion];
+    perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion];
   };
 
   qgit = import ./qgit {
diff --git a/pkgs/applications/version-management/subversion/1.6.nix b/pkgs/applications/version-management/subversion/1.6.nix
index 6d40142c4bc..625a74b2bd8 100644
--- a/pkgs/applications/version-management/subversion/1.6.nix
+++ b/pkgs/applications/version-management/subversion/1.6.nix
@@ -20,13 +20,13 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.6.0";
+  version = "1.6.1";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "http://subversion.tigris.org/downloads/${name}.tar.bz2";
-    sha256 = "d6fb8bf61638580a0ad661edb642c38fbffad2a4c273e3f8631c6cc0da14d0a2";
+    sha256 = "1jp6i7vmz0vd1zf4y896f7jzabwv81x8brwzp5kpkrn6wajagm6d";
   };
 
   buildInputs = [zlib apr aprutil sqlite]