mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 14:41:27 +00:00
Update Haskell OpenGL and GLUT packages.
1) GLURaw 1.4.0.0 --> 1.4.0.1 2) GLUT 2.5.1.0 -> 2.5.1.1 3) OpenGL 2.9.1.0 -> 2.9.2.0 4) OpenGLRaw 1.5.0.0 added
This commit is contained in:
parent
363b35ac2c
commit
ba5473676f
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "GLURaw";
|
||||
version = "1.4.0.0";
|
||||
sha256 = "0q86rpd5cx0vrb9d3y1fljc3mg0p8wy6xdn37ngv2s0f4kslq63g";
|
||||
version = "1.4.0.1";
|
||||
sha256 = "1k0f1vbbrsfc7jb4qbif4w4q87lsis5gvq7jd2n8zzslxd5n8mcn";
|
||||
buildDepends = [ OpenGLRaw ];
|
||||
extraLibraries = [ freeglut mesa ];
|
||||
meta = {
|
@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "GLUT";
|
||||
version = "2.5.1.0";
|
||||
sha256 = "0zxj5i8rw402gpns5ivb1g5fkk502jwzrkviqhwhrxn7yxrybi1s";
|
||||
version = "2.5.1.1";
|
||||
sha256 = "0n9dkdjmpnbcjg0ll0ny7mw21xwwix0gxy0hq6yagmgaakhpg0aa";
|
||||
buildDepends = [ OpenGL OpenGLRaw ];
|
||||
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
|
||||
meta = {
|
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "OpenGL";
|
||||
version = "2.9.1.0";
|
||||
sha256 = "09xzjaa9qyh7bfsnq226v9zi6lhnalhmlqlca3808hgax8ijwhp3";
|
||||
version = "2.9.2.0";
|
||||
sha256 = "1sa5jmhj0az6sik6swv2vgzhv9gj34dbq2px23ag1a4yrk5gcn0p";
|
||||
buildDepends = [ GLURaw OpenGLRaw text ];
|
||||
extraLibraries = [ libX11 mesa ];
|
||||
meta = {
|
15
pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix
Normal file
15
pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ cabal, mesa }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "OpenGLRaw";
|
||||
version = "1.5.0.0";
|
||||
sha256 = "04lsidv82fl7yb2fnqpx7q0vgiwxbswh8g7dv9q9s9i2jwiaaal5";
|
||||
extraLibraries = [ mesa ];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Opengl";
|
||||
description = "A raw binding for the OpenGL graphics system";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
@ -852,8 +852,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
|
||||
glpkHs = callPackage ../development/libraries/haskell/glpk-hs {};
|
||||
|
||||
GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_3_0_0; };
|
||||
GLURaw_1_4_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_4_0_0; };
|
||||
GLURaw = self.GLURaw_1_4_0_0;
|
||||
GLURaw_1_4_0_1 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.1.nix {};
|
||||
GLURaw = self.GLURaw_1_4_0_1;
|
||||
|
||||
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 {};
|
||||
@ -869,10 +869,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
|
||||
OpenGLRaw = self.OpenGLRaw_1_3_0_0;
|
||||
OpenGL = self.OpenGL_2_8_0_0.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; };
|
||||
};
|
||||
GLUT_2_5_1_0 = callPackage ../development/libraries/haskell/GLUT/2.5.1.0.nix {
|
||||
OpenGL = self.OpenGL_2_9_1_0;
|
||||
GLUT_2_5_1_1 = callPackage ../development/libraries/haskell/GLUT/2.5.1.1.nix {
|
||||
OpenGL = self.OpenGL_2_9_2_0;
|
||||
};
|
||||
GLUT = self.GLUT_2_5_1_0;
|
||||
GLUT = self.GLUT_2_5_1_1;
|
||||
|
||||
gnuidn = callPackage ../development/libraries/haskell/gnuidn {};
|
||||
|
||||
@ -1534,9 +1534,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
|
||||
|
||||
oeis = callPackage ../development/libraries/haskell/oeis {};
|
||||
|
||||
OpenAL = callPackage ../development/libraries/haskell/OpenAL {
|
||||
OpenGL = self.OpenGL_2_9_1_0;
|
||||
};
|
||||
OpenAL = callPackage ../development/libraries/haskell/OpenAL {};
|
||||
|
||||
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 {};
|
||||
@ -1544,12 +1542,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
|
||||
OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {};
|
||||
OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {};
|
||||
OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {};
|
||||
OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {};
|
||||
OpenGL = self.OpenGL_2_9_1_0;
|
||||
OpenGL_2_9_2_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.2.0.nix {};
|
||||
OpenGL = self.OpenGL_2_9_2_0;
|
||||
|
||||
OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {};
|
||||
OpenGLRaw_1_4_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.4.0.0.nix {};
|
||||
OpenGLRaw = self.OpenGLRaw_1_4_0_0;
|
||||
OpenGLRaw_1_5_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.5.0.0.nix {};
|
||||
OpenGLRaw = self.OpenGLRaw_1_5_0_0;
|
||||
|
||||
opensslStreams = callPackage ../development/libraries/haskell/openssl-streams {};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user