diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix new file mode 100644 index 000000000000..c08cdf3736ff --- /dev/null +++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix @@ -0,0 +1,12 @@ +{cabal, hslogger, mtl}: + +cabal.mkDerivation (self : { + pname = "hslogger-template"; + version = "1.0.0"; + sha256 = "0lnscbilzr5avi2h831kv2xhahh7pi5g054bw0sy57a1ccm2pvs1"; + propagatedBuildInputs = [ hslogger mtl ]; + meta = { + description = "Library for generating hslogger functions using Template Haskell"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/parsec/3.nix b/pkgs/development/libraries/haskell/parsec/3.nix new file mode 100644 index 000000000000..23413700ad4f --- /dev/null +++ b/pkgs/development/libraries/haskell/parsec/3.nix @@ -0,0 +1,12 @@ +{cabal,mtl}: + +cabal.mkDerivation (self : { + pname = "parsec"; + version = "3.0.0"; # Haskell Platform 2009.0.0 + sha256 = "0fqryy09y8h7z0hlayg5gpavghgwa0g3bldynwl17ks8l87ykj7a"; + propagatedBuildInputs = [mtl]; + meta = { + description = "Monadic parser combinators"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix index 8c12d8d94a97..fb881fb2466e 100644 --- a/pkgs/development/libraries/haskell/terminfo/default.nix +++ b/pkgs/development/libraries/haskell/terminfo/default.nix @@ -1,10 +1,10 @@ -{cabal, ncurses}: +{cabal, ncurses, extensibleExceptions}: cabal.mkDerivation (self : { pname = "terminfo"; version = "0.3.0.2"; sha256 = "2303d934fcec0f6413f15887f7f42e8e2e5b27812534a929bf585bfa6f3a9229"; - propagatedBuildInputs = [ncurses]; + propagatedBuildInputs = [ncurses extensibleExceptions]; meta = { description = "Haskell bindings for the terminfo library"; }; diff --git a/pkgs/tools/misc/myhasktags/default.nix b/pkgs/tools/misc/myhasktags/default.nix index d30933f0875a..9538144c45cd 100644 --- a/pkgs/tools/misc/myhasktags/default.nix +++ b/pkgs/tools/misc/myhasktags/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { version = "0.0"; # Haskell Platform 2009.0.0 src = fetchurl { url = http://mawercer.de/~nix/hasktags.hs; - sha256 = "9bd8ed2cfe814b40215574e3e6ac5c1741f47ad610675c85354f19ce611d2c4a"; + sha256 = "119c4d8f1c33f5aa04b01022a089e3ea2e2b213641b25920c7732ca27fd47c83"; }; phases="buildPhase"; buildPhase = '' diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7c8ee31a509f..1a81a15268fa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -237,6 +237,10 @@ rec { inherit cabal binary network; }; + hsloggerTemplate = import ../development/libraries/haskell/hslogger-template { + inherit cabal hslogger mtl; + }; + html = import ../development/libraries/haskell/html { inherit cabal; }; @@ -312,6 +316,10 @@ rec { inherit cabal; }; + parsec3 = import ../development/libraries/haskell/parsec/3.nix { + inherit cabal mtl; + }; + pcreLight = import ../development/libraries/haskell/pcre-light { inherit cabal; inherit (pkgs) pcre; @@ -415,7 +423,7 @@ rec { }; terminfo = import ../development/libraries/haskell/terminfo { - inherit cabal; + inherit cabal extensibleExceptions /* only required for <= ghc6102 ?*/; inherit (pkgs) ncurses; };