From a4bb7cfc84185f4a7bb121de43bde86c288464c4 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Fri, 2 Nov 2012 11:32:08 +0000 Subject: [PATCH 1/2] test-framework-th-prime: add version 0.0.5 --- .../haskell/test-framework-th-prime/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/test-framework-th-prime/default.nix diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix new file mode 100644 index 00000000000..ebcd608eb6a --- /dev/null +++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix @@ -0,0 +1,13 @@ +{ cabal, cpphs, haskellSrcExts, testFramework }: + +cabal.mkDerivation (self: { + pname = "test-framework-th-prime"; + version = "0.0.5"; + sha256 = "0lsxnbckh88cq38azml86szdcvx3rhs3is13ib4z0ryfqnv4hhpl"; + buildDepends = [ cpphs haskellSrcExts testFramework ]; + meta = { + description = "Template Haskell for test framework"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ee627aaf78b..4cf0faa91cf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1570,6 +1570,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); testFrameworkTh = callPackage ../development/libraries/haskell/test-framework-th {}; + testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {}; + testpack = callPackage ../development/libraries/haskell/testpack {}; texmath = callPackage ../development/libraries/haskell/texmath {}; From 54f58e9f2afaca0f73b2a12476ac234561a2ffc0 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Thu, 1 Nov 2012 14:07:15 +0000 Subject: [PATCH 2/2] optparse-applicative: add version 0.4.1 --- .../haskell/optparse-applicative/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/optparse-applicative/default.nix diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix new file mode 100644 index 00000000000..75f801eee18 --- /dev/null +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "optparse-applicative"; + version = "0.4.1"; + sha256 = "00byv248662n6pr8gn5b777l0fjg6f0wcxfkbhw0qyhd1ciq8d38"; + buildDepends = [ transformers ]; + meta = { + homepage = "https://github.com/pcapriotti/optparse-applicative"; + description = "Utilities and combinators for parsing command line options"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4cf0faa91cf..312ab37ebfe 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1243,6 +1243,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; + optparse_applicative = callPackage ../development/libraries/haskell/optparse-applicative {}; + pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; pandoc = callPackage ../development/libraries/haskell/pandoc {};