diff options
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 44 |
1 files changed, 36 insertions, 8 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 87448499a425d..15cb3336262d7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -154,7 +154,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok HTTP = self.HTTP_4000_2_2; # 7.2 ok, 7.3 ok deepseq = self.deepseq_1_1_0_2; # 7.2 ok, 7.3 ok - text = self.text_0_11_1_12; # 7.2 ok, 7.3 ok + text = self.text_0_11_1_13; # 7.2 ok, 7.3 ok transformers = self.transformers_0_2_2_0; # 7.2 ok, 7.3 ok mtl = self.mtl_2_0_1_0; # 7.2 ok, 7.3 ok random = self.random_1_0_1_1; # 7.2 ok, 7.3 ok @@ -625,6 +625,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); downloadCurl = callPackage ../development/libraries/haskell/download-curl { tagsoup = self.tagsoup_0_10_1; }; + DSH = callPackage ../development/libraries/haskell/DSH { + json = self.json_0_5; + }; + dstring = callPackage ../development/libraries/haskell/dstring {}; editline = callPackage ../development/libraries/haskell/editline {}; @@ -650,6 +654,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); fclabels = callPackage ../development/libraries/haskell/fclabels {}; + FerryCore = callPackage ../development/libraries/haskell/FerryCore {}; + funcmp = callPackage ../development/libraries/haskell/funcmp {}; feed = callPackage ../development/libraries/haskell/feed {}; @@ -677,7 +683,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; - ghcMod = callPackage ../development/libraries/haskell/ghc-mod {}; + ghcMod = callPackage ../development/libraries/haskell/ghc-mod { + emacsPackages = pkgs.emacs23Packages; + }; ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {}; @@ -842,6 +850,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HsSyck = callPackage ../development/libraries/haskell/HsSyck {}; + HsOpenSSL = callPackage ../development/libraries/haskell/HsOpenSSL {}; + HStringTemplate = callPackage ../development/libraries/haskell/HStringTemplate {}; hspread = callPackage ../development/libraries/haskell/hspread {}; @@ -904,7 +914,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; - languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; + languageJavascript = callPackage ../development/libraries/haskell/language-javascript { + alex = self.alex_3_0_1; + }; languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {}; @@ -981,7 +993,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); murmurHash = callPackage ../development/libraries/haskell/murmur-hash {}; - mwcRandom = callPackage ../development/libraries/haskell/mwc-random {}; + mwcRandom_0_10_0_1 = callPackage ../development/libraries/haskell/mwc-random/0.10.0.1.nix {}; + mwcRandom_0_11_0_0 = callPackage ../development/libraries/haskell/mwc-random/0.11.0.0.nix {}; + mwcRandom = self.mwcRandom_0_11_0_0; NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; @@ -1048,6 +1062,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parsimony = callPackage ../development/libraries/haskell/parsimony {}; + Pathfinder = callPackage ../development/libraries/haskell/Pathfinder {}; + pathtype = callPackage ../development/libraries/haskell/pathtype {}; pcreLight = callPackage ../development/libraries/haskell/pcre-light {}; @@ -1062,6 +1078,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pool = callPackage ../development/libraries/haskell/pool {}; + poolConduit = callPackage ../development/libraries/haskell/pool-conduit {}; + ppm = callPackage ../development/libraries/haskell/ppm {}; prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; @@ -1162,6 +1180,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); repr = callPackage ../development/libraries/haskell/repr {}; + resourcePool = callPackage ../development/libraries/haskell/resource-pool {}; + RSA = callPackage ../development/libraries/haskell/RSA {}; safe = callPackage ../development/libraries/haskell/safe {}; @@ -1176,7 +1196,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; - snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; + snapCore = callPackage ../development/libraries/haskell/snap/core.nix { + mwcRandom = self.mwcRandom_0_10_0_1; + }; snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; @@ -1256,6 +1278,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); systemFileio = callPackage ../development/libraries/haskell/system-fileio {}; + TableAlgebra = callPackage ../development/libraries/haskell/TableAlgebra {}; + tabular = callPackage ../development/libraries/haskell/tabular {}; tagged = callPackage ../development/libraries/haskell/tagged {}; @@ -1287,8 +1311,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; - text_0_11_1_12 = callPackage ../development/libraries/haskell/text/0.11.1.12.nix {}; - text = self.text_0_11_1_12; + text_0_11_1_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {}; + text = self.text_0_11_1_13; thespian = callPackage ../development/libraries/haskell/thespian {}; @@ -1493,7 +1517,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); alex_2_3_3 = callPackage ../development/tools/parsing/alex/2.3.3.nix {}; alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {}; alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {}; - alex = self.alex_2_3_1; + alex = self.alex_3_0_1; alexMeta = callPackage ../development/tools/haskell/alex-meta {}; @@ -1503,6 +1527,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cpphs = callPackage ../development/tools/misc/cpphs {}; + ebnf2ps = callPackage ../development/tools/parsing/ebnf2ps { + inherit (pkgs) fetchurl; + }; + frown = callPackage ../development/tools/parsing/frown {}; haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {}; |