Author: simons
Date: Mon Feb 6 14:27:24 2012
New Revision: 32054
URL: https://nixos.org/websvn/nix/?rev=32054&sc=1
Log:
haskell: added OpenGL 5.0.0 and GLUT 2.3.0.0
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix Mon Feb
6 14:27:24 2012 (r32054)
@@ -0,0 +1,21 @@
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
+, OpenGLRaw, StateVar, Tensor
+}:
+
+cabal.mkDerivation (self: {
+ pname = "GLUT";
+ version = "2.3.0.0";
+ sha256 = "10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99";
+ buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ];
+ extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
+ meta = {
+ homepage = "http://www.haskell.org/haskellwiki/Opengl";;
+ 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
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix Mon Feb
6 14:27:24 2012 (r32054)
@@ -0,0 +1,21 @@
+{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar
+, Tensor
+}:
+
+cabal.mkDerivation (self: {
+ pname = "OpenGL";
+ version = "2.5.0.0";
+ sha256 = "1kpakn5i4aka67mqcpfq9jpl38h409x63zd14y35abpm6h3x8m3j";
+ buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
+ extraLibraries = [ libX11 mesa ];
+ meta = {
+ homepage = "http://www.haskell.org/haskellwiki/Opengl";;
+ description = "A binding for the OpenGL graphics system";
+ 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 Mon Feb 6 14:27:21
2012 (r32053)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon Feb 6 14:27:24
2012 (r32054)
@@ -137,12 +137,12 @@
inherit (self) cabal ghc;
cgi = self.cgi_3001_1_7_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 fails
+ GLUT = self.GLUT_2_3_0_0; # 7.4.1 ok
haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 fails
html = self.html_1_0_1_2; # 7.4.1 ok
HUnit = self.HUnit_1_2_2_3; # 7.4.1 ok
network = self.network_2_3_0_10; # 7.4.1 ok
- OpenGL = self.OpenGL_2_2_3_0; # 7.4.1 fails
+ OpenGL = self.OpenGL_2_5_0_0; # 7.4.1 ok
parallel = self.parallel_3_2_0_2; # 7.4.1 ok
parsec = self.parsec_3_1_2; # 7.4.1 ok
QuickCheck = self.QuickCheck_2_4_2; # 7.4.1 ok
@@ -738,8 +738,11 @@
GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix
{
OpenGL = self.OpenGL_2_4_0_2;
};
+ GLUT_2_3_0_0 = callPackage ../development/libraries/haskell/GLUT/2.3.0.0.nix
{
+ OpenGL = self.OpenGL_2_5_0_0;
+ };
GLUT22 = self.GLUT_2_2_2_1;
- GLUT = self.GLUT_2_1_1_2;
+ GLUT = self.GLUT_2_3_0_0;
gtk = callPackage ../development/libraries/haskell/gtk {
inherit (pkgs.gtkLibs) gtk;
@@ -1048,8 +1051,9 @@
OpenGL_2_2_1_1 = callPackage
../development/libraries/haskell/OpenGL/2.2.1.1.nix {};
OpenGL_2_2_3_0 = callPackage
../development/libraries/haskell/OpenGL/2.2.3.0.nix {};
OpenGL_2_4_0_2 = callPackage
../development/libraries/haskell/OpenGL/2.4.0.2.nix {};
+ OpenGL_2_5_0_0 = callPackage
../development/libraries/haskell/OpenGL/2.5.0.0.nix {};
OpenGL24 = self.OpenGL_2_4_0_2;
- OpenGL = self.OpenGL_2_2_1_1;
+ OpenGL = self.OpenGL_2_5_0_0;
OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
