public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated the Haskell Platform prerelease. 

svn path=/nixpkgs/trunk/; revision=34206
This commit is contained in:
Andres Löh 2012-05-22 06:14:35 +00:00
parent 6bf4d9522a
commit f0e99eca2a
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix Normal file
View File

@ -0,0 +1,17 @@
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
cabal.mkDerivation (self: {
pname = "GLUT";
version = "2.1.2.2";
sha256 = "14g2ykcczy1hhpgflxv158zx2izkl1p0wj1x0am1grkkj1n9jbwi";
buildDepends = [ OpenGL ];
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
noHaddock = true;
meta = {
homepage = "http://www.haskell.org/HOpenGL/";
description = "A binding for the OpenGL Utility Toolkit";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

2
pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal
View File

@ -56,7 +56,7 @@ library
-- Note: newer versions of cgi need monad-catchio. -- Note: newer versions of cgi need monad-catchio.
cgi ==3001.1.7.4, cgi ==3001.1.7.4,
fgl ==5.4.2.4, fgl ==5.4.2.4,
GLUT ==2.1.2.1, GLUT ==2.1.2.2,
haskell-src ==1.0.1.5, haskell-src ==1.0.1.5,
html ==1.0.1.2, html ==1.0.1.2,
HTTP ==4000.2.3, HTTP ==4000.2.3,

3
pkgs/top-level/haskell-packages.nix
View File

@ -125,7 +125,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
inherit (self) cabal ghc; inherit (self) cabal ghc;
cgi = self.cgi_3001_1_7_4; # 7.4.1 ok cgi = self.cgi_3001_1_7_4; # 7.4.1 ok
fgl = self.fgl_5_4_2_4; # 7.4.1 ok fgl = self.fgl_5_4_2_4; # 7.4.1 ok
GLUT = self.GLUT_2_1_2_1; # 7.4.1 ok GLUT = self.GLUT_2_1_2_2; # 7.4.1 ok
haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok
html = self.html_1_0_1_2; # 7.4.1 ok html = self.html_1_0_1_2; # 7.4.1 ok
HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok
@ -709,6 +709,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {};
GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {}; GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {};
GLUT_2_1_2_2 = callPackage ../development/libraries/haskell/GLUT/2.1.2.2.nix {};
GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix { GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix {
OpenGL = self.OpenGL_2_4_0_2; OpenGL = self.OpenGL_2_4_0_2;
}; };