From 48c5ad011de914036c184d1ec0bd502482981e1f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Aug 2012 11:29:11 +0200
Subject: [PATCH] haskell-test-framework: update to version 0.6.1

---
 .../libraries/haskell/test-framework/0.6.nix  | 22 -------------------
 .../test-framework/{0.5.nix => default.nix}   |  4 ++--
 pkgs/top-level/haskell-packages.nix           |  4 +---
 3 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/test-framework/0.6.nix
 rename pkgs/development/libraries/haskell/test-framework/{0.5.nix => default.nix} (88%)

diff --git a/pkgs/development/libraries/haskell/test-framework/0.6.nix b/pkgs/development/libraries/haskell/test-framework/0.6.nix
deleted file mode 100644
index 940548945687..000000000000
--- a/pkgs/development/libraries/haskell/test-framework/0.6.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname
-, random, regexPosix, time, xml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "test-framework";
-  version = "0.6";
-  sha256 = "1ah5q3fwd5dmh2zb4rphdpz7hs39m4g1khvxjjwfzwyd9pxiz723";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    ansiTerminal ansiWlPprint extensibleExceptions hostname random
-    regexPosix time xml
-  ];
-  meta = {
-    homepage = "http://batterseapower.github.com/test-framework/";
-    description = "Framework for running and organising tests, with HUnit and QuickCheck support";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/test-framework/0.5.nix b/pkgs/development/libraries/haskell/test-framework/default.nix
similarity index 88%
rename from pkgs/development/libraries/haskell/test-framework/0.5.nix
rename to pkgs/development/libraries/haskell/test-framework/default.nix
index d69bd131774a..14fb53a5a09e 100644
--- a/pkgs/development/libraries/haskell/test-framework/0.5.nix
+++ b/pkgs/development/libraries/haskell/test-framework/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework";
-  version = "0.5";
-  sha256 = "19zm9xdhyjhqi2ryd2gkwi7m92s88mmiw1b6b91hjfhfw3c1qlzz";
+  version = "0.6.1";
+  sha256 = "1rx2c3yckw50vrydswb61ngvp27yxcimm5q6jcyqpn16fpkvxijw";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f2d6e28de4b5..f9f942d6a18e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1456,9 +1456,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   terminfo = callPackage ../development/libraries/haskell/terminfo {};
 
-  testFramework_0_6 = callPackage ../development/libraries/haskell/test-framework/0.6.nix {};
-  testFramework_0_5 = callPackage ../development/libraries/haskell/test-framework/0.5.nix {};
-  testFramework = self.testFramework_0_6;
+  testFramework = callPackage ../development/libraries/haskell/test-framework {};
 
   testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {};