diff --git a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix deleted file mode 100644 index bf23628a710..00000000000 --- a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, mesa, OpenGLRaw }: - -cabal.mkDerivation (self: { - pname = "GLURaw"; - version = "1.3.0.0"; - sha256 = "1sh87jz9161svsf719y63cr21wf4d7wpbz75g2c2xss301qhafg0"; - buildDepends = [ OpenGLRaw ]; - extraLibraries = [ freeglut mesa ]; - meta = { - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix rename to pkgs/development/libraries/haskell/GLURaw/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index aacc35f1181..147bac24074 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -982,9 +982,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; - GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_3_0_0; }; - GLURaw_1_4_0_1 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.1.nix {}; - GLURaw = self.GLURaw_1_4_0_1; + GLURaw = callPackage ../development/libraries/haskell/GLURaw {}; GLUT = callPackage ../development/libraries/haskell/GLUT {};