From 45c2082b50d8032bdcd2e533f94c6889f2186781 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Aug 2011 15:47:35 +0000
Subject: [PATCH] cabal2nix: updated to version 1.9

svn path=/nixpkgs/trunk/; revision=28461
---
 .../libraries/haskell/cabal2nix/default.nix   | 20 -------------------
 .../tools/haskell/cabal2nix/default.nix       | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++--
 3 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/cabal2nix/default.nix
 create mode 100644 pkgs/development/tools/haskell/cabal2nix/default.nix

diff --git a/pkgs/development/libraries/haskell/cabal2nix/default.nix b/pkgs/development/libraries/haskell/cabal2nix/default.nix
deleted file mode 100644
index 34353338184..00000000000
--- a/pkgs/development/libraries/haskell/cabal2nix/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ fetchgit, cabal, HTTP, regexPosix }:
-
-cabal.mkDerivation (self : {
-  pname = "cabal2nix";
-  version = "v1.8-beta-13";
-
-  src = fetchgit {
-    url = "git://github.com/peti/cabal2nix.git";
-    rev = "11fb101a229373d37704b3b9e62df44c825dd081";
-  };
-
-  extraBuildInputs = [HTTP regexPosix];
-
-  meta = {
-    homepage = "http://github.com/peti/cabal2nix";
-    description = "Convert Cabal files into Nix build instructions";
-    license = self.stdenv.lib.licenses.bsd3;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
-  };
-})
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
new file mode 100644
index 00000000000..9c32d38b0c3
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -0,0 +1,20 @@
+{ cabal, HTTP, mtl, regexPosix }:
+
+cabal.mkDerivation (self: {
+  pname = "cabal2nix";
+  version = "1.9";
+  sha256 = "0wfagx42l3jcjclwyw914srramh9jind1988xg7dkxblngqw153v";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ HTTP mtl regexPosix ];
+  meta = {
+    homepage = "http://github.com/haskell4nix/cabal2nix";
+    description = "Convert Cabal files into Nix build instructions";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a71e122cd7f..2396520fc8e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -424,8 +424,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {};
 
-  cabal2nix = callPackage ../development/libraries/haskell/cabal2nix {};
-
   cairo = callPackage ../development/libraries/haskell/cairo {
     inherit (pkgs) cairo zlib;
   };
@@ -1415,6 +1413,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   myhasktags = callPackage ../tools/misc/myhasktags {};
 
+  cabal2nix = callPackage ../development/tools/haskell/cabal2nix {};
+
   # Games.
 
   LambdaHack = callPackage ../games/LambdaHack {};