diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix new file mode 100644 index 000000000000..664ea6039951 --- /dev/null +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "Boolean"; + version = "0.0.1"; + sha256 = "dafcfb2e9d7f7aa24a3d3ceb385424176297cdf6f6044028d42d0fea1cae7765"; + meta = { + description = "Generalized booleans"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix new file mode 100644 index 000000000000..f826d0b13e08 --- /dev/null +++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "MemoTrie"; + version = "0.4.9"; + sha256 = "f17dd0b73c1a11a6edb38fb6f457b9687f2e93aa4677e90f7ec482a528ac02e7"; + meta = { + description = "Trie-based memo functions"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix new file mode 100644 index 000000000000..d502bfcbf8a7 --- /dev/null +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -0,0 +1,14 @@ +{cabal, Boolean, MemoTrie}: + +cabal.mkDerivation (self : { + pname = "vector-space"; + version = "0.5.9"; + sha256 = "39045384ee1f37f92fc8a84b75eb63091d083298f7be5f51f81112dd42a553b0"; + propagatedBuildInputs = [Boolean MemoTrie]; + meta = { + description = "Vector & affine spaces, linear maps, and derivatives"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index a38ee70ce34b..46f39d1e0a69 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -1,10 +1,11 @@ -{cabal, utf8String, terminfo}: +{cabal, utf8String, terminfo, deepseq, mtl, parallel, parsec, vectorSpace}: cabal.mkDerivation (self : { pname = "vty"; - version = "3.1.8.4"; - sha256 = "9a006e77bb4f032613e059eea7bc4d92cbc7943449fb9c7269a061ddd9b3d82b"; - propagatedBuildInputs = [utf8String terminfo]; + version = "4.4.0.0"; + sha256 = "bf032022a72831e263d2d48d0a7a3191fb1174554cd714902a60cb0f39afe312"; + propagatedBuildInputs = + [utf8String terminfo deepseq mtl parallel parsec vectorSpace]; meta = { description = "A simple terminal access library"; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 15b41b6f3def..79c07da69450 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -50,6 +50,8 @@ rec { blazeHtml = callPackage ../development/libraries/haskell/blaze-html {}; + Boolean = callPackage ../development/libraries/haskell/Boolean {}; + bytestring = callPackage ../development/libraries/haskell/bytestring {}; networkBytestring = callPackage ../development/libraries/haskell/network-bytestring {}; @@ -373,6 +375,8 @@ rec { MaybeTTransformers = callPackage ../development/libraries/haskell/MaybeT-transformers {}; + MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {}; + MissingH = callPackage ../development/libraries/haskell/MissingH { network = network_2_2_1_7; }; @@ -630,7 +634,11 @@ rec { vector = callPackage ../development/libraries/haskell/vector {}; - vty = callPackage ../development/libraries/haskell/vty {}; + vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; + + vty = callPackage ../development/libraries/haskell/vty { + parallel = parallel_2_2_0_1; + }; webRoutes = callPackage ../development/libraries/haskell/web-routes { network = network_2_2_1_7;