diff options
10 files changed, 122 insertions, 9 deletions
diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix new file mode 100644 index 00000000000..3a9e8b8e4cb --- /dev/null +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -0,0 +1,13 @@ +{cabal, text}: + +cabal.mkDerivation (self : { + pname = "blaze-builder"; + version = "0.1"; + sha256 = "dc4c542a39cf9e82b6a7ca99d6f460d6fa8dc4c8f648224368eac3fe054127c5"; + propagatedBuildInputs = [text]; + meta = { + description = "Builder to efficiently append text"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix new file mode 100644 index 00000000000..74f9f0c4626 --- /dev/null +++ b/pkgs/development/libraries/haskell/failure/default.nix @@ -0,0 +1,12 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "failure"; + version = "0.1.0"; + sha256 = "08c4e51dbbc0852836ff5bf791e9c62dca748aed8554bb6271618ab3d6a04b2c"; + meta = { + description = "A simple type class for success/failure computations"; + license = "Public Domain"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix new file mode 100644 index 00000000000..c5b0339fae7 --- /dev/null +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -0,0 +1,13 @@ +{cabal, binary, hamlet, mtl, network, pandoc, regexBase, regexTDFA, time}: + +cabal.mkDerivation (self : { + pname = "hakyll"; + version = "2.3"; + sha256 = "40e57c5cf5be3c6fdc270d00ff765a2b3e11ba7e302f40146d83048aa4436116"; + propagatedBuildInputs = [hamlet mtl network pandoc regexBase regexTDFA time]; + meta = { + description = "A simple static site generator library"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 08f7fd7b6a2..90bbb999d18 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -1,10 +1,12 @@ -{cabal, blazeHtml, parsec, utf8String}: +{cabal, blazeHtml, blazeBuilder, parsec, utf8String, failure, neither}: cabal.mkDerivation (self : { pname = "hamlet"; - version = "0.4.0"; - sha256 = "5e05879e734fc193acc48eda48dadbf53659e937543068bcc77dc7c394f6adcd"; - propagatedBuildInputs = [blazeHtml parsec utf8String]; + version = "0.5.0"; + sha256 = "92d8e099fa63fe218e2c8c4da56ac86b0b0bb49139467b8f12595c4436d1ad0b"; + propagatedBuildInputs = [ + blazeHtml blazeBuilder parsec utf8String failure neither + ]; meta = { description = "Haml-like template files that are compile-time checked"; license = "BSD"; diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix new file mode 100644 index 00000000000..1dfd1ca533d --- /dev/null +++ b/pkgs/development/libraries/haskell/neither/default.nix @@ -0,0 +1,15 @@ +{cabal, failure, mtl, transformers, MonadCatchIOMtl, MonadCatchIOTransformers}: + +cabal.mkDerivation (self : { + pname = "neither"; + version = "0.0.2"; + sha256 = "1e1b934d9d1918bd762bb8d6cde35c56883543c2d0c165a661f096c2ce5ab139"; + propagatedBuildInputs = [ + failure mtl transformers MonadCatchIOMtl MonadCatchIOTransformers + ]; + meta = { + description = "A simple type class for success/failure computations"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 57b6cec24b5..3f0b7b09d72 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,12 +1,12 @@ {cabal, mtl, network, parsec, utf8String, xhtml, zipArchive, HTTP, xml, - texmath}: + texmath, random}: cabal.mkDerivation (self : { pname = "pandoc"; version = "1.6"; sha256 = "9b825233293edf1ea414b0e7ea821d6a914711dc2c60546566ab5a97512b079b"; propagatedBuildInputs = [ - mtl network parsec utf8String xhtml zipArchive HTTP xml texmath + mtl network parsec utf8String xhtml zipArchive HTTP xml texmath random ]; meta = { description = "Conversion between markup formats"; diff --git a/pkgs/development/libraries/haskell/random/default.nix b/pkgs/development/libraries/haskell/random/default.nix new file mode 100644 index 00000000000..370f054dc1e --- /dev/null +++ b/pkgs/development/libraries/haskell/random/default.nix @@ -0,0 +1,13 @@ +{cabal, time}: + +cabal.mkDerivation (self : { + pname = "random"; + version = "1.0.0.2"; + sha256 = "5433aebb4bbfb999f1d02410c8ca3769c63cd8b02109d2771a37c12918f92dd5"; + propagatedBuildInputs = [time]; + meta = { + description = "random number library"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix new file mode 100644 index 00000000000..76b30404495 --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix @@ -0,0 +1,13 @@ +{cabal, mtl, parsec, regexBase}: + +cabal.mkDerivation (self : { + pname = "regex-tdfa"; + version = "1.1.4"; + sha256 = "382c7ed1ee75448574b42e9ecb9228b25f55143f3008ecd6f5d3a30471337b39"; + propagatedBuildInputs = [mtl parsec regexBase]; + meta = { + description = "Replaces/Enhances Text.Regex"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/time/1.2.0.3.nix b/pkgs/development/libraries/haskell/time/1.2.0.3.nix new file mode 100644 index 00000000000..7ddbdcc2fa9 --- /dev/null +++ b/pkgs/development/libraries/haskell/time/1.2.0.3.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "time"; + version = "1.2.0.3"; + sha256 = "acb1e3cf2b98a73632d35b0665808b05df6c03fcefd62796fe291f5b2ef4348e"; + meta = { + description = "A time library"; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b33b842c964..d6a803c436e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -46,6 +46,8 @@ rec { bitmap = callPackage ../development/libraries/haskell/bitmap {}; + blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {}; + blazeHtml = callPackage ../development/libraries/haskell/blaze-html {}; bytestring = callPackage ../development/libraries/haskell/bytestring {}; @@ -115,6 +117,8 @@ rec { extensibleExceptions = callPackage ../development/libraries/haskell/extensible-exceptions {}; + failure = callPackage ../development/libraries/haskell/failure {}; + fclabels = callPackage ../development/libraries/haskell/fclabels {}; feed = callPackage ../development/libraries/haskell/feed {}; @@ -171,6 +175,12 @@ rec { happy = happy_1_18_5; }; + hakyll = callPackage ../development/libraries/haskell/hakyll { + regexBase = regexBase_0_93_2; + network = network_2_2_1_7; + time = time_1_2_0_3; + }; + hamlet = callPackage ../development/libraries/haskell/hamlet {}; HAppSData = callPackage ../development/libraries/haskell/HAppS/HAppS-Data.nix {}; @@ -371,6 +381,8 @@ rec { multiset = callPackage ../development/libraries/haskell/multiset {}; + neither = callPackage ../development/libraries/haskell/neither {}; + network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; network = callPackage ../development/libraries/haskell/network {}; @@ -396,6 +408,7 @@ rec { pandoc = callPackage ../development/libraries/haskell/pandoc { HTTP = HTTP_4000_0_9; network = network_2_2_1_7; + random = random_newtime; }; parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {}; @@ -434,6 +447,10 @@ rec { RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; + random_newtime = callPackage ../development/libraries/haskell/random { + time = time_1_2_0_3; + }; + readline = callPackage ../development/libraries/haskell/readline { inherit (pkgs) readline ncurses; }; @@ -469,8 +486,10 @@ rec { regexBase = regexBase_0_93_2; }; - regexPosix = callPackage ../development/libraries/haskell/regex-posix { - inherit cabal regexBase; + regexPosix = callPackage ../development/libraries/haskell/regex-posix {}; + + regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa { + regexBase = regexBase_0_93_2; }; regular = callPackage ../development/libraries/haskell/regular {}; @@ -550,11 +569,13 @@ rec { threadmanager = callPackage ../development/libraries/haskell/threadmanager {}; - /* time is Haskell Platform default, time_1_1_3 is more recent but incompatible */ + /* time is Haskell Platform default, other time versions are more recent but incompatible */ time = callPackage ../development/libraries/haskell/time {}; time_1_1_3 = callPackage ../development/libraries/haskell/time/1.1.3.nix {}; + time_1_2_0_3 = callPackage ../development/libraries/haskell/time/1.2.0.3.nix {}; + transformers = callPackage ../development/libraries/haskell/transformers {}; uniplate = callPackage ../development/libraries/haskell/uniplate {}; |