diff options
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 73 |
1 files changed, 43 insertions, 30 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index db364b9a58d8..a2bd99a7ca93 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -147,8 +147,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in aesonQq = callPackage ../development/libraries/haskell/aeson-qq {}; - alternativeIo = callPackage ../development/libraries/haskell/alternative-io {}; - alsaCore = callPackage ../development/libraries/haskell/alsa-core {}; alsaMixer = callPackage ../development/libraries/haskell/alsa-mixer {}; @@ -195,7 +193,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {}; attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {}; - attoparsec = self.attoparsec_0_11_3_4; + attoparsec_0_12_0_0 = callPackage ../development/libraries/haskell/attoparsec/0.12.0.0.nix {}; + attoparsec = self.attoparsec_0_12_0_0; attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; @@ -324,9 +323,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {}; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {}; Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {}; - Cabal_1_20_0_0 = callPackage ../development/libraries/haskell/Cabal/1.20.0.0.nix {}; + Cabal_1_20_0_1 = callPackage ../development/libraries/haskell/Cabal/1.20.0.1.nix {}; Cabal = null; # core package since forever + cabalCargs = callPackage ../development/libraries/haskell/cabal-cargs {}; + cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; cabalLenses = callPackage ../development/libraries/haskell/cabal-lenses {}; @@ -1022,10 +1023,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; - HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix { network = self.network_2_4_1_2; }; + HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; - HTTP_4000_2_15 = callPackage ../development/libraries/haskell/HTTP/4000.2.15.nix {}; - HTTP = self.HTTP_4000_2_15; + HTTP_4000_2_17 = callPackage ../development/libraries/haskell/HTTP/4000.2.17.nix {}; + HTTP = self.HTTP_4000_2_17; httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; @@ -1399,6 +1400,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {}; + MFlow = callPackage ../development/libraries/haskell/MFlow {}; + midi = callPackage ../development/libraries/haskell/midi {}; mime = callPackage ../development/libraries/haskell/mime {}; @@ -1480,12 +1483,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in msgpack = callPackage ../development/libraries/haskell/msgpack {}; mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; - mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {}; mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {}; mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {}; mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {}; - mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {}; - mtl_2_2_0_1 = callPackage ../development/libraries/haskell/mtl/2.2.0.1.nix {}; + mtl_2_2_1 = callPackage ../development/libraries/haskell/mtl/2.2.1.nix {}; mtl = null; # tightly coupled with 'transformers' which is a core package mtlparse = callPackage ../development/libraries/haskell/mtlparse {}; @@ -1643,8 +1644,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parsec = self.parsec_3_1_5; parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; - parsers_0_11_0_1 = callPackage ../development/libraries/haskell/parsers/0.11.0.1.nix {}; - parsers = self.parsers_0_11_0_1; + parsers_0_11_0_2 = callPackage ../development/libraries/haskell/parsers/0.11.0.2.nix {}; + parsers = self.parsers_0_11_0_2; parsimony = callPackage ../development/libraries/haskell/parsimony {}; @@ -1787,8 +1788,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; - QuickCheck_2_7_3 = callPackage ../development/libraries/haskell/QuickCheck/2.7.3.nix {}; - QuickCheck = self.QuickCheck_2_7_3; + QuickCheck_2_7_5 = callPackage ../development/libraries/haskell/QuickCheck/2.7.5.nix {}; + QuickCheck = self.QuickCheck_2_7_5; quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {}; @@ -1837,6 +1838,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in reflection = callPackage ../development/libraries/haskell/reflection {}; + RefSerialize = callPackage ../development/libraries/haskell/RefSerialize {}; + regexApplicative = callPackage ../development/libraries/haskell/regex-applicative {}; regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {}; @@ -1935,9 +1938,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {}; shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {}; - shelly = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") - then self.shelly_0_15_4_1 - else self.shelly_1_5_3_1; + shelly = self.shelly_1_5_3_1; simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {}; @@ -2157,6 +2158,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in tastyTh = callPackage ../development/libraries/haskell/tasty-th {}; + TCache = callPackage ../development/libraries/haskell/TCache {}; + templateDefault = callPackage ../development/libraries/haskell/template-default {}; temporary = callPackage ../development/libraries/haskell/temporary {}; @@ -2183,6 +2186,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in testFrameworkQuickcheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {}; + testFrameworkSmallcheck = callPackage ../development/libraries/haskell/test-framework-smallcheck {}; + testFrameworkTh = callPackage ../development/libraries/haskell/test-framework-th {}; testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {}; @@ -2194,12 +2199,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in 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_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {}; text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {}; - text_1_1_1_2 = callPackage ../development/libraries/haskell/text/1.1.1.2.nix {}; - text = self.text_1_1_1_2; + text_1_1_1_3 = callPackage ../development/libraries/haskell/text/1.1.1.3.nix {}; + text = self.text_1_1_1_3; textFormat = callPackage ../development/libraries/haskell/text-format {}; @@ -2267,7 +2271,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; - transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {}; + transformersCompat_0_3_3 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.nix {}; + transformersCompat_0_3_3_4 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.4.nix {}; + transformersCompat = self.transformersCompat_0_3_3_4; transformersFree = callPackage ../development/libraries/haskell/transformers-free {}; @@ -2372,8 +2378,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vect = callPackage ../development/libraries/haskell/vect {}; vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; - vector_0_10_9_2 = callPackage ../development/libraries/haskell/vector/0.10.9.2.nix {}; - vector = self.vector_0_10_9_2; + vector_0_10_9_3 = callPackage ../development/libraries/haskell/vector/0.10.9.3.nix {}; + vector_0_10_11_0 = callPackage ../development/libraries/haskell/vector/0.10.11.0.nix {}; + vector = self.vector_0_10_11_0; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; @@ -2391,7 +2398,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in void = callPackage ../development/libraries/haskell/void {}; - vty = callPackage ../development/libraries/haskell/vty {}; + vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {}; + vty_5_1_0 = callPackage ../development/libraries/haskell/vty/5.1.0.nix {}; + vty = self.vty_4_7_5; vtyUi = callPackage ../development/libraries/haskell/vty-ui {}; @@ -2443,6 +2452,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in word8 = callPackage ../development/libraries/haskell/word8 {}; + Workflow = callPackage ../development/libraries/haskell/Workflow {}; + wreq = callPackage ../development/libraries/haskell/wreq {}; wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {}; @@ -2631,7 +2642,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hlint = callPackage ../development/tools/haskell/hlint {}; hscolour = callPackage ../development/tools/haskell/hscolour {}; - hscolourBootstrap = self.hscolour.override { hyperlinkSource = false; }; + hscolourBootstrap = self.hscolour.override { + cabal = self.cabal.override { + extension = self : super : { hyperlinkSource = false; }; + }; + }; hslogger = callPackage ../development/tools/haskell/hslogger {}; @@ -2682,6 +2697,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Tools. + cabalDb = callPackage ../development/tools/haskell/cabal-db {}; + cabal2nix = callPackage ../development/tools/haskell/cabal2nix {}; # Build a cabal package given a local .cabal file @@ -2715,10 +2732,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in else self.Cabal_1_18_1_3; }; - cabalDev = callPackage ../development/tools/haskell/cabal-dev { - HTTP = self.HTTP.override { network = self.network_2_4_1_2; }; - }; - cabalMeta = callPackage ../development/tools/haskell/cabal-meta {}; cabal2Ghci = callPackage ../development/tools/haskell/cabal2ghci {}; @@ -2732,7 +2745,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_0; }; + cabalInstall_1_20_0_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_1; }; cabalInstall = self.cabalInstall_1_20_0_2; codex = callPackage ../development/tools/haskell/codex {}; |