* Removed Darcs 1.x.

* Updated Darcs to 2.2.1 and switched to the Cabal builder.  However,
  there are some dependencies missing that Andres will add :-)

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

2 files changed, 6 insertions, 17 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8f3110055a..8783db0b82a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -250,13 +250,6 @@ let
     inherit stdenv darcs nix;
   };
 
-  # only temporarely  / don't know yet wether it's save to switch
-  # but I have trouble getting HAppS repos
-  fetchdarcs2 = import ../build-support/fetchdarcs {
-    inherit stdenv nix;
-    darcs = darcs2;
-  };
-
   fetchsvn = import ../build-support/fetchsvn {
     inherit stdenv subversion openssh;
     sshSupport = true;
@@ -2305,7 +2298,7 @@ let
   */
 
   bleedingEdgeRepos = import ../development/misc/bleeding-edge-repos {
-    inherit getConfig fetchdarcs2 fetchurl lib;
+    inherit getConfig fetchurl lib;
   };
 
   ecj = import ../development/eclipse/ecj {
@@ -7932,15 +7925,7 @@ let
     inherit (gtkLibs) gtk glib;
   };
 
-  darcs = import ../applications/version-management/darcs {
-    inherit fetchurl stdenv zlib ncurses curl getConfig;
-    ghc = ghc661;
-  };
-
-  # some speed bottle necks are resolved in this version I think .. perhaps you like to try it?
-  darcs2 = import ../applications/version-management/darcs/darcs-2.nix {
-    inherit fetchurl stdenv zlib ncurses curl ghc perl;
-  };
+  darcs = haskellPackages.darcs;
 
   dia = import ../applications/graphics/dia {
     inherit stdenv fetchurl pkgconfig perl perlXMLParser
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 31200d6bd8b..5bb225e52ef 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -143,6 +143,10 @@ rec {
 
   # Applications.
 
+  darcs = import ../applications/version-management/darcs/darcs-2.nix {
+    inherit cabal;
+  };
+
   xmobar = import ../applications/misc/xmobar {
     inherit cabal;
     inherit (pkgs) X11;