ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

haskell: added OpenGL 5.0.0 and GLUT 2.3.0.0

Browse Source 
svn path=/nixpkgs/trunk/; revision=32054
This commit is contained in:
Peter Simons 2012-02-06 14:27:24 +00:00
parent df0f103e86
commit 269b4776ce
3 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix Normal file
View File

@ -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
];
};
})

21
pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix Normal file
View File

@ -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
];
};
})

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

@ -137,12 +137,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
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 {};