From 291df5f0c1714af02462387a465b84056cabf460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 4 Apr 2011 08:45:05 +0000 Subject: [PATCH] Added the RC of Haskell Platform 2011.2.0.1 ... svn path=/nixpkgs/trunk/; revision=26674 --- .../haskell/haskell-platform/2011.2.0.1.nix | 32 +++++++++++++ .../libraries/haskell/text/0.11.0.6.nix | 14 ++++++ pkgs/top-level/haskell-packages.nix | 48 ++++++++++++++++++- 3 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix create mode 100644 pkgs/development/libraries/haskell/text/0.11.0.6.nix diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix new file mode 100644 index 00000000000..33bc493b3cc --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix @@ -0,0 +1,32 @@ +{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, + cabalInstall, alex, happy, haddock, ghc}: + +cabal.mkDerivation (self : { + pname = "haskell-platform"; + version = "2011.2.0.1"; + src = fetchurl { + url = "http://lambda.haskell.org/hp-tmp/2011.2.0.0/cabal/${self.pname}-2011.2.0.0.tar.gz"; + sha256 = "01ppv8jdyvbngml9vgvrvnani6fj1nbk8mqmrkd8c508l7q9g6vb"; + }; + cabalFile = fetchurl { + url = http://code.galois.com/darcs/haskell-platform/haskell-platform.cabal; + sha256 = "158a1g4ak9mm2q5ri4zdpmbvjgfkz7svxnkxlz8117zpnbs12i3d"; + }; + propagatedBuildInputs = [ + GLUT HTTP HUnit OpenGL QuickCheck cgi fgl + haskellSrc html network parallel parsec regexBase regexCompat regexPosix + stm syb deepseq text transformers mtl xhtml zlib + cabalInstall alex happy ghc haddock + ]; + preConfigure = '' + cp ${self.cabalFile} ${self.pname}.cabal + ''; + noHaddock = true; + meta = { + description = "Haskell Platform meta package"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix new file mode 100644 index 00000000000..2775eae0760 --- /dev/null +++ b/pkgs/development/libraries/haskell/text/0.11.0.6.nix @@ -0,0 +1,14 @@ +{cabal, deepseq}: + +cabal.mkDerivation (self : { + pname = "text"; + version = "0.11.0.6"; # Haskell Platform 2011.2.0.1 + sha256 = "103l1c8jfwpddsqzwj9jqh89vay8ax1znxqgjqprv2fvr7s0zvkp"; + propagatedBuildInputs = [deepseq]; + meta = { + description = "An efficient package Unicode text type"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9fc1df78bac..bcc5ad8acb5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -86,8 +86,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ghc6123Prefs = super : super // super.haskellPlatformDefaults_2010_2_0_0 super; ghc701Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; # link ghc702Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; - ghc703Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; # link - ghcHEADPrefs = super : super // super.haskellPlatformDefaults_2011_2_0_0 super; # link + ghc703Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; + ghcHEADPrefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link # GHC and its wrapper # @@ -118,6 +118,49 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # versions explicitly. haskellPlatform = self.haskellPlatform_2011_2_0_0; # global platform default + # NOTE: 2011.2.0.0 is the current default. 2011.2.0.1 is not yet released + # and provided for testing purposes. + + haskellPlatformArgs_2011_2_0_1 = self : { + inherit (self) cabal ghc; + cgi = self.cgi_3001_1_7_4; + fgl = self.fgl_5_4_2_3; + GLUT = self.GLUT_2_1_2_1; + haskellSrc = self.haskellSrc_1_0_1_4; + html = self.html_1_0_1_2; + HUnit = self.HUnit_1_2_2_3; + network = self.network_2_3_0_2; + OpenGL = self.OpenGL_2_2_3_0; + parallel = self.parallel_3_1_0_1; + parsec = self.parsec_3_1_1; + QuickCheck = self.QuickCheck_2_4_0_1; + regexBase = self.regexBase_0_93_2; + regexCompat = self.regexCompat_0_93_1; + regexPosix = self.regexPosix_0_94_4; + stm = self.stm_2_2_0_1; + syb = self.syb_0_3; + xhtml = self.xhtml_3000_2_0_1; + zlib = self.zlib_0_5_3_1; + HTTP = self.HTTP_4000_1_1; + deepseq = self.deepseq_1_1_0_2; + text = self.text_0_11_0_6; + transformers = self.transformers_0_2_2_0; + mtl = self.mtl_2_0_1_0; + cabalInstall = self.cabalInstall_0_10_2; + alex = self.alex_2_3_5; + happy = self.happy_1_18_6; + haddock = self.haddock_2_9_2; + }; + + haskellPlatformDefaults_2011_2_0_1 = + self : self.haskellPlatformArgs_2011_2_0_1 self // { + haskellPlatform = self.haskellPlatform_2011_2_0_1; + mtl1 = self.mtl_1_1_1_1; + }; + + haskellPlatform_2011_2_0_1 = + callPackage ../development/libraries/haskell/haskell-platform/2011.2.0.1.nix + (self.haskellPlatformArgs_2011_2_0_1 self); haskellPlatformArgs_2011_2_0_0 = self : { inherit (self) cabal ghc; @@ -854,6 +897,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); texmath = callPackage ../development/libraries/haskell/texmath {}; 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 = self.text_0_11_0_5; threadmanager = callPackage ../development/libraries/haskell/threadmanager {};