Author: andres
Date: Mon Apr 4 08:45:05 2011
New Revision: 26674
URL: https://svn.nixos.org/websvn/nix/?rev=26674&sc=1
Log:
Added the RC of Haskell Platform 2011.2.0.1 ...
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/text/0.11.0.6.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix
Mon Apr 4 08:45:05 2011 (r26674)
@@ -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];
+ };
+})
+
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/text/0.11.0.6.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/text/0.11.0.6.nix Mon Apr
4 08:45:05 2011 (r26674)
@@ -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];
+ };
+})
+
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Apr 4 05:01:53
2011 (r26673)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Apr 4 08:45:05
2011 (r26674)
@@ -86,8 +86,8 @@
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 @@
# 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 @@
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
{};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
