From 0ce19e1fd2602e7a99d3a5930acec328b8d7b1fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:50:07 +0100 Subject: [PATCH] haskell-OpenGLRaw: drop obsolete versions 1.3.0.0 and 1.4.0.0 --- .../libraries/haskell/OpenGLRaw/1.3.0.0.nix | 17 ----------------- .../libraries/haskell/OpenGLRaw/1.4.0.0.nix | 17 ----------------- .../OpenGLRaw/{1.5.0.0.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 5 +---- 4 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix rename pkgs/development/libraries/haskell/OpenGLRaw/{1.5.0.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix deleted file mode 100644 index c3d8ce49881..00000000000 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mesa }: - -cabal.mkDerivation (self: { - pname = "OpenGLRaw"; - version = "1.3.0.0"; - sha256 = "0ifp5inrm48hzpq0x9hlk5cxh2k64y05phmsdb5hydb7r6dcla32"; - extraLibraries = [ 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/OpenGLRaw/1.4.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix deleted file mode 100644 index a2ffc9b4ad1..00000000000 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mesa }: - -cabal.mkDerivation (self: { - pname = "OpenGLRaw"; - version = "1.4.0.0"; - sha256 = "112xaz01950pyjaw3cv9yvw4w3gqbf79idyyh05ain7x29m7bxkh"; - extraLibraries = [ 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/OpenGLRaw/1.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix rename to pkgs/development/libraries/haskell/OpenGLRaw/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7955a06c523..2e74ce184fd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1805,10 +1805,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in OpenGL = callPackage ../development/libraries/haskell/OpenGL {}; - OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; - OpenGLRaw_1_4_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.4.0.0.nix {}; - OpenGLRaw_1_5_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.5.0.0.nix {}; - OpenGLRaw = self.OpenGLRaw_1_5_0_0; + OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; opensslStreams = callPackage ../development/libraries/haskell/openssl-streams {};