diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.5.0.0.nix new file mode 100644 index 00000000000..aea0944f69e --- /dev/null +++ b/pkgs/development/libraries/haskell/GLUT/2.5.0.0.nix @@ -0,0 +1,18 @@ +{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL +, OpenGLRaw +}: + +cabal.mkDerivation (self: { + pname = "GLUT"; + version = "2.5.0.0"; + sha256 = "1r5kz9pgg2yn8g4bz3rxrcc74jyrxvg1lmza11jzdgx4v26pg9iz"; + buildDepends = [ OpenGL OpenGLRaw ]; + extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; + meta = { + 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; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index abccf8b768a..6d4491a8c0a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -146,7 +146,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x caseInsensitive = self.caseInsensitive_1_1; cgi = self.cgi_3001_1_7_5; fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_4_0_0; + GLUT = self.GLUT_2_5_0_0; GLURaw = self.GLURaw_1_3_0_0; haskellSrc = self.haskellSrc_1_0_1_5; hashable = self.hashable_1_2_1_0; @@ -1082,7 +1082,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix { OpenGL = self.OpenGL_2_8_0_0; }; - GLUT = self.GLUT_2_4_0_0; + GLUT_2_5_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix { + OpenGL = self.OpenGL_2_9_0_0; + }; + GLUT = self.GLUT_2_5_0_0; gnuidn = callPackage ../development/libraries/haskell/gnuidn {};