From f0e99eca2aab97f818736c98cdf23f07e919ef66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 22 May 2012 06:14:35 +0000 Subject: [PATCH] Updated the Haskell Platform prerelease. svn path=/nixpkgs/trunk/; revision=34206 --- .../libraries/haskell/GLUT/2.1.2.2.nix | 17 +++++++++++++++++ .../haskell-platform-2012.2.0.0.cabal | 2 +- pkgs/top-level/haskell-packages.nix | 3 ++- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix new file mode 100644 index 00000000000..2b9a0fadfc9 --- /dev/null +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix @@ -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 ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal index 264d636f994..e5838c4f9ee 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal @@ -56,7 +56,7 @@ library -- 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, diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 96f23ac5740..1acb09f4652 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -125,7 +125,7 @@ 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 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 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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; };