diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index ddf5740d95a8..0d9c34b890e6 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "HStringTemplate"; - version = "0.6.2"; - sha256 = "1d8ae847cb2b92f6d083ee1ed5db00c719e51fe43017d4289dea61335a116103"; + version = "0.6.5"; + sha256 = "e40b69e22900f381ca7fb080ea6e70d623e52e909bd7b896bc24e15c8e43252c"; propagatedBuildInputs = [parsec time text utf8String parallel]; meta = { description = "StringTemplate implementation in Haskell"; diff --git a/pkgs/development/libraries/haskell/HsSyck/default.nix b/pkgs/development/libraries/haskell/HsSyck/default.nix new file mode 100644 index 000000000000..6b1681c6b372 --- /dev/null +++ b/pkgs/development/libraries/haskell/HsSyck/default.nix @@ -0,0 +1,10 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "HsSyck"; + version = "0.45"; + sha256 = "67d02a892cd4535a02cc3ebf7b6e9f898a64428ec6783488875ac694d7fafb79"; + meta = { + description = "Fast, lightweight YAML loader and dumper"; + }; +}) diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix index 2da9beea5258..45c8d4aeaeed 100644 --- a/pkgs/development/libraries/haskell/SMTPClient/default.nix +++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "SMTPClient"; - version = "1.0.2"; - sha256 = "b835cebf22e9281778deeec3ceffeb95aa8ae9c0e1f97e8e9734cf5d87ecba5f"; + version = "1.0.3"; + sha256 = "c9907834565b5b712d50c50823513675b982c8b51e7b95680a3495eccb73ce66"; propagatedBuildInputs = [hsemail network]; meta = { description = "A simple SMTP client library"; diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 5bebdf7de358..4859a2ca0ee1 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self : { pname = "gitit"; - version = "0.7.3.5"; - sha256 = "50cf6b853d439904e54884660eba6ffdc31b938e077fd0d9457fba972d4bde9f"; + version = "0.7.3.8"; + sha256 = "356c82604dcfe2eec4faeb36ee46546ea3e26738780723f457366b2e35f6211a"; propagatedBuildInputs = [ HStringTemplate happstackServer happstackUtil HTTP SHA cgi datetime filestore highlightingKate safe diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix index 9b18652642f9..de54b3ccac3e 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-data.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-data.nix @@ -1,10 +1,14 @@ -{cabal, mtl, sybWithClass, HaXml, happstackUtil, binary}: +{cabal, mtl, sybWithClass, sybWithClassInstancesText, HaXml, + happstackUtil, binary, text}: cabal.mkDerivation (self : { pname = "happstack-data"; - version = "0.4.1"; - sha256 = "0d1f96472a4e13b9a5218bce8bf819a50d1773b7e110141ab235d1d7701e39f6"; - propagatedBuildInputs = [mtl sybWithClass HaXml happstackUtil binary]; + version = "0.5.0.2"; + sha256 = "03795c24acc2268f39d38f18dd6cbfb92893f7de88b0443219d582a1eabdacd5"; + propagatedBuildInputs = [ + mtl sybWithClass sybWithClassInstancesText HaXml + happstackUtil binary text + ]; meta = { description = "Happstack data manipulation libraries"; license = "BSD"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index c1d66c0fabcd..461137c933dc 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "happstack-server"; - version = "0.4.1"; - sha256 = "2a5d32b4e635160ffab8a90891d9c5ca0433969944ae4013ec8cebe25ba63658"; + version = "0.5.0.2"; + sha256 = "0184c835958bf9f29009a5aedd2c913bb1ad6ab60b80d9750849381c172dd6b6"; propagatedBuildInputs = [ HUnit HaXml MaybeT happstackData happstackUtil hslogger html mtl network parsec sendfile utf8String xhtml zlib diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix index 4ba0854d37a3..cab41882514d 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self : { pname = "happstack-util"; - version = "0.4.1"; - sha256 = "bb254140c30c39c420bc5a649da645f59df950f0a712c2dac4de1cc6572f05f9"; + version = "0.5.0.2"; + sha256 = "b6a84a55d6f7aec51095121a240bd6096b0df3c61c6fd25963d91190fcca4657"; propagatedBuildInputs = [ mtl hslogger HUnit QuickCheck strictConcurrency unixCompat SMTPClient diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index d6d69f398ba5..48de03486092 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "highlighting-kate"; - version = "0.2.6.2"; - sha256 = "3ed163888d45d5bf5ee5c2931e894f6ca2eb167a79ac8274d7f57341c4c5dca7"; + version = "0.2.7.1"; + sha256 = "330c5fdc6b5dae62c12ee2455892319df12723346aa75401aea05ea0b24cf5ed"; propagatedBuildInputs = [parsec pcreLight xhtml]; meta = { description = "Syntax highlighting"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index de77d27c8b03..57b6cec24b59 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -3,13 +3,12 @@ cabal.mkDerivation (self : { pname = "pandoc"; - version = "1.5.1.1"; - sha256 = "6d2283cb618fcaea5ee5cb885ef6532bc34628b351f14a6bd85b098d7a4128d9"; + version = "1.6"; + sha256 = "9b825233293edf1ea414b0e7ea821d6a914711dc2c60546566ab5a97512b079b"; propagatedBuildInputs = [ mtl network parsec utf8String xhtml zipArchive HTTP xml texmath ]; meta = { description = "Conversion between markup formats"; }; -}) - +}) diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix index f35719d75f47..801257cc4e56 100644 --- a/pkgs/development/libraries/haskell/sendfile/default.nix +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "sendfile"; - version = "0.6.1"; - sha256 = "c21b7f0f9a03a5e6d9b0691f5f0be9969d175f0514becdc199f0fd49097e51a2"; + version = "0.6.2"; + sha256 = "2d7bf7fdcae7e2ffa24bf70bc1bdc7ea4e6b1726f6cee63cd14c2eeb5545749a"; propagatedBuildInputs = [network]; meta = { description = "A portable sendfile library"; diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix index 5e90fd74e1a8..91ba2d948867 100644 --- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix +++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix @@ -1,10 +1,10 @@ -{cabal, parallel}: +{cabal, parallel, deepseq}: cabal.mkDerivation (self : { pname = "strict-concurrency"; - version = "0.2.3"; - sha256 = "21641b983b226e47727ff565184a5f2b312c7979ff487a5e478f5cfc82f78f18"; - propagatedBuildInputs = [parallel]; + version = "0.2.4.1"; + sha256 = "0939212dd0cc3b9bd228dfbb233d9eccad22ca626752d9bad8026ceb0a5c1a89"; + propagatedBuildInputs = [parallel deepseq]; meta = { description = "Strict concurrency abstractions"; }; diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix new file mode 100644 index 000000000000..f295e489402f --- /dev/null +++ b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix @@ -0,0 +1,11 @@ +{cabal, sybWithClass, text}: + +cabal.mkDerivation (self : { + pname = "syb-with-class-instances-text"; + version = "0.0.1"; + sha256 = "0e0aa90c02cbe76380274830be51e04cb3cc13d5ea5761ba5540779bd0c4d76e"; + propagatedBuildInputs = [sybWithClass text]; + meta = { + description = "Scrap Your Boilerplate With Class"; + }; +}) diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index e6ea92a169e3..dfd7d1946351 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "syb-with-class"; - version = "0.6"; - sha256 = "8ee836b491b0f64ab0920d1a7314323439665a7b1afa78810cbbc95dc658bfdc"; + version = "0.6.1"; + sha256 = "72cf0a98862181fea81b77c11f35efd22eafa29107f3acd624fd08be68ed850b"; meta = { description = "Scrap Your Boilerplate With Class"; }; diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 66369cb60ba0..623f86ee3fd3 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "texmath"; - version = "0.2.0.3"; - sha256 = "d355a298d28b9f5356926c2d2942f28ed07afa9d944cadfa47d8cdec73725b55"; + version = "0.3.0.2"; + sha256 = "8d2bb26fc5aab09ae92d2c194ec39acb4e04c054ad2caf1a1db0dc9b53b4b1d4"; propagatedBuildInputs = [cgi json parsec xml]; meta = { description = "Conversion of LaTeX math formulas to MathML"; diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix new file mode 100644 index 000000000000..30fa46b0ffb5 --- /dev/null +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -0,0 +1,14 @@ +{cabal, HStringTemplate, csv, pandoc, parsec, split, utf8String, xhtml, HsSyck}: + +cabal.mkDerivation (self : { + pname = "yst"; + version = "0.2.3.2"; + sha256 = "b857e70db67d708e2edb61a1d6bc4eaff3abd2bc252b3605f66bf1760da4da4b"; + propagatedBuildInputs = [ + HStringTemplate csv pandoc parsec split utf8String xhtml HsSyck + ]; + meta = { + description = + "Builds a static website from templates and data in YAML or CSV files"; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0bba75bb71d1..b33b842c9640 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -315,6 +315,8 @@ rec { hsemail = callPackage ../development/libraries/haskell/hsemail {}; + HsSyck = callPackage ../development/libraries/haskell/HsSyck {}; + HStringTemplate = callPackage ../development/libraries/haskell/HStringTemplate {}; hspread = callPackage ../development/libraries/haskell/hspread {}; @@ -491,6 +493,8 @@ rec { sybWithClass = callPackage ../development/libraries/haskell/syb/syb-with-class.nix {}; + sybWithClassInstancesText = callPackage ../development/libraries/haskell/syb/syb-with-class-instances-text.nix {}; + SDLImage = callPackage ../development/libraries/haskell/SDL-image { inherit (pkgs) SDL_image; }; @@ -625,6 +629,8 @@ rec { xml = callPackage ../development/libraries/haskell/xml {}; + yst = callPackage ../development/libraries/haskell/yst {}; + zipArchive = callPackage ../development/libraries/haskell/zip-archive {}; zipper = callPackage ../development/libraries/haskell/zipper {};