Author: andres
Date: Tue May 22 06:14:35 2012
New Revision: 34206
URL: https://nixos.org/websvn/nix/?rev=34206&sc=1
Log:
Updated the Haskell Platform prerelease.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix Tue May
22 06:14:35 2012 (r34206)
@@ -0,0 +1,17 @@
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
+
+cabal.mkDerivation (self: {
+ pname = "GLUT";
+ version = "2.1.2.2";
+ sha256 = "14g2ykcczy1hhpgflxv158zx2izkl1p0wj1x0am1grkkj1n9jbwi";
+ buildDepends = [ OpenGL ];
+ extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
+ noHaddock = true;
+ meta = {
+ homepage = "http://www.haskell.org/HOpenGL/";;
+ 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 ];
+ };
+})
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal
Mon May 21 23:31:28 2012 (r34205)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal
Tue May 22 06:14:35 2012 (r34206)
@@ -56,7 +56,7 @@
-- Note: newer versions of cgi need monad-catchio.
cgi ==3001.1.7.4,
fgl ==5.4.2.4,
- GLUT ==2.1.2.1,
+ GLUT ==2.1.2.2,
haskell-src ==1.0.1.5,
html ==1.0.1.2,
HTTP ==4000.2.3,
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Mon May 21 23:31:28
2012 (r34205)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Tue May 22 06:14:35
2012 (r34206)
@@ -125,7 +125,7 @@
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 ok
+ GLUT = self.GLUT_2_1_2_2; # 7.4.1 ok
haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok
html = self.html_1_0_1_2; # 7.4.1 ok
HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok
@@ -709,6 +709,7 @@
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
{};
+ GLUT_2_1_2_2 = callPackage ../development/libraries/haskell/GLUT/2.1.2.2.nix
{};
GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix
{
OpenGL = self.OpenGL_2_4_0_2;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
