diff options
27 files changed, 252 insertions, 18 deletions
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix index 9fa0690ad6b7e..0b0b04b2a9017 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "GLUT"; - version = "2.1.2.1"; # Haskell Platform 2010.1.0.0 + version = "2.1.2.1"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 sha256 = "0230bfacbfb85c126f1fba45fcd8d02f20da9ee19180b5ada698224362d17264"; propagatedBuildInputs = [OpenGL glut libSM libICE libXmu libXi mesa]; meta = { diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix index 0600a957883b1..23b09543707c2 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "HTTP"; - version = "4000.0.9"; # Haskell Platform 2010.1.0.0 + version = "4000.0.9"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba"; propagatedBuildInputs = [mtl network parsec]; meta = { diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix index 9f52ed4048f67..a2cd4665e7904 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "HUnit"; - version = "1.2.2.1"; # Haskell Platform 2010.1.0.0 + version = "1.2.2.1"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853"; meta = { description = "A unit testing framework for Haskell"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix index e3cb4bdf4e615..46e0fd0dad752 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "OpenGL"; - version = "2.2.3.0"; # Haskell Platform 2010.1.0.0 + version = "2.2.3.0"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 sha256 = "a75c3277bb20fda9a4ac1eb0e838fe4b5baf92f5539466b92bd255626afb0502"; propagatedBuildInputs = [mesa libX11]; meta = { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix new file mode 100644 index 0000000000000..6ad15d1538040 --- /dev/null +++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix @@ -0,0 +1,14 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "QuickCheck"; + version = "2.1.0.3"; # Haskell Platform 2010.1.0.0 + sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1"; + propagatedBuildInputs = [mtl]; + meta = { + description = "Automatic testing of Haskell programs"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix b/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix index 6ad15d1538040..f4463394ea151 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "QuickCheck"; - version = "2.1.0.3"; # Haskell Platform 2010.1.0.0 - sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1"; + version = "2.1.1.1"; # Haskell Platform 2010.2.0.0 + sha256 = "626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9"; propagatedBuildInputs = [mtl]; meta = { description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix new file mode 100644 index 0000000000000..d425e84d692a6 --- /dev/null +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix @@ -0,0 +1,12 @@ +{cabal, mtl, network, parsec, xhtml}: + +cabal.mkDerivation (self : { + pname = "cgi"; + version = "3001.1.7.3"; # Haskell Platform 2010.2.0.0 + sha256 = "f1f4bc6b06e8a191db4ddb43617fee3ef37635e380d6a17c29efb5641ce91df0"; + propagatedBuildInputs = [mtl network parsec xhtml]; + meta = { + description = "A library for writing CGI programs"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/deepseq/default.nix b/pkgs/development/libraries/haskell/deepseq/default.nix index 6658f86de7532..eb84d629fdb1c 100644 --- a/pkgs/development/libraries/haskell/deepseq/default.nix +++ b/pkgs/development/libraries/haskell/deepseq/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "deepseq"; - version = "1.1.0.0"; # Haskell Platform 2010.1.0.0 + version = "1.1.0.0"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 sha256 = "947c45e7ee862159f190fb8e905c1328f7672cb9e6bf3abd1d207bbcf1eee50a"; meta = { description = "Provides a deep version of seq, for fully evaluating data structures"; diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix new file mode 100644 index 0000000000000..0c326683a4f0c --- /dev/null +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix @@ -0,0 +1,12 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "fgl"; + version = "5.4.2.3"; # Haskell Platform 2010.2.0.0 + sha256 = "e72142b555a5ab6c5cdced317b42e8cafdbb54b7e2e46ed14e6ca18d71d486b8"; + propagatedBuildInputs = [mtl]; + meta = { + description = "Martin Erwig's Functional Graph Library"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix new file mode 100644 index 0000000000000..95ee5e6beb3c6 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix @@ -0,0 +1,22 @@ +{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, + haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix, + stm, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}: + +cabal.mkDerivation (self : { + pname = "haskell-platform"; + version = "2010.2.0.0"; + src = fetchurl { + url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; + sha256 = "b0f4e6827d653f68865f39679c7c4fd5c22030ef5d7d24df3270aa6db4b016d4"; + }; + propagatedBuildInputs = [ + GLUT HTTP HUnit OpenGL QuickCheck cgi fgl + haskellSrc html network parallel regexBase regexCompat regexPosix + stm xhtml zlib cabalInstall alex happy ghc haddock + ]; + meta = { + description = "Haskell Platform meta package"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/haskell-src/default.nix b/pkgs/development/libraries/haskell/haskell-src/default.nix index 365138b28a766..0cc7e888a200a 100644 --- a/pkgs/development/libraries/haskell/haskell-src/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "haskell-src"; - version = "1.0.1.3"; # Haskell Platform 2009.0.0 + version = "1.0.1.3"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0 sha256 = "a7872900acd2293775a6bdc6dc8f70438ccd80e62d2d1e2394ddff15b1883e89"; extraBuildInputs = [happy]; meta = { diff --git a/pkgs/development/libraries/haskell/html/default.nix b/pkgs/development/libraries/haskell/html/default.nix index 024985c82699c..3540d397778f8 100644 --- a/pkgs/development/libraries/haskell/html/default.nix +++ b/pkgs/development/libraries/haskell/html/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "html"; - version = "1.0.1.2"; # Haskell Platform 2009.0.0 + version = "1.0.1.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0 sha256 = "0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061"; meta = { description = "HTML combinator library"; diff --git a/pkgs/development/libraries/haskell/mtl/default.nix b/pkgs/development/libraries/haskell/mtl/default.nix index 6c8b1cf960d7a..f06f92976b3b1 100644 --- a/pkgs/development/libraries/haskell/mtl/default.nix +++ b/pkgs/development/libraries/haskell/mtl/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "mtl"; - version = "1.1.0.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0 + version = "1.1.0.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0 sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36"; meta = { description = "Monad transformer library"; diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix index e04af7a932b49..6c740b0ef05c5 100644 --- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix +++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "network"; - version = "2.2.1.7"; # Haskell Platform 2010.1.0.0 + version = "2.2.1.7"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 sha256 = "0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58"; propagatedBuildInputs = [parsec]; meta = { diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix index 38ec8247076e3..7cec49c9e5314 100644 --- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "parallel"; - version = "2.2.0.1"; # Haskell Platform 2010.1.0.0 + version = "2.2.0.1"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 sha256 = "255310023138ecf618c8b450203fa2fc65feb68cd08ee4d369ceae72054168fd"; propagatedBuildInputs = [deepseq]; meta = { diff --git a/pkgs/development/libraries/haskell/parsec/default.nix b/pkgs/development/libraries/haskell/parsec/default.nix index b0dcf5ef0e469..8b8827bfa06c1 100644 --- a/pkgs/development/libraries/haskell/parsec/default.nix +++ b/pkgs/development/libraries/haskell/parsec/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "parsec"; - version = "2.1.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0 + version = "2.1.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0 sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df"; meta = { description = "Monadic parser combinators"; diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix new file mode 100644 index 0000000000000..3f9d23e953339 --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix @@ -0,0 +1,12 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "regex-base"; + version = "0.93.2"; # Haskell Platform 2010.2.0.0 + sha256 = "20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278"; + propagatedBuildInputs = [mtl]; + meta = { + description = "Replaces/Ehances Text.Regex"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix new file mode 100644 index 0000000000000..749e6baaf7364 --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix @@ -0,0 +1,12 @@ +{cabal, regexBase, regexPosix}: + +cabal.mkDerivation (self : { + pname = "regex-compat"; + version = "0.93.1"; # Haskell Platform 2010.2.0.0 + sha256 = "ee0374f780378e8c04a63d9cbaca525e116dbe2bdce4cff3abaffc28d4e99afe"; + propagatedBuildInputs = [regexBase regexPosix]; + meta = { + description = "Replaces/Enhances Text.Regex"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix new file mode 100644 index 0000000000000..871805c63f0c3 --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix @@ -0,0 +1,12 @@ +{cabal, regexBase}: + +cabal.mkDerivation (self : { + pname = "regex-posix"; + version = "0.94.2"; # Haskell Platform 2010.2.0.0 + sha256 = "ea0c1ed0ab49ade4dba1eea7a42197652ccb18b7a98c4040e37ba11d26f33067"; + propagatedBuildInputs = [regexBase]; + meta = { + description = "Replaces/Enhances Text.Regex"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix new file mode 100644 index 0000000000000..976f0054a4a7c --- /dev/null +++ b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix @@ -0,0 +1,11 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "stm"; + version = "2.1.2.1"; # Haskell Platform 2010.2.0.0 + sha256 = "0d7d8babd2f07c726909030461e1f9b3aaf02dc809fd5e1c0509a67d23b784b8"; + meta = { + description = "Software Transactional Memory"; + }; +}) + diff --git a/pkgs/development/libraries/haskell/xhtml/default.nix b/pkgs/development/libraries/haskell/xhtml/default.nix index c09ed444d3e09..78dc8486a813a 100644 --- a/pkgs/development/libraries/haskell/xhtml/default.nix +++ b/pkgs/development/libraries/haskell/xhtml/default.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "xhtml"; - version = "3000.2.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0 + version = "3000.2.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0 sha256 = "60d7a44ae6d607475e2d60c5bf9909b8a3bd88850d52b08ff1532aa6d58bec96"; meta = { description = "An XHTML combinator library"; diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix index d97e18ccf2300..80bf428c70609 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "zlib"; - version = "0.5.2.0"; # Haskell Platform 2010.1.0.0 + version = "0.5.2.0"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 sha256 = "4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f"; # TODO: find out exactly why propagated is needed here (to build other # packages depending on zlib): diff --git a/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix b/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix index dcc41ce92383d..70dcf61d78c7c 100644 --- a/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix +++ b/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix @@ -2,7 +2,7 @@ cabal.mkDerivation (self : { pname = "haddock"; - version = "2.7.2"; # Haskell Platform 2010.1.0.0 + version = "2.7.2"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 name = self.fname; sha256 = "4eaaaf62785f0ba3d37ba356cfac4679faef91c0902d8cdbf42837cbe5daab82"; extraBuildInputs = [alex happy]; diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix new file mode 100644 index 0000000000000..7f6186970faea --- /dev/null +++ b/pkgs/development/tools/parsing/alex/2.3.3.nix @@ -0,0 +1,12 @@ +{cabal, perl}: + +cabal.mkDerivation (self : { + pname = "alex"; + version = "2.3.3"; # Haskell Platform 2010.2.0.0 + name = self.fname; + sha256 = "338fc492a1fddd6c528d0eb89857cadab211cb42680aeee1f9702bbfa7c5e1c8"; + extraBuildInputs = [perl]; + meta = { + description = "A lexical analyser generator for Haskell"; + }; +}) diff --git a/pkgs/development/tools/parsing/happy/happy-1.18.5.nix b/pkgs/development/tools/parsing/happy/happy-1.18.5.nix new file mode 100644 index 0000000000000..c3cd406f127bc --- /dev/null +++ b/pkgs/development/tools/parsing/happy/happy-1.18.5.nix @@ -0,0 +1,13 @@ +{cabal, mtl, perl}: + +cabal.mkDerivation (self : { + pname = "happy"; + version = "1.18.5"; # Haskell Platform 2010.2.0.0 + name = self.fname; + sha256 = "91e1c29ac42bc5cabcac2c2e28e693fc59fbdf30636e5c52cb51b779a74d755e"; + extraBuildInputs = [perl]; + propagatedBuildInputs = [mtl]; + meta = { + description = "Happy is a parser generator for Haskell"; + }; +}) diff --git a/pkgs/tools/package-management/cabal-install/0.8.2.nix b/pkgs/tools/package-management/cabal-install/0.8.2.nix new file mode 100644 index 0000000000000..e739f806e6ce6 --- /dev/null +++ b/pkgs/tools/package-management/cabal-install/0.8.2.nix @@ -0,0 +1,13 @@ +{cabal, HTTP, network, zlib} : + +cabal.mkDerivation (self : { + pname = "cabal-install"; + name = self.fname; + version = "0.8.2"; # Haskell Platform 2010.2.0.0 + sha256 = "8f896ab46ec6c578f620ce4150f7cd04a2088be793113b33cc570b13b6b86e0b"; + extraBuildInputs = [HTTP network zlib]; + + meta = { + description = "The command-line interface for Cabal and Hackage"; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index faa4d7efee24f..dfd207c534cb3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -78,6 +78,11 @@ rec { network = network2217; }; + cgi3001173 = import ../development/libraries/haskell/cgi/3001.1.7.3.nix { + inherit cabal mtl parsec xhtml; + network = network2217; + }; + cgi = import ../development/libraries/haskell/cgi { inherit cabal mtl network parsec xhtml; }; @@ -176,6 +181,10 @@ rec { inherit cabal mtl; }; + fgl5423 = import ../development/libraries/haskell/fgl/5.4.2.3.nix { + inherit cabal mtl; + }; + gdiff = import ../development/libraries/haskell/gdiff { inherit cabal; }; @@ -296,6 +305,11 @@ rec { inherit cabal happy; }; + haskellSrcP = import ../development/libraries/haskell/haskell-src { + inherit cabal; + happy = happy1185; + }; + haskellSrcExts = import ../development/libraries/haskell/haskell-src-exts { inherit cabal cpphs happy; }; @@ -304,17 +318,44 @@ rec { inherit cabal haskellSrcExts; }; + /* + haskellPlatform2010200 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.2.0.0.nix { + inherit cabal ghc + html xhtml; + haskellSrc = haskellSrcP; + fgl = fgl5423; + cabalInstall = cabalInstall082; + GLUT = GLUT2121; + OpenGL = OpenGL2230; + zlib = zlib0520; + alex = alex233; + cgi = cgi3001173; + QuickCheck = QuickCheck2; + HTTP = HTTP400009; + HUnit = HUnit1221; + network = network2217; + parallel = parallel2201; + regexBase = regexBase0932; + regexCompat = regexCompat0931; + regexPosix = regexPosix0942; + stm = stm2121; + haddock = haddock272P; + happy = happy1185; + inherit (pkgs) fetchurl; + }); + */ + haskellPlatform2010100 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix { inherit cabal ghc fgl haskellSrc html - stm xhtml happy; + stm xhtml; cabalInstall = cabalInstall080; GLUT = GLUT2121; OpenGL = OpenGL2230; zlib = zlib0520; alex = alex232; cgi = cgi3001172; - QuickCheck = QuickCheck2; + QuickCheck = QuickCheck2103; HTTP = HTTP400009; HUnit = HUnit1221; network = network2217; @@ -323,6 +364,7 @@ rec { regexCompat = regexCompat092; regexPosix = regexPosix0941; haddock = haddock272; + happy = happy1184; inherit (pkgs) fetchurl; }); @@ -595,6 +637,10 @@ rec { inherit cabal; }; + QuickCheck2103 = import ../development/libraries/haskell/QuickCheck/2.1.0.3.nix { + inherit cabal mtl; + }; + QuickCheck2 = import ../development/libraries/haskell/QuickCheck/QuickCheck-2.nix { inherit cabal mtl; }; @@ -618,6 +664,10 @@ rec { inherit cabal mtl; }; + regexBase0932 = import ../development/libraries/haskell/regex-base/0.93.2.nix { + inherit cabal mtl; + }; + regexBase = import ../development/libraries/haskell/regex-base { inherit cabal mtl; }; @@ -628,6 +678,12 @@ rec { regexPosix = regexPosix0941; }; + regexCompat0931 = import ../development/libraries/haskell/regex-compat/0.93.1.nix { + inherit cabal; + regexBase = regexBase0932; + regexPosix = regexPosix0942; + }; + regexCompat = import ../development/libraries/haskell/regex-compat { inherit cabal regexBase regexPosix; }; @@ -637,6 +693,11 @@ rec { regexBase = regexBase0931; }; + regexPosix0942 = import ../development/libraries/haskell/regex-posix/0.94.2.nix { + inherit cabal; + regexBase = regexBase0932; + }; + regexPosix = import ../development/libraries/haskell/regex-posix { inherit cabal regexBase; }; @@ -730,6 +791,10 @@ rec { inherit cabal; }; + stm2121 = import ../development/libraries/haskell/stm/2.1.2.1.nix { + inherit cabal; + }; + storableComplex = import ../development/libraries/haskell/storable-complex { inherit cabal; }; @@ -925,6 +990,11 @@ rec { inherit (pkgs) perl; }; + alex233 = import ../development/tools/parsing/alex/2.3.3.nix { + inherit cabal; + inherit (pkgs) perl; + }; + cpphs = import ../development/tools/misc/cpphs { inherit cabal; }; @@ -958,6 +1028,13 @@ rec { ghcPaths = ghcPaths0106; }; + haddock272P = import ../development/tools/documentation/haddock/haddock-2.7.2.nix { + inherit cabal; + alex = alex233; + happy = happy1185; + ghcPaths = ghcPaths0106; + }; + happy = happy1184; happy117 = import ../development/tools/parsing/happy/happy-1.17.nix { @@ -970,6 +1047,11 @@ rec { inherit (pkgs) perl; }; + happy1185 = import ../development/tools/parsing/happy/happy-1.18.5.nix { + inherit cabal mtl; + inherit (pkgs) perl; + }; + hlint = import ../development/tools/haskell/hlint { inherit cabal haskellSrcExts mtl uniplate hscolour parallel; }; @@ -1020,6 +1102,13 @@ rec { # Tools. + cabalInstall082 = import ../tools/package-management/cabal-install/0.8.2.nix { + inherit cabal; + HTTP = HTTP400009; + network = network2217; + zlib = zlib0520; + }; + cabalInstall080 = import ../tools/package-management/cabal-install/0.8.0.nix { inherit cabal; HTTP = HTTP400009; |