* 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

4 files changed, 15 insertions, 49 deletions

diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix
index be68791cd2d9..3de6bbfeea74 100644
--- a/pkgs/applications/version-management/darcs/darcs-2.nix
+++ b/pkgs/applications/version-management/darcs/darcs-2.nix
@@ -1,19 +1,18 @@
-{stdenv, fetchurl, ghc, zlib, ncurses, curl, perl}:
+{cabal /* , ghc, zlib, ncurses, curl, perl */}:
 
-stdenv.mkDerivation {
-  name = "darcs-2.1.0";
-  src = fetchurl {
-    url = http://www.darcs.net/darcs-2.1.0.tar.gz;
-    sha256 = "d5a63e62bceb45905163d508c6b25158dab6aca367015566d8c539ec37107ab4";
-  };
+cabal.mkDerivation (self : {
+  pname = "darcs";
+  version = "2.2.1";
+  sha256 = "0iy4d4qls6yhwmgv87pz4kmr5jh4bwigz1wfwzns71b68csynnsp";
 
-  buildInputs = [ghc zlib ncurses curl perl];
+  #buildInputs = [ghc zlib ncurses curl perl];
 
-  NIX_LDFLAGS = "-lz";
+  #NIX_LDFLAGS = "-lz";
 
   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 336d37ad2c88..000000000000
--- 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8f3110055af..8783db0b82ae 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 31200d6bd8bd..5bb225e52ef0 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;