diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix index b7141f6517da..588ffe4f5c1d 100644 --- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "ansi-wl-pprint"; - version = "0.5.0"; - sha256 = "295e6924409012e3371db1bb5c02475614fcf1ea99e6bff45a5fc84fb13b8284"; + version = "0.6.3"; + sha256 = "1cpkfn1ld0sjysksdsxxwwy1b17s4smmzk8y88y9mb81vgwlalkl"; propagatedBuildInputs = [ansiTerminal]; meta = { description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; diff --git a/pkgs/development/libraries/haskell/hostname/default.nix b/pkgs/development/libraries/haskell/hostname/default.nix new file mode 100644 index 000000000000..543776e084c8 --- /dev/null +++ b/pkgs/development/libraries/haskell/hostname/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "hostname"; + version = "1.0"; + sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv"; + meta = { + description = "A very simple package providing a cross-platform means of determining the hostname"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix new file mode 100644 index 000000000000..491a73e7616a --- /dev/null +++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix @@ -0,0 +1,14 @@ +{cabal, HUnit, testFramework}: + +cabal.mkDerivation (self : { + pname = "test-framework-hunit"; + version = "0.2.6"; + sha256 = "1ivgyh71wwvrrgnk3fp6hsfssvy39jikhjdzr7x68pv1ca7f247r"; + propagatedBuildInputs = [HUnit testFramework]; + meta = { + description = "HUnit support for the test-framework package"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix new file mode 100644 index 000000000000..80e0b1a0f00e --- /dev/null +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix @@ -0,0 +1,14 @@ +{cabal, QuickCheck1, testFramework, deepseq}: + +cabal.mkDerivation (self : { + pname = "test-framework-quickcheck"; + version = "0.2.7"; + sha256 = "065nazli8vh9dz8xi71gwzlwy81anfd471jhz6hv3m893cc9vvx8"; + propagatedBuildInputs = [QuickCheck1 testFramework deepseq]; + meta = { + description = "QuickCheck support for the test-framework package"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix new file mode 100644 index 000000000000..c8d84f710505 --- /dev/null +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -0,0 +1,14 @@ +{cabal, QuickCheck2, testFramework}: + +cabal.mkDerivation (self : { + pname = "test-framework-quickcheck2"; + version = "0.2.10"; + sha256 = "12c37m74idjydxshgms9ib9ii2rpvy4647kra2ards1w2jmnr6w3"; + propagatedBuildInputs = [QuickCheck2 testFramework]; + meta = { + description = "QuickCheck2 support for the test-framework package"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix new file mode 100644 index 000000000000..34d2db546b63 --- /dev/null +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -0,0 +1,14 @@ +{cabal, ansiTerminal, ansiWLPprint, hostname, regexPosix, xml}: + +cabal.mkDerivation (self : { + pname = "test-framework"; + version = "0.4.0"; + sha256 = "0zxrdndycr63kzfibk0c2n4j39x6b8s4332sgqm54g1vdl3fxzbl"; + propagatedBuildInputs = [ansiTerminal ansiWLPprint hostname regexPosix xml]; + meta = { + description = "Framework for running and organising tests"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 17e91685c56f..09cc5606adfe 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -615,6 +615,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; + hostname = callPackage ../development/libraries/haskell/hostname {}; + hscolour = callPackage ../development/libraries/haskell/hscolour {}; hsemail = callPackage ../development/libraries/haskell/hsemail {}; @@ -937,6 +939,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); inherit (pkgs) ncurses; }; + testFramework = callPackage ../development/libraries/haskell/test-framework {}; + + testFrameworkHUnit = callPackage ../development/libraries/haskell/test-framework-hunit {}; + + testFrameworkQuickCheck = callPackage ../development/libraries/haskell/test-framework-quickcheck {}; + + testFrameworkQuickCheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {}; + testpack = callPackage ../development/libraries/haskell/testpack {}; texmath = callPackage ../development/libraries/haskell/texmath {};