From 6704a7379b209e5d49e509507279b14d89041222 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 10:34:25 +0000 Subject: [PATCH] haskell-test-framework: dropped version 0.4.2.2 Pandoc updated to 0.5. svn path=/nixpkgs/trunk/; revision=32100 --- .../haskell/test-framework/0.4.2.2.nix | 25 ------------------- .../test-framework/{0.5.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++---- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix rename pkgs/development/libraries/haskell/test-framework/{0.5.nix => default.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 deleted file mode 100644 index 4b920133ffd9..000000000000 --- a/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ 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/0.5.nix b/pkgs/development/libraries/haskell/test-framework/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/test-framework/0.5.nix rename to pkgs/development/libraries/haskell/test-framework/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f29eaeca9e2e..294fa00d17d1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1061,9 +1061,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pathPieces_0_1_0 = callPackage ../development/libraries/haskell/path-pieces/0.1.0.nix {}; pathPieces = self.pathPieces_0_1_0; - pandoc = callPackage ../development/libraries/haskell/pandoc { - testFramework = self.testFramework_0_4_2_2; - }; + pandoc = callPackage ../development/libraries/haskell/pandoc {}; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; @@ -1327,9 +1325,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); terminfo = callPackage ../development/libraries/haskell/terminfo {}; - 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; + testFramework = callPackage ../development/libraries/haskell/test-framework {}; testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {};