From 14e803ff8ad6098d762d5520da12aa6e02e3f65b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Feb 2012 18:28:12 +0000 Subject: [PATCH] haskell-test-framework: added version 0.4.2.2 (required by pandoc) svn path=/nixpkgs/trunk/; revision=32072 --- .../haskell/test-framework/0.4.2.2.nix | 25 +++++++++++++++++++ .../test-framework/{default.nix => 0.5.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 ++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix rename pkgs/development/libraries/haskell/test-framework/{default.nix => 0.5.nix} (100%) diff --git a/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix b/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix new file mode 100644 index 000000000000..4b920133ffd9 --- /dev/null +++ b/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix @@ -0,0 +1,25 @@ +{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname +, random, regexPosix, time, xml +}: + +cabal.mkDerivation (self: { + pname = "test-framework"; + version = "0.4.2.2"; + sha256 = "1lwdx4z9j5wxbmmlakf6knirdhi0ic6xpmhrj9ipa5ybw2zszakr"; + 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 + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/0.5.nix similarity index 100% rename from pkgs/development/libraries/haskell/test-framework/default.nix rename to pkgs/development/libraries/haskell/test-framework/0.5.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 294fa00d17d1..30539d748c44 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1325,7 +1325,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); terminfo = callPackage ../development/libraries/haskell/terminfo {}; - testFramework = callPackage ../development/libraries/haskell/test-framework {}; + testFramework_0_4_2_2 = callPackage ../development/libraries/haskell/test-framework/0.4.2.2.nix {}; + testFramework_0_5 = callPackage ../development/libraries/haskell/test-framework/0.5.nix {}; + testFramework = self.testFramework_0_5; testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {};