diff options
| author | Peter Simons <simons@cryp.to> | 2012-11-05 16:25:02 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-11-05 16:25:29 +0100 |
| commit | 2d5732e48d6cea7701276ec651bd88a7c0dc2d73 (patch) | |
| tree | 252dafc76253a7cab5125e59389b6d21835daf6d /pkgs/top-level | |
| parent | 5ce4e11e40e20f47e8e8556acced2df934308910 (diff) | |
| download | nixlib-2d5732e48d6cea7701276ec651bd88a7c0dc2d73.tar nixlib-2d5732e48d6cea7701276ec651bd88a7c0dc2d73.tar.gz nixlib-2d5732e48d6cea7701276ec651bd88a7c0dc2d73.tar.bz2 nixlib-2d5732e48d6cea7701276ec651bd88a7c0dc2d73.tar.lz nixlib-2d5732e48d6cea7701276ec651bd88a7c0dc2d73.tar.xz nixlib-2d5732e48d6cea7701276ec651bd88a7c0dc2d73.tar.zst nixlib-2d5732e48d6cea7701276ec651bd88a7c0dc2d73.zip | |
haskell: update OpenGL to version 2.6.0.0 and GLUT to version 2.3.1.0.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 312ab37ebfe2..45308dc66e47 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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 {}; |