diff options
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 44 |
1 files changed, 32 insertions, 12 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 47350533aeab..11615bc3e5ed 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -142,7 +142,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellPlatformArgs_future = self : { inherit (self) cabal ghc; async = self.async_2_0_1_5; - attoparsec = self.attoparsec_0_10_4_0; + attoparsec = self.attoparsec_0_11_1_0; caseInsensitive = self.caseInsensitive_1_1_0_2; cgi = self.cgi_3001_1_8_4; fgl = self.fgl_5_4_2_4; @@ -154,11 +154,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x HTTP = self.HTTP_4000_2_10; HUnit = self.HUnit_1_2_5_2; mtl = self.mtl_2_1_2; - network = self.network_2_4_2_1; + network = self.network_2_4_2_2; OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw = self.OpenGLRaw_1_4_0_0; parallel = self.parallel_3_2_0_4; - parsec = self.parsec_3_1_4; + parsec = self.parsec_3_1_5; QuickCheck = self.QuickCheck_2_6; random = self.random_1_0_1_1; regexBase = self.regexBase_0_93_2; @@ -167,7 +167,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x split = self.split_0_2_2; stm = self.stm_2_4_2; syb = self.syb_0_4_1; - text = self.text_1_0_0_0; + text = self.text_1_1_0_0; transformers = self.transformers_0_3_0_0; # this has become a core package in GHC 7.7 unorderedContainers = self.unorderedContainers_0_2_3_3; vector = self.vector_0_10_9_1; @@ -530,6 +530,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x alsaCore = callPackage ../development/libraries/haskell/alsa-core {}; + alsaMixer = callPackage ../development/libraries/haskell/alsa-mixer {}; + alsaPcm = callPackage ../development/libraries/haskell/alsa-pcm {}; amqp = callPackage ../development/libraries/haskell/amqp {}; @@ -566,6 +568,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x attempt = callPackage ../development/libraries/haskell/attempt {}; attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; + attoparsec_0_11_1_0 = callPackage ../development/libraries/haskell/attoparsec/0.11.1.0.nix {}; attoparsec = self.attoparsec_0_10_4_0; attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; @@ -767,6 +770,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x concatenative = callPackage ../development/libraries/haskell/concatenative {}; + concreteTyperep = callPackage ../development/libraries/haskell/concreteTyperep {}; + conduit = callPackage ../development/libraries/haskell/conduit {}; ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; @@ -841,6 +846,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x dataAccessorTransformers = callPackage ../development/libraries/haskell/data-accessor/data-accessor-transformers.nix {}; + dataAccessorMtl = callPackage ../development/libraries/haskell/data-accessor/data-accessor-mtl.nix {}; + dataBinaryIeee754 = callPackage ../development/libraries/haskell/data-binary-ieee754 {}; dataDefault = callPackage ../development/libraries/haskell/data-default {}; @@ -1123,6 +1130,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x glossAccelerate = callPackage ../development/libraries/haskell/gloss-accelerate {}; + glossRaster = callPackage ../development/libraries/haskell/gloss-raster {}; + glossRasterAccelerate = callPackage ../development/libraries/haskell/gloss-raster-accelerate {}; glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; @@ -1641,8 +1650,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {}; network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {}; - network_2_4_2_1 = callPackage ../development/libraries/haskell/network/2.4.2.1.nix {}; - network = self.network_2_4_2_1; + network_2_4_2_2 = callPackage ../development/libraries/haskell/network/2.4.2.2.nix {}; + network = self.network_2_4_2_2; networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {}; @@ -1736,9 +1745,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parsec_3_1_1 = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {}; parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {}; parsec_3_1_3 = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {}; - parsec_3_1_4 = callPackage ../development/libraries/haskell/parsec/3.1.4.nix {}; + parsec_3_1_5 = callPackage ../development/libraries/haskell/parsec/3.1.5.nix {}; parsec2 = self.parsec_2_1_0_1; - parsec3 = self.parsec_3_1_4; + parsec3 = self.parsec_3_1_5; parsec = self.parsec3; parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {}; @@ -1795,10 +1804,17 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x pointed = callPackage ../development/libraries/haskell/pointed {}; + pointedlist = callPackage ../development/libraries/haskell/pointedlist {}; + poolConduit = callPackage ../development/libraries/haskell/pool-conduit {}; pop3client = callPackage ../development/libraries/haskell/pop3-client {}; + poppler = callPackage ../development/libraries/haskell/poppler { + popplerGlib = pkgs.poppler.poppler_glib; + libc = pkgs.stdenv.gcc.libc; + }; + postgresqlLibpq = callPackage ../development/libraries/haskell/postgresql-libpq { inherit (pkgs) postgresql; }; @@ -1810,10 +1826,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x prettyclass = callPackage ../development/libraries/haskell/prettyclass {}; prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_3 = callPackage ../development/libraries/haskell/pretty-show/1.6.3.nix { + prettyShow_1_6_5 = callPackage ../development/libraries/haskell/pretty-show/1.6.5.nix { happy = self.happy_1_19_2; }; - prettyShow = self.prettyShow_1_6_3; + prettyShow = self.prettyShow_1_6_5; punycode = callPackage ../development/libraries/haskell/punycode {}; @@ -2206,8 +2222,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x 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_0_0_0 = callPackage ../development/libraries/haskell/text/1.0.0.0.nix {}; - text = self.text_1_0_0_0; + text_1_1_0_0 = callPackage ../development/libraries/haskell/text/1.1.0.0.nix {}; + text = self.text_1_1_0_0; textFormat = callPackage ../development/libraries/haskell/text-format {}; @@ -2599,6 +2615,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x QuickCheck = self.QuickCheck2; }; + yi = callPackage ../applications/editors/yi/yi.nix {}; + + yiContrib = callPackage ../applications/editors/yi/yi-contrib.nix {}; + xmobar = callPackage ../applications/misc/xmobar {}; xmonad = callPackage ../applications/window-managers/xmonad {}; |