From dd9dc1a3376210b019abe394894a47c809fdad35 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Oct 2011 19:22:51 +0000 Subject: [PATCH] haskell-GLUT: updated to version 2.2.2.1 svn path=/nixpkgs/trunk/; revision=30080 --- .../libraries/haskell/GLUT/{2.2.2.0.nix => 2.2.2.1.nix} | 6 +++--- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/haskell/GLUT/{2.2.2.0.nix => 2.2.2.1.nix} (77%) diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix similarity index 77% rename from pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix rename to pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix index 2f25c5bd1cec..3248631be3e2 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.2.2.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix @@ -4,12 +4,12 @@ cabal.mkDerivation (self: { pname = "GLUT"; - version = "2.2.2.0"; - sha256 = "0hilpjwkjvpz4sz0zqa36vmx8m1yycjnqdd721mqns7lib2fnzrx"; + version = "2.2.2.1"; + sha256 = "09qpkrwpc3w173mvqwda7vi0ncpzzzrnlfa14ja7jba489a8l1mw"; buildDepends = [ OpenGL StateVar Tensor ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { - homepage = "http://www.haskell.org/HOpenGL/"; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 349aa8fd6983..15f563a32e73 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -623,10 +623,10 @@ 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_2_2_0 = callPackage ../development/libraries/haskell/GLUT/2.2.2.0.nix { - OpenGL = self.OpenGL_2_4_0_1; + GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix { + OpenGL = self.OpenGL_2_4_0_2; }; - GLUT22 = self.GLUT_2_2_2_0; + GLUT22 = self.GLUT_2_2_2_1; GLUT = self.GLUT_2_1_1_2; gtk = callPackage ../development/libraries/haskell/gtk {