summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-11-08 12:12:33 +0100
committerPeter Simons <simons@cryp.to>2014-11-08 15:50:15 +0100
commitb6f913d41f00ccdd36d8985d4f2975d48ee204c8 (patch)
tree7a921088735d614eb4c29ed988d525b6cf5872f2
parent66439fcb3dafcb44b874f1e0e000ab4aad946012 (diff)
downloadnixpkgs-b6f913d41f00ccdd36d8985d4f2975d48ee204c8.tar
nixpkgs-b6f913d41f00ccdd36d8985d4f2975d48ee204c8.tar.gz
nixpkgs-b6f913d41f00ccdd36d8985d4f2975d48ee204c8.tar.bz2
nixpkgs-b6f913d41f00ccdd36d8985d4f2975d48ee204c8.tar.lz
nixpkgs-b6f913d41f00ccdd36d8985d4f2975d48ee204c8.tar.xz
nixpkgs-b6f913d41f00ccdd36d8985d4f2975d48ee204c8.tar.zst
nixpkgs-b6f913d41f00ccdd36d8985d4f2975d48ee204c8.zip
haskell-OpenGL: drop obsolete versions 2.2.1.1 2.2.3.0, 2.2.3.1, 2.4.0.2, 2.6.0.1, and 2.8.0.0
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix17
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix17
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix20
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix22
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix18
-rw-r--r--pkgs/development/libraries/haskell/OpenGL/default.nix (renamed from pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix)0
-rw-r--r--pkgs/top-level/haskell-packages.nix9
8 files changed, 1 insertions, 119 deletions
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
deleted file mode 100644
index 747720eba85..00000000000
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libX11, mesa }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.2.1.1";
-  sha256 = "926ca25cf9502cdaaeb8ade484015468cb60594e1bfbf0e04bd01235d8d9a792";
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
-    description = "A 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/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
deleted file mode 100644
index af01702b01b..00000000000
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libX11, mesa }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.2.3.0";
-  sha256 = "00h5zdm64mfj5fwnd52kyn9aynsbzqwfic0ymjjakz90pdvk4p57";
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
-    description = "A 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/OpenGL/2.2.3.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix
deleted file mode 100644
index fa3ae576bfa..00000000000
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libX11, mesa }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.2.3.1";
-  sha256 = "1vl5i1l76mjc0p18awdrvdcpszaz1z891505cqmn1xlld7ijb14z";
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/HOpenGL/";
-    description = "A 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/OpenGL/2.4.0.2.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
deleted file mode 100644
index 81e754e269f..00000000000
--- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar
-, Tensor
-}:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.4.0.2";
-  sha256 = "00rjvm02p6h8vbyxi3ri4jkk75ki414wk5al2z2fsszjfpdl93b6";
-  buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A 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/OpenGL/2.6.0.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
deleted file mode 100644
index f8bcd405d0e..00000000000
--- a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar
-, Tensor
-}:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.6.0.1";
-  sha256 = "1fpabhpjfl1bj0dhlj2sg8zsn3l6py4zw1arplwmqalz3xbkkgdi";
-  buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
-  extraLibraries = [ libX11 mesa ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A binding for the OpenGL graphics system";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
deleted file mode 100644
index ea1fdcc9711..00000000000
--- a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, GLURaw, libX11, mesa, OpenGLRaw }:
-
-cabal.mkDerivation (self: {
-  pname = "OpenGL";
-  version = "2.8.0.0";
-  sha256 = "1wb5772dhh4a81ks9zxz8adpfxa97hcna9s263h9cl2vny6ksxff";
-  buildDepends = [ GLURaw OpenGLRaw ];
-  extraLibraries = [ libX11 mesa ];
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Opengl";
-    description = "A 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/OpenGL/2.9.2.0.nix b/pkgs/development/libraries/haskell/OpenGL/default.nix
index f6767ab577c..f6767ab577c 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 748d7e2710b..48c481fb3c9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1860,14 +1860,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   OpenAL = callPackage ../development/libraries/haskell/OpenAL {};
 
-  OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {};
-  OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {};
-  OpenGL_2_2_3_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.1.nix {};
-  OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {};
-  OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {};
-  OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {};
-  OpenGL_2_9_2_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.2.0.nix {};
-  OpenGL = self.OpenGL_2_9_2_0;
+  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 {};