diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix new file mode 100644 index 000000000000..1c51f82bed68 --- /dev/null +++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "base-unicode-symbols"; + version = "0.2.1.5"; + sha256 = "1ir1dckrpax4xlrfp7jdsjn7s403a8n8mcmv3wdnpzkg1klfahyq"; + meta = { + description = "Unicode alternatives for common functions and operators"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index 2cbd4a5fe454..82fc2d81c3ec 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "cereal"; - version = "0.2"; - sha256 = "aa00eb88cea5616a0eb9e4b6604cb164b8bef6e86b111cbb67d51d4d3441332b"; + version = "0.3.3.0"; + sha256 = "0bqd5qfvbz77mq0zxgafj011hrxcanrfzvlwhf4j4dzr6yryk53y"; meta = { description = "A binary serialization library"; license = "BSD"; diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix new file mode 100644 index 000000000000..9d91ac477e7a --- /dev/null +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "clientsession"; + version = "0.6.0"; + sha256 = "0h92jjkhldn7f9b78cajfda8rprsj5scdsyl3pjpzicpvvy9g00y"; + meta = { + description = "Store session data in a cookie"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix new file mode 100644 index 000000000000..750c4de28abb --- /dev/null +++ b/pkgs/development/libraries/haskell/cookie/default.nix @@ -0,0 +1,14 @@ +{cabal, blazeBuilder, text}: + +cabal.mkDerivation (self : { + pname = "cookie"; + version = "0.2.1"; + sha256 = "0jn4as09qx2948k0r916vy5igz0xmrvng37s0il81b0ndvhnsc6c"; + propagatedBuildInputs = [blazeBuilder text]; + meta = { + description = "HTTP cookie parsing and rendering"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix new file mode 100644 index 000000000000..30a46369df63 --- /dev/null +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -0,0 +1,14 @@ +{cabal, baseUnicodeSymbols, transformers}: + +cabal.mkDerivation (self : { + pname = "monad-control"; + version = "0.2.0.1"; + sha256 = "1pnckk9080g64ipvsg3n1vn4jr1083giacgy58if2ppw3dk7m97k"; + propagatedBuildInputs = [baseUnicodeSymbols transformers]; + meta = { + description = "Lift control operations, like exception catching, through monad transformers"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix new file mode 100644 index 000000000000..9b2ea52ed43a --- /dev/null +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -0,0 +1,18 @@ +{cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive, enumerator, + httpTypes, network, text, transformers, wai, zlibBindings}: + +cabal.mkDerivation (self : { + pname = "wai-extra"; + version = "0.4.0.1"; + sha256 = "0xj7dkwqa9axgm6cizf2kd97fakbmq5580mian888i5f21jn1n2z"; + propagatedBuildInputs = [ + blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator + httpTypes network text transformers wai zlibBindings + ]; + meta = { + description = "Provides some basic WAI handlers and middleware"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix index 8d0303d65bb4..434a19cfcfea 100644 --- a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix +++ b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix @@ -1,13 +1,13 @@ -{cabal, webRoutes}: +{cabal, text}: cabal.mkDerivation (self : { pname = "web-routes-quasi"; - version = "0.5.0"; - sha256 = "07ef2717b44f92bccee9af4b4d9a173c12ec3b3b1d49a8495811dad0af240673"; - propagatedBuildInputs = [webRoutes]; + version = "0.7.0.1"; + sha256 = "1khrf5kbw285hddyyzcz2mx4qpz46mdmlm31jszag2ay64gw35gw"; + propagatedBuildInputs = [text]; meta = { description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL"; - license = "BSD"; + license = "BSD3"; maintainers = [self.stdenv.lib.maintainers.andres]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix new file mode 100644 index 000000000000..4c9634bf759b --- /dev/null +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -0,0 +1,20 @@ +{cabal, blazeBuilder, blazeHtml, caseInsensitive, cereal, clientsession, + cookie, enumerator, failure, hamlet, httpTypes, monadControl, parsec, + text, transformers, wai, waiExtra, webRoutesQuasi}: + +cabal.mkDerivation (self : { + pname = "yesod-core"; + version = "0.8.2"; + sha256 = "15h5nm45w3z1g4ayn0dj9grviqm857krad1453rway76yrrv7xsr"; + propagatedBuildInputs = [ + blazeBuilder blazeHtml caseInsensitive cereal clientsession + cookie enumerator failure hamlet httpTypes monadControl parsec + text transformers wai waiExtra webRoutesQuasi + ]; + meta = { + description = "Creation of type-safe, RESTful web applications"; + license = "BSD3"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix new file mode 100644 index 000000000000..efe5e4134a81 --- /dev/null +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -0,0 +1,14 @@ +{cabal, zlib}: + +cabal.mkDerivation (self : { + pname = "zlib-bindings"; + version = "0.0.0"; + sha256 = "168sll6mrmcnvdmdx79izqxcrli1s7asp4qilhkqss8w0jlrv1ni"; + propagatedBuildInputs = [zlib]; + meta = { + description = "Low-level bindings to the zlib package"; + 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 fac80af01c75..a95e6d34df2b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -335,6 +335,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec/enumerator.nix {}; + baseUnicodeSymbols = callPackage ../development/libraries/haskell/base-unicode-symbols {}; + benchpress = callPackage ../development/libraries/haskell/benchpress {}; bimap = callPackage ../development/libraries/haskell/bimap {}; @@ -379,6 +381,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {}; + clientsession = callPackage ../development/libraries/haskell/clientsession {}; + cmdargs = callPackage ../development/libraries/haskell/cmdargs {}; colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {}; @@ -391,6 +395,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); time = self.time_1_1_3; }; + cookie = callPackage ../development/libraries/haskell/cookie {}; + criterion = callPackage ../development/libraries/haskell/criterion { parsec = self.parsec3; }; @@ -669,6 +675,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {}; + monadControl = callPackage ../development/libraries/haskell/monad-control {}; + monadlab = callPackage ../development/libraries/haskell/monadlab {}; monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; @@ -973,6 +981,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); wai = callPackage ../development/libraries/haskell/wai {}; + waiExtra = callPackage ../development/libraries/haskell/wai-extra {}; + warp = callPackage ../development/libraries/haskell/warp {}; WebBits = callPackage ../development/libraries/haskell/WebBits { @@ -1032,6 +1042,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; + yesodCore = callPackage ../development/libraries/haskell/yesod-core {}; + yst = callPackage ../development/libraries/haskell/yst {}; zipArchive = callPackage ../development/libraries/haskell/zip-archive {}; @@ -1052,6 +1064,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_0_0; + zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; + # Compilers. AgdaExecutable = callPackage ../development/compilers/Agda-executable {};