Author: andres
Date: Sun Dec 18 10:22:48 2011
New Revision: 30951
URL: https://nixos.org/websvn/nix/?rev=30951&sc=1
Log:
Added Haskell Platform 2011.4.0.0.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal
nixpkgs/trunk/pkgs/development/libraries/haskell/network/2.3.0.5.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/syb/0.3.3.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/text/0.11.1.5.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix Sun Dec
18 10:22:48 2011 (r30951)
@@ -0,0 +1,18 @@
+{ cabal, mtl, network, parsec }:
+
+cabal.mkDerivation (self: {
+ pname = "HTTP";
+ version = "4000.1.2";
+ sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8";
+ buildDepends = [ mtl network parsec ];
+ meta = {
+ homepage = "http://projects.haskell.org/http/";
+ description = "A library for client-side HTTP";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix
Sun Dec 18 10:22:48 2011 (r30951)
@@ -0,0 +1,36 @@
+{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}:
+
+# 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-2011.4.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
+ 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 = {
+ description = "Haskell Platform meta package";
+ maintainers = [self.stdenv.lib.maintainers.andres];
+ };
+})
+
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal
Sun Dec 18 10:22:48 2011 (r30951)
@@ -0,0 +1,90 @@
+name: haskell-platform
+version: 2011.4.0.0
+homepage: http://haskell.org/platform
+license: BSD3
+license-file: LICENSE
+author: [email protected]
+maintainer: [email protected]
+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.0.4
+
+library
+ build-depends:
+ -- ghc 7.x
+ -- Core libraries: provided by every ghc installation
+ -- We don't include "non-API" packages here.
+ -- array ==0.3.0.2
+ -- base ==4.3.1.0
+ -- bytestring ==0.9.1.10
+ -- Cabal ==1.10.2.0
+ -- containers ==0.4.0.0
+ -- directory ==1.1.0.0
+ -- extensible-exceptions ==0.1.1.2
+ -- filepath ==1.2.0.0
+ -- haskell2010 ==1.0.0.0
+ -- haskell98 ==1.1.0.1
+ -- hpc ==0.5.0.6
+ -- old-locale ==1.0.0.2
+ -- old-time ==1.0.0.6
+ -- pretty ==1.0.1.2
+ -- process ==1.0.1.5
+ -- random ==1.0.0.3
+ -- template-haskell ==2.5.0.0
+ -- time ==1.2.0.3
+ -- unix ==XXX 2.4.2.0
+ -- Win32 ==XXX 2.2.0.1
+
+ -- 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.4,
+ html ==1.0.1.2,
+ HUnit ==1.2.4.2,
+ network ==2.3.0.5,
+ OpenGL ==2.2.3.0,
+ parallel ==3.1.0.1,
+ parsec ==3.1.1,
+ QuickCheck ==2.4.1.1,
+ regex-base ==0.93.2,
+ regex-compat ==0.95.1,
+ regex-posix ==0.95.1,
+ stm ==2.2.0.1,
+ syb ==0.3.3,
+ xhtml ==3000.2.0.4,
+ zlib ==0.5.3.1,
+ HTTP ==4000.1.2,
+ deepseq ==1.1.0.2,
+
+ -- 2011.1 proposals:
+ text ==0.11.1.5,
+ transformers ==0.2.2.0,
+ mtl ==2.0.1.0
+
+ -- Depending on programs does not work, they are not registered
+ -- We list them to help distro packaging.
+ build-tools:
+ cabal-install ==0.10.2,
+ alex ==2.3.5,
+ happy ==1.18.6
+ -- hscolour ==1.17
+ -- haddock ==2.9.2 -- need to use the one shipped with ghc
+
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/network/2.3.0.5.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/network/2.3.0.5.nix
Sun Dec 18 10:22:48 2011 (r30951)
@@ -0,0 +1,18 @@
+{ cabal, parsec }:
+
+cabal.mkDerivation (self: {
+ pname = "network";
+ version = "2.3.0.5";
+ sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0";
+ buildDepends = [ parsec ];
+ meta = {
+ homepage = "http://github.com/haskell/network";
+ description = "Low-level networking interface";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/syb/0.3.3.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/syb/0.3.3.nix Sun Dec
18 10:22:48 2011 (r30951)
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "syb";
+ version = "0.3.3";
+ sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901";
+ meta = {
+ homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
+ description = "Scrap Your Boilerplate";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/text/0.11.1.5.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/text/0.11.1.5.nix Sun Dec
18 10:22:48 2011 (r30951)
@@ -0,0 +1,18 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+ pname = "text";
+ version = "0.11.1.5";
+ sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l";
+ buildDepends = [ deepseq ];
+ meta = {
+ homepage = "https://bitbucket.org/bos/text";
+ description = "An efficient packed Unicode text type";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Dec 17 20:16:45
2011 (r30950)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Dec 18 10:22:48
2011 (r30951)
@@ -87,7 +87,7 @@
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_1
super;
- ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1
super; # link
+ ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_4_0_0
super; # link
ghc721Prefs = super : super // super.haskellPlatformDefaults_future super;
ghc722Prefs = super : super // super.haskellPlatformDefaults_future super;
#link
ghcHEADPrefs = super : super // super.haskellPlatformDefaults_HEAD super;
@@ -174,6 +174,49 @@
deepseq = null; # apparently a core library in ghc-7.3
};
+ haskellPlatformArgs_2011_4_0_0 = self : {
+ inherit (self) cabal ghc;
+ cgi = self.cgi_3001_1_7_4;
+ fgl = self.fgl_5_4_2_4;
+ 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_4_2;
+ network = self.network_2_3_0_5;
+ 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_1_1;
+ regexBase = self.regexBase_0_93_2;
+ regexCompat = self.regexCompat_0_95_1;
+ regexPosix = self.regexPosix_0_95_1;
+ stm = self.stm_2_2_0_1;
+ syb = self.syb_0_3_3;
+ xhtml = self.xhtml_3000_2_0_4;
+ zlib = self.zlib_0_5_3_1;
+ HTTP = self.HTTP_4000_1_2;
+ deepseq = self.deepseq_1_1_0_2;
+ text = self.text_0_11_1_5;
+ 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_4_0_0 =
+ self : self.haskellPlatformArgs_2011_4_0_0 self // {
+ haskellPlatform = self.haskellPlatform_2011_4_0_0;
+ mtl1 = self.mtl_1_1_1_1;
+ text = self.text_0_11_1_9;
+ repaExamples = null; # don't pick this version of 'repa-examples'
during nix-env -u
+ };
+
+ haskellPlatform_2011_4_0_0 =
+ callPackage
../development/libraries/haskell/haskell-platform/2011.4.0.0.nix
+ (self.haskellPlatformArgs_2011_4_0_0 self);
+
haskellPlatformArgs_2011_2_0_1 = self : {
inherit (self) cabal ghc;
cgi = self.cgi_3001_1_7_4;
@@ -714,6 +757,7 @@
HTTP_4000_0_6 = callPackage
../development/libraries/haskell/HTTP/4000.0.6.nix {};
HTTP_4000_0_9 = callPackage
../development/libraries/haskell/HTTP/4000.0.9.nix {};
HTTP_4000_1_1 = callPackage
../development/libraries/haskell/HTTP/4000.1.1.nix {};
+ HTTP_4000_1_2 = callPackage
../development/libraries/haskell/HTTP/4000.1.2.nix {};
HTTP_4000_2_1 = callPackage
../development/libraries/haskell/HTTP/4000.2.1.nix {};
HTTP = self.HTTP_4000_2_1;
@@ -802,7 +846,7 @@
HUnit_1_2_0_3 = callPackage
../development/libraries/haskell/HUnit/1.2.0.3.nix {};
HUnit_1_2_2_1 = callPackage
../development/libraries/haskell/HUnit/1.2.2.1.nix {};
HUnit_1_2_2_3 = callPackage
../development/libraries/haskell/HUnit/1.2.2.3.nix {};
- HUnit_1_2_4_3 = callPackage
../development/libraries/haskell/HUnit/1.2.4.2.nix {};
+ HUnit_1_2_4_2 = callPackage
../development/libraries/haskell/HUnit/1.2.4.2.nix {};
HUnit = self.HUnit_1_2_0_3;
hxt = callPackage ../development/libraries/haskell/hxt {};
@@ -922,6 +966,7 @@
network_2_2_1_4 = callPackage
../development/libraries/haskell/network/2.2.1.4.nix {};
network_2_2_1_7 = callPackage
../development/libraries/haskell/network/2.2.1.7.nix {};
network_2_3_0_2 = callPackage
../development/libraries/haskell/network/2.3.0.2.nix {};
+ network_2_3_0_5 = callPackage
../development/libraries/haskell/network/2.3.0.5.nix {};
network_2_3_0_8 = callPackage
../development/libraries/haskell/network/2.3.0.8.nix {};
network = self.network_2_3_0_8;
@@ -1118,6 +1163,7 @@
syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {};
syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {};
+ syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {};
syb_0_3_6 = callPackage ../development/libraries/haskell/syb/0.3.6.nix {};
syb = null; # by default, we assume that syb ships with GHC, which is
# true for the older GHC versions
@@ -1207,6 +1253,7 @@
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_0_11_1_5 = callPackage
../development/libraries/haskell/text/0.11.1.5.nix {};
text_0_11_1_9 = callPackage
../development/libraries/haskell/text/0.11.1.9.nix {};
text = self.text_0_11_1_9;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits