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

haskell: update OpenGL to version 2.6.0.0 and GLUT to version 2.3.1.0.

Browse Source
This commit is contained in:
Peter Simons 2012-11-05 16:25:02 +01:00
parent 5ce4e11e40
commit 2d5732e48d
3 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix → pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix
View File

@ -1,17 +1,13 @@
{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
, OpenGLRaw, StateVar, Tensor, fetchurl
, OpenGLRaw, StateVar, Tensor
}:
cabal.mkDerivation (self: {
pname = "GLUT";
version = "2.3.0.0";
sha256 = "10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99";
version = "2.3.1.0";
sha256 = "1ijx636py7gpm79r0qjsv8f4pw3m1cgz80gnn3qghs3lw0l8f1ci";
buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ];
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
patches = [
(fetchurl { url = "https://github.com/haskell-opengl/GLUT/commit/e962ebb7bed7e61e4591ae67f86199d557c7d54c.patch"; sha256 = "0s9xrkz1pkbkhsjzwbj4ayynmvzp5cckkl2lrizcjwcnqv83srmq"; })
(fetchurl { url = "https://github.com/haskell-opengl/GLUT/commit/fced812bc726c208064a2c48e411f4d609444abc.patch"; sha256 = "1kc7ic70lq43v8ikbcgbs5f2l4wzaz9vylhkmp38q26zs6qzbv07"; })
];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Opengl";
description = "A binding for the OpenGL Utility Toolkit";

5
pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix → pkgs/development/libraries/haskell/OpenGL/2.6.0.0.nix
View File

@ -4,10 +4,11 @@
cabal.mkDerivation (self: {
pname = "OpenGL";
version = "2.5.0.0";
sha256 = "1kpakn5i4aka67mqcpfq9jpl38h409x63zd14y35abpm6h3x8m3j";
version = "2.6.0.0";
sha256 = "0rbdx73gcjx4ksqdjishlnn1ibxj21cqg5pxphy8bsphlygzc76l";
buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
extraLibraries = [ libX11 mesa ];
noHaddock = true;
meta = {
homepage = "http://www.haskell.org/haskellwiki/Opengl";
description = "A binding for the OpenGL graphics system";

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

@ -123,14 +123,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
async = self.async_2_0_1_4; # 7.6 ok
cgi = self.cgi_3001_1_8_3; # 7.6 ok
fgl = self.fgl_5_4_2_4; # 7.6 ok
GLUT = self.GLUT_2_3_0_0; # 7.6 ok
GLUT = self.GLUT_2_3_1_0; # 7.6 ok
haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok
html = self.html_1_0_1_2; # 7.6 ok
HTTP = self.HTTP_4000_2_6; # 7.6 ok
HUnit = self.HUnit_1_2_5_1; # 7.6 ok
mtl = self.mtl_2_1_2; # 7.6 ok
network = self.network_2_4_0_1; # 7.6 ok
OpenGL = self.OpenGL_2_5_0_0; # 7.6 ok
OpenGL = self.OpenGL_2_6_0_0; # 7.6 ok
parallel = self.parallel_3_2_0_3; # 7.6 ok
parsec = self.parsec_3_1_3; # 7.6 ok
QuickCheck = self.QuickCheck_2_5_1_1; # 7.6 ok
@ -828,8 +828,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
gloss = callPackage ../development/libraries/haskell/gloss {
GLUT = self.GLUT23;
OpenGL = self.OpenGL25;
OpenGL = self.OpenGL_2_6_0_0;
GLUT = self.GLUT_2_3_1_0;
};
glpkHs = callPackage ../development/libraries/haskell/glpk-hs {};
@ -842,12 +842,10 @@ 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;
GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix {
OpenGL = self.OpenGL_2_6_0_0;
};
GLUT22 = self.GLUT_2_2_2_1;
GLUT23 = self.GLUT_2_3_0_0;
GLUT = self.GLUT_2_3_0_0;
GLUT = self.GLUT_2_3_1_0;
gtk = callPackage ../development/libraries/haskell/gtk {
inherit (pkgs) gtk;
@ -1236,10 +1234,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {};
OpenGL_2_2_3_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.1.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;
OpenGL25 = self.OpenGL_2_5_0_0;
OpenGL = self.OpenGL_2_5_0_0;
OpenGL_2_6_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.0.nix {};
OpenGL = self.OpenGL_2_6_0_0;
OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};