diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
commit | 6dc839d3445e66b259361f08838a8c05b1912e68 (patch) | |
tree | 5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/top-level/haskell-packages.nix | |
parent | 4309788df022c89765cd7f6b178f4ce7a08db600 (diff) | |
parent | 327a2eae30b48277bd453842d03a144f618822b2 (diff) | |
download | nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2 nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip |
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 15b41b6f3def..4e28d7d57b54 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -50,6 +50,10 @@ rec { blazeHtml = callPackage ../development/libraries/haskell/blaze-html {}; + bktrees = callPackage ../development/libraries/haskell/bktrees {}; + + Boolean = callPackage ../development/libraries/haskell/Boolean {}; + bytestring = callPackage ../development/libraries/haskell/bytestring {}; networkBytestring = callPackage ../development/libraries/haskell/network-bytestring {}; @@ -76,6 +80,8 @@ rec { colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {}; + colour = callPackage ../development/libraries/haskell/colour {}; + ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; convertible = callPackage ../development/libraries/haskell/convertible { @@ -190,6 +196,14 @@ rec { happy = happy_1_18_5; }; + Graphalyze = callPackage ../development/libraries/haskell/Graphalyze { + fgl = fgl_5_4_2_3; + }; + + graphviz = callPackage ../development/libraries/haskell/graphviz { + fgl = fgl_5_4_2_3; + }; + hakyll = callPackage ../development/libraries/haskell/hakyll { regexBase = regexBase_0_93_2; network = network_2_2_1_7; @@ -373,6 +387,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 +646,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; |