From 103cf8e78ae07cb3e8b1af8f5aed76d170a27761 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:14:14 +0100 Subject: [PATCH] haskell-GLUT: drop obsolete versions 2.1.1.2, 2.1.2.1, 2.1.2.2, 2.2.2.1, 2.3.1.0, and 2.4.0.0 --- .../libraries/haskell/GLUT/2.1.1.2.nix | 18 ----------------- .../libraries/haskell/GLUT/2.1.2.1.nix | 19 ------------------ .../libraries/haskell/GLUT/2.1.2.2.nix | 19 ------------------ .../libraries/haskell/GLUT/2.2.2.1.nix | 20 ------------------- .../libraries/haskell/GLUT/2.3.1.0.nix | 20 ------------------- .../libraries/haskell/GLUT/2.4.0.0.nix | 20 ------------------- .../haskell/GLUT/{2.5.1.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 19 +----------------- 8 files changed, 1 insertion(+), 134 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix delete mode 100644 pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix delete mode 100644 pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix delete mode 100644 pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix delete mode 100644 pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix delete mode 100644 pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix rename pkgs/development/libraries/haskell/GLUT/{2.5.1.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix deleted file mode 100644 index 88a10caac09..00000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.1.1.2"; - sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb"; - buildDepends = [ OpenGL ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix deleted file mode 100644 index a9988a53328..00000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.1.2.1"; - sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02"; - buildDepends = [ OpenGL ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - noHaddock = true; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix deleted file mode 100644 index c92565ca4af..00000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.1.2.2"; - sha256 = "14g2ykcczy1hhpgflxv158zx2izkl1p0wj1x0am1grkkj1n9jbwi"; - buildDepends = [ OpenGL ]; - extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - noHaddock = true; - meta = { - homepage = "http://www.haskell.org/HOpenGL/"; - description = "A binding for the OpenGL Utility Toolkit"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix deleted file mode 100644 index 0bac3e0d5db..00000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, StateVar, Tensor -}: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.2.2.1"; - sha256 = "09qpkrwpc3w173mvqwda7vi0ncpzzzrnlfa14ja7jba489a8l1mw"; - buildDepends = [ OpenGL StateVar Tensor ]; - 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; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix deleted file mode 100644 index 9402d56f687..00000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, OpenGLRaw, StateVar, Tensor -}: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.3.1.0"; - sha256 = "1ijx636py7gpm79r0qjsv8f4pw3m1cgz80gnn3qghs3lw0l8f1ci"; - buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ]; - 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; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix deleted file mode 100644 index c28194d7adb..00000000000 --- a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, OpenGLRaw -}: - -cabal.mkDerivation (self: { - pname = "GLUT"; - version = "2.4.0.0"; - sha256 = "1g6bnj2p9hj6c04pmkjwlw9brp7rrva1fyylr2q2dbfz4kbz438h"; - 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; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix b/pkgs/development/libraries/haskell/GLUT/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix rename to pkgs/development/libraries/haskell/GLUT/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 48c481fb3c9..aacc35f1181 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -986,24 +986,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in GLURaw_1_4_0_1 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.1.nix {}; GLURaw = self.GLURaw_1_4_0_1; - 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_1_2_2 = callPackage ../development/libraries/haskell/GLUT/2.1.2.2.nix {}; - GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix { - OpenGL = self.OpenGL_2_6_0_1; - }; - GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix { - OpenGLRaw = self.OpenGLRaw_1_3_0_0; - OpenGL = self.OpenGL_2_6_0_1.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; }; - }; - GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix { - OpenGLRaw = self.OpenGLRaw_1_3_0_0; - OpenGL = self.OpenGL_2_8_0_0.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; }; - }; - GLUT_2_5_1_1 = callPackage ../development/libraries/haskell/GLUT/2.5.1.1.nix { - OpenGL = self.OpenGL_2_9_2_0; - }; - GLUT = self.GLUT_2_5_1_1; + GLUT = callPackage ../development/libraries/haskell/GLUT {}; GLUtil = callPackage ../development/libraries/haskell/GLUtil {};