From d900694b3ddab0b49b17c05189fc5690353daf12 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Thu, 25 Oct 2012 09:59:18 +0200 Subject: [PATCH] Update to Haskell Platform 2012.4.0.0 RC2. --- .../haskell-platform-2012.4.0.0.cabal | 71 ++++++++++++------- pkgs/top-level/haskell-packages.nix | 6 +- 2 files changed, 47 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal index 6346b6ab2973..23af64e44899 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal @@ -25,35 +25,48 @@ cabal-version: >= 1.8 build-type: Custom tested-with: GHC ==7.4.2 +flag include-ghc-depends + description: Include all the GHC provided packages in the dependencies + default: False + library + if flag(include-ghc-depends) + build-depends: + ghc ==7.4.2, + + -- Core libraries: provided by every ghc installation + -- We don't include "non-API" packages here. + -- begin core packages + array ==0.4.0.0, + base ==4.5.1.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 + if !os(windows) + build-depends: + unix ==2.5.1.1 + -- end core packages + else + build-depends: + Win32 ==2.2.2.0 + build-depends: - -- ghc ==7.4.2, - - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- array ==0.4.0.0, - -- base ==4.5.1.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.1, - -- Win32 ==2.2.2.0, - -- Libraries in addition to what GHC provides: -- Note: newer versions of cgi need monad-catchio. + -- begin platform packages async ==2.0.1.3, cgi ==3001.1.7.4, fgl ==5.4.2.4, @@ -77,13 +90,13 @@ library syb ==0.3.7, text ==0.11.2.3, transformers ==0.3.0.0, - vector ==0.10, + vector ==0.10.0.1, xhtml ==3000.2.1, zlib ==0.5.4.0, -- Libraries that are needed to support the above, -- though are not officially part of the platform - primitive ==0.5 + primitive ==0.5.0.1 -- Depending on programs does not work, they are not registered -- We list them to help distro packaging. @@ -91,6 +104,10 @@ library cabal-install ==0.14.0, alex ==3.0.2, happy ==1.18.10 + -- end platform packages -- hscolour ==1.19 -- ??? -- haddock ==2.11.0 -- need to use the one shipped with ghc +-- N.B.: The begin/end comment annocations are used to build the source +-- installer: Packages that are part of the core are checked at build time. +-- Source of packages that are part of the platform are included in the tarball. diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b6c9c8c26716..3d1e7984ae78 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb = self.syb_0_3_7; # 7.6 ok text = self.text_0_11_2_3; # 7.6 ok transformers = self.transformers_0_3_0_0; # 7.6 ok - vector = self.vector_0_10; # 7.6 ok + vector = self.vector_0_10_0_1; # 7.6 ok xhtml = self.xhtml_3000_2_1; # 7.6 ok zlib = self.zlib_0_5_4_0; # 7.6 ok cabalInstall = self.cabalInstall_1_16_0; # 7.6 ok @@ -178,14 +178,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb = self.syb_0_3_7; text = self.text_0_11_2_3; transformers = self.transformers_0_3_0_0; - vector = self.vector_0_10; + vector = self.vector_0_10_0_1; xhtml = self.xhtml_3000_2_1; zlib = self.zlib_0_5_4_0; cabalInstall = self.cabalInstall_0_14_0; alex = self.alex_3_0_2; haddock = self.haddock_2_11_0; happy = self.happy_1_18_10; - primitive = self.primitive_0_5; # semi-official, but specified + primitive = self.primitive_0_5_0_1; # semi-official, but specified }; haskellPlatform_2012_4_0_0 =