From 8bbc3ea245e8432a98d1df697f28d6219e4e4db6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Aug 2011 12:39:59 +0000
Subject: [PATCH] haskell-packages.nix: added language-haskell-extract and
 test-framework-th

svn path=/nixpkgs/trunk/; revision=28515
---
 .../language-haskell-extract/default.nix      | 17 +++++++++++++++
 .../haskell/test-framework-th/default.nix     | 21 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           | 10 ++++++---
 3 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/language-haskell-extract/default.nix
 create mode 100644 pkgs/development/libraries/haskell/test-framework-th/default.nix

diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
new file mode 100644
index 00000000000..a5e3d00dda5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
@@ -0,0 +1,17 @@
+{ cabal, haskellSrcExts, regexPosix }:
+
+cabal.mkDerivation (self: {
+  pname = "language-haskell-extract";
+  version = "0.2.1";
+  sha256 = "0lmg16g3z8cx0vb037bk4j2nr3qvybfcqfsr8l6jk57b2nz3yhbf";
+  buildDepends = [ haskellSrcExts regexPosix ];
+  meta = {
+    homepage = "http://github.com/finnsson/template-helper";
+    description = "Module to automatically extract functions from the local code";
+    license = self.stdenv.lib.licenses.bsd3;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/test-framework-th/default.nix b/pkgs/development/libraries/haskell/test-framework-th/default.nix
new file mode 100644
index 00000000000..df4ca3ff15e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/test-framework-th/default.nix
@@ -0,0 +1,21 @@
+{ cabal, haskellSrcExts, languageHaskellExtract, regexPosix
+, testFramework
+}:
+
+cabal.mkDerivation (self: {
+  pname = "test-framework-th";
+  version = "0.2.2";
+  sha256 = "0nzfvxr5bnxinx41a5w5mwhyxzz2936dl0xhd80cv9plx19ylh0w";
+  buildDepends = [
+    haskellSrcExts languageHaskellExtract regexPosix testFramework
+  ];
+  meta = {
+    homepage = "http://github.com/finnsson/test-generator";
+    description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    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 03a9c8059e4..679caff17ed 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -794,6 +794,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   languageJavascript = callPackage ../development/libraries/haskell/language-javascript {};
 
+  languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {};
+
   largeword = callPackage ../development/libraries/haskell/largeword {};
 
   leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
@@ -1134,13 +1136,15 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   testFramework = callPackage ../development/libraries/haskell/test-framework {};
 
-  testFrameworkHUnit = callPackage ../development/libraries/haskell/test-framework-hunit {};
+  testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {};
 
-  testFrameworkQuickCheck = callPackage ../development/libraries/haskell/test-framework-quickcheck {
+  testFrameworkQuickcheck = callPackage ../development/libraries/haskell/test-framework-quickcheck {
     QuickCheck = self.QuickCheck1;
   };
 
-  testFrameworkQuickCheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {};
+  testFrameworkQuickcheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {};
+
+  testFrameworkTh = callPackage ../development/libraries/haskell/test-framework-th {};
 
   testpack = callPackage ../development/libraries/haskell/testpack {};