diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix new file mode 100644 index 00000000000..e57d76e8466 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix @@ -0,0 +1,42 @@ +{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, + haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, + stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, random, + cabalInstall, alex, happy, haddock, ghc}: + +# This is just a meta-package. Because upstream fails to provide proper versioned +# release tarballs that can be used for the purpose of verifying this package, we +# just create it on the fly from a simple Setup.hs file and a .cabal file that we +# store directly in the nixpkgs repository. + +cabal.mkDerivation (self : { + pname = "haskell-platform"; + version = "2011.4.0.0"; + cabalFile = ./haskell-platform-2012.2.0.0.cabal; + setupFile = ./Setup.hs; + src = null; + propagatedBuildInputs = [ + GLUT HTTP HUnit OpenGL QuickCheck cgi fgl + haskellSrc html network parallel parsec regexBase regexCompat regexPosix + stm syb deepseq text transformers mtl xhtml zlib random + cabalInstall alex happy ghc haddock + ]; + unpackPhase = '' + sourceRoot=haskell-platform + mkdir $sourceRoot + cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal + cp ${self.setupFile} $sourceRoot/Setup.hs + touch $sourceRoot/LICENSE + ''; + noHaddock = true; + meta = { + homepage = "http://haskell.org/platform"; + description = "Haskell Platform meta package"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal new file mode 100644 index 00000000000..264d636f994 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal @@ -0,0 +1,89 @@ +name: haskell-platform +version: 2012.2.0.0 +homepage: http://haskell.org/platform +license: BSD3 +license-file: LICENSE +author: libraries@haskell.org +maintainer: haskell-platform@projects.haskell.org +category: System +synopsis: The Haskell Platform +description: + The Haskell Platform (HP) is the blessed set of libraries and tools on + which to build further Haskell libraries and applications. It is + intended to provide a comprehensive, stable, and quality tested base for + Haskell projects to work from. + . + This version specifies the following additional developer tools be + installed, for a system to be in full compliance: + . + * cabal-install + * alex + * happy + * haddock + +cabal-version: >= 1.8 +build-type: Custom +tested-with: GHC ==7.4.1 + +library + build-depends: + -- ghc ==7.4.1, + + -- Core libraries: provided by every ghc installation + -- We don't include "non-API" packages here. + -- array ==0.4.0.0, + -- base ==4.5.0.0, + -- bytestring ==0.9.2.1, + -- Cabal ==1.14.0, + -- containers ==0.4.2.1, + -- deepseq ==1.3.0.0, + -- directory ==1.1.0.2, + -- extensible-exceptions ==0.1.1.4, + -- filepath ==1.3.0.0, + -- haskell2010 ==1.1.0.1, + -- haskell98 ==2.0.0.1, + -- hpc ==0.5.1.1, + -- old-locale ==1.0.0.4, + -- old-time ==1.1.0.0, + -- pretty ==1.1.1.0, + -- process ==1.1.0.1, + -- template-haskell ==2.7.0.0, + -- time ==1.4, + -- unix ==2.5.1.0, + -- Win32 ==2.2.2.0, + + -- Libraries in addition to what GHC provides: + -- Note: newer versions of cgi need monad-catchio. + cgi ==3001.1.7.4, + fgl ==5.4.2.4, + GLUT ==2.1.2.1, + haskell-src ==1.0.1.5, + html ==1.0.1.2, + HTTP ==4000.2.3, + HUnit ==1.2.4.2, + mtl ==2.1.1, + network ==2.3.0.13, + OpenGL ==2.2.3.1, + parallel ==3.2.0.2, + parsec ==3.1.2, + QuickCheck ==2.4.2, + random ==1.0.1.1, + regex-base ==0.93.2, + regex-compat ==0.95.1, + regex-posix ==0.95.1, + stm ==2.3, + syb ==0.3.6.1, + text ==0.11.2.0, + transformers ==0.3.0.0, + xhtml ==3000.2.1, + zlib ==0.5.3.3 + + -- Depending on programs does not work, they are not registered + -- We list them to help distro packaging. + build-tools: + cabal-install ==0.14.0, + alex ==3.0.1, + happy ==1.18.9 + -- hscolour ==1.19 + -- haddock ==2.10.0 -- need to use the one shipped with ghc + diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix index f1c11b790bb..66196c806ac 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix @@ -3,7 +3,7 @@ cabal.mkDerivation (self: { pname = "xhtml"; version = "3000.2.1"; - sha256 = "17qzc6kyiilhi8s25k68fbpyplihb1qxkpc6l93bvjrcchilsf22"; + sha256 = "1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik"; meta = { homepage = "https://github.com/haskell/xhtml"; description = "An XHTML combinator library"; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 93bc6838eca..226fe64d91d 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -19,6 +19,7 @@ ghc741Prefs_pedantic = self : self.haskellPlatformArgs_future self // { + haskellPlatform = self.haskellPlatform_2012_2_0_0; mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok binary = null; # now a core package }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 627c40ea834..96f23ac5740 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -139,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexPosix = self.regexPosix_0_95_1; # 7.4.1 ok stm = self.stm_2_3; # 7.4.1 ok syb = self.syb_0_3_6_1; # 7.4.1 ok - xhtml = self.xhtml_3000_2_0_5; # 7.4.1 ok + xhtml = self.xhtml_3000_2_1; # 7.4.1 ok zlib = self.zlib_0_5_3_3; # 7.4.1 ok HTTP = self.HTTP_4000_2_3; # 7.4.1 ok text = self.text_0_11_2_0; # 7.4.1 ok @@ -152,6 +152,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haddock = self.haddock_2_10_0; # 7.4.1 ok }; + # This is still a prerelease. + haskellPlatform_2012_2_0_0 = + callPackage ../development/libraries/haskell/haskell-platform/2012.2.0.0.nix + (self.haskellPlatformArgs_future self); + haskellPlatformArgs_2011_4_0_0 = self : { inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; @@ -1529,7 +1534,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; - zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { + zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.3.nix { inherit (pkgs) zlib; }; zlib = self.zlib_0_5_3_3;