From a2a9650037bdd8e19a0973ee2afbb0c2fa1a9f04 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:34:36 +0100 Subject: [PATCH 01/52] Drop all obsolete versions of the Haskell Platform. --- .../haskell/haskell-platform/2009.2.0.2.nix | 27 -- .../haskell/haskell-platform/2010.1.0.0.nix | 28 -- .../haskell/haskell-platform/2010.2.0.0.nix | 27 -- .../haskell/haskell-platform/2011.2.0.0.nix | 29 -- .../haskell/haskell-platform/2011.2.0.1.nix | 39 --- .../haskell/haskell-platform/2011.4.0.0.nix | 40 --- .../haskell/haskell-platform/2012.2.0.0.nix | 40 --- .../haskell/haskell-platform/2012.4.0.0.nix | 42 --- .../haskell/haskell-platform/2013.2.0.0.nix | 44 --- .../haskell/haskell-platform/Setup.hs | 10 - .../haskell/haskell-platform/default.nix | 314 ------------------ .../haskell-platform-2011.2.0.1.cabal | 90 ----- .../haskell-platform-2011.4.0.0.cabal | 90 ----- .../haskell-platform-2012.2.0.0.cabal | 89 ----- .../haskell-platform-2012.4.0.0.cabal | 113 ------- .../haskell-platform-2013.2.0.0.cabal | 118 ------- .../libraries/haskell/hoogle/local.nix | 2 +- pkgs/top-level/all-packages.nix | 3 - 18 files changed, 1 insertion(+), 1144 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/Setup.hs delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/default.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal delete mode 100644 pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal diff --git a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix deleted file mode 100644 index 1da301e50aeb..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix +++ /dev/null @@ -1,27 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, editline, - haskellSrc, html, parallel, regexBase, regexCompat, regexPosix, - stm, time, xhtml, zlib, parsec, network, - cabalInstall, alex, happy, ghc}: - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2009.2.0.2"; - src = fetchurl { - url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - sha256 = "e0469fac9b1d091d8299ae16a4e2e7fcd504285bba066b17153a0f0104a049bd"; - }; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline - haskellSrc html parallel regexBase regexCompat regexPosix - stm time xhtml zlib parsec network - cabalInstall alex happy ghc - ]; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix deleted file mode 100644 index 9f157a51962a..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix +++ /dev/null @@ -1,28 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix, - stm, xhtml, zlib, parsec, - cabalInstall, alex, happy, ghc}: - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2010.1.0.0"; - src = fetchurl { - url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - sha256 = "0cadj0ql2i5d5njwcbhmjkf4qrkfmxirg5vjv1wlx3ayzbynbrp4"; - }; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel regexBase regexCompat regexPosix - stm xhtml zlib parsec - cabalInstall alex happy ghc - ]; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - broken = true; # The source code is no longer available from haskell.org. - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix deleted file mode 100644 index 9462d1304b7d..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix +++ /dev/null @@ -1,27 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix, - stm, xhtml, zlib, mtl, parsec, deepseq, - cabalInstall, alex, happy, ghc}: - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2010.2.0.0"; - src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/haskell-platform/haskell-platform-2010.2.0.0.tar.gz/9c9c6422ebfe1a5e78e69ae017f4d54b/haskell-platform-2010.2.0.0.tar.gz"; - sha256 = "c0b0b45151e74cff759ae25083c2ff7a7af4d2f74c19294b78730c879864f3c0"; - }; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel regexBase regexCompat regexPosix - stm xhtml zlib mtl parsec deepseq - cabalInstall alex happy ghc - ]; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix deleted file mode 100644 index dff683a40966..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix +++ /dev/null @@ -1,29 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, - stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, - cabalInstall, alex, happy, ghc}: - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2011.2.0.0"; - src = fetchurl { - # url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - url = "http://lambda.haskell.org/hp-tmp/${self.version}/cabal/${self.pname}-${self.version}.tar.gz"; - sha256 = "01ppv8jdyvbngml9vgvrvnani6fj1nbk8mqmrkd8c508l7q9g6vb"; - }; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel parsec regexBase regexCompat regexPosix - stm syb deepseq text transformers mtl xhtml zlib - cabalInstall alex happy ghc - ]; - noHaddock = true; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix deleted file mode 100644 index 7c6d206fd7d5..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix +++ /dev/null @@ -1,39 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, - stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, - cabalInstall, alex, happy, ghc}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2011.2.0.1"; - cabalFile = ./haskell-platform-2011.2.0.1.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel parsec regexBase regexCompat regexPosix - stm syb deepseq text transformers mtl xhtml zlib - cabalInstall alex happy ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix deleted file mode 100644 index d44b6011320e..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix +++ /dev/null @@ -1,40 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, - stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, - cabalInstall, alex, happy, ghc}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2011.4.0.0"; - cabalFile = ./haskell-platform-2011.4.0.0.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel parsec regexBase regexCompat regexPosix - stm syb deepseq text transformers mtl xhtml zlib - cabalInstall alex happy ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - homepage = "http://haskell.org/platform"; - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix deleted file mode 100644 index 268298a927aa..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix +++ /dev/null @@ -1,40 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, - haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix, - stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, random, - cabalInstall, alex, happy, ghc}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2012.2.0.0"; - cabalFile = ./haskell-platform-2012.2.0.0.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck cgi fgl - haskellSrc html network parallel parsec regexBase regexCompat regexPosix - stm syb deepseq text transformers mtl xhtml zlib random - cabalInstall alex happy ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - homepage = "http://haskell.org/platform"; - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix deleted file mode 100644 index 035777d1b5e0..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix +++ /dev/null @@ -1,42 +0,0 @@ -{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, async, cgi, fgl, - haskellSrc, html, network, parallel, parsec, primitive, - regexBase, regexCompat, regexPosix, - split, stm, syb, deepseq, text, transformers, mtl, vector, xhtml, zlib, random, - cabalInstall, alex, happy, ghc}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2012.4.0.0"; - cabalFile = ./haskell-platform-2012.4.0.0.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - GLUT HTTP HUnit OpenGL QuickCheck async cgi fgl - haskellSrc html network parallel parsec primitive - regexBase regexCompat regexPosix - split stm syb deepseq text transformers mtl vector xhtml zlib random - cabalInstall alex happy ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - homepage = "http://haskell.org/platform"; - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix deleted file mode 100644 index 07ecb4575467..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ cabal, fetchurl -, async, attoparsec, caseInsensitive, cgi, fgl, GLUT, GLURaw, haskellSrc -, hashable, html, HTTP, HUnit, mtl, network, OpenGL, OpenGLRaw, parallel -, parsec, QuickCheck, random, regexBase, regexCompat, regexPosix, split, stm -, syb, text, transformers, unorderedContainers, vector, xhtml, zlib -, cabalInstall, alex, happy, primitive, ghc -}: - -# This is just a meta-package. Because upstream fails to provide proper versioned -# release tarballs that can be used for the purpose of verifying this package, we -# just create it on the fly from a simple Setup.hs file and a .cabal file that we -# store directly in the nixpkgs repository. - -cabal.mkDerivation (self : { - pname = "haskell-platform"; - version = "2013.2.0.0"; - cabalFile = ./haskell-platform-2013.2.0.0.cabal; - setupFile = ./Setup.hs; - src = null; - isLibrary = false; - propagatedBuildInputs = [ - async attoparsec caseInsensitive cgi fgl GLUT GLURaw haskellSrc - hashable html HTTP HUnit mtl network OpenGL OpenGLRaw parallel - parsec QuickCheck random regexBase regexCompat regexPosix split stm - syb text transformers unorderedContainers vector xhtml zlib - cabalInstall alex happy primitive ghc - ]; - unpackPhase = '' - sourceRoot=haskell-platform - mkdir $sourceRoot - cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal - cp ${self.setupFile} $sourceRoot/Setup.hs - touch $sourceRoot/LICENSE - ''; - noHaddock = true; - propagatedUserEnvPkgs = self.propagatedBuildInputs; - meta = { - homepage = "http://haskell.org/platform"; - description = "Haskell Platform meta package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [andres simons]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-platform/Setup.hs b/pkgs/development/libraries/haskell/haskell-platform/Setup.hs deleted file mode 100644 index 47fd3a5c71b1..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/Setup.hs +++ /dev/null @@ -1,10 +0,0 @@ -import Distribution.Simple -import Distribution.Simple.Program - -main = defaultMainWithHooks simpleUserHooks { hookedPrograms = [cabal] } - -cabal :: Program -cabal = (simpleProgram "cabal-install") { - programFindLocation = \x -> findProgramLocation x "cabal", - programFindVersion = findProgramVersion "--numeric-version" id -} diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/default.nix deleted file mode 100644 index 2de2809cf53b..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/default.nix +++ /dev/null @@ -1,314 +0,0 @@ -{ pkgs }: - -let - haskellPlatformPackages_2013_2_0_0 = pkgs.haskell.packages_ghc763.override { - extension = self : super : { - async = self.async_2_0_1_4; - attoparsec = self.attoparsec_0_10_4_0; - caseInsensitive = self.caseInsensitive_1_0_0_1; - cgi = self.cgi_3001_1_7_5; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_4_0_0; - GLURaw = self.GLURaw_1_3_0_0; - haskellSrc = self.haskellSrc_1_0_1_5; - hashable = self.hashable_1_1_2_5; - html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_8; - HUnit = self.HUnit_1_2_5_2; - mtl = self.mtl_2_1_2; - network = self.network_2_4_1_2; - OpenGL = self.OpenGL_2_8_0_0; - OpenGLRaw = self.OpenGLRaw_1_3_0_0; - parallel = self.parallel_3_2_0_3; - parsec = self.parsec_3_1_3; - QuickCheck = self.QuickCheck_2_6; - random = self.random_1_0_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_2; - split = self.split_0_2_2; - stm = self.stm_2_4_2; - syb = self.syb_0_4_0; - text = self.text_0_11_3_1; - transformers = self.transformers_0_3_0_0; - unorderedContainers = self.unorderedContainers_0_2_3_0; - vector = self.vector_0_10_0_1; - xhtml = self.xhtml_3000_2_1; - zlib = self.zlib_0_5_4_1; - cabalInstall = self.cabalInstall_1_16_0_2; - alex = self.alex_3_0_5; - happy = self.happy_1_18_10; - primitive = self.primitive_0_5_0_1; # semi-official, but specified - }; - }; - - haskellPlatformPackages_2012_4_0_0 = pkgs.haskell.packages_ghc742.override { - extension = self : super : { - async = self.async_2_0_1_3; - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_5; - html = self.html_1_0_1_2; - HTTP = super.HTTP_4000_2_5.override { network = self.network_2_3_1_0; }; - HUnit = self.HUnit_1_2_5_1; - mtl = self.mtl_2_1_2; - network = self.network_2_3_1_0; - OpenGL = self.OpenGL_2_2_3_1; - parallel = self.parallel_3_2_0_3; - parsec = self.parsec_3_1_3; - QuickCheck = self.QuickCheck_2_5_1_1; - random = self.random_1_0_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_2; - split = self.split_0_2_1_1; - stm = self.stm_2_4; - syb = self.syb_0_3_7; - text = self.text_0_11_2_3; - transformers = self.transformers_0_3_0_0; - vector = self.vector_0_10_0_1; - xhtml = self.xhtml_3000_2_1; - zlib = self.zlib_0_5_4_0; - cabalInstall = self.cabalInstall_0_14_0; - alex = self.alex_3_0_2; - happy = self.happy_1_18_10; - primitive = self.primitive_0_5_0_1; # semi-official, but specified - }; - }; - - haskellPlatformPackages_2012_2_0_0 = pkgs.haskell.packages_ghc742.override { - ghcPath = ../../../compilers/ghc/7.4.1.nix; - extension = self : super : { - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_5; - html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_3; - HUnit = self.HUnit_1_2_4_2; - mtl = self.mtl_2_1_1; - network = self.network_2_3_0_13; - OpenGL = self.OpenGL_2_2_3_1; - parallel = self.parallel_3_2_0_2; - parsec = self.parsec_3_1_2; - QuickCheck = self.QuickCheck_2_4_2; - random = self.random_1_0_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_1; - stm = self.stm_2_3; - syb = self.syb_0_3_6_1; - text = self.text_0_11_2_0; - transformers = self.transformers_0_3_0_0; - xhtml = self.xhtml_3000_2_1; - zlib = self.zlib_0_5_3_3; - cabalInstall = self.cabalInstall_0_14_0; - alex = self.alex_3_0_1; - happy = self.happy_1_18_9; - }; - }; - - haskellPlatformPackages_2011_4_0_0 = pkgs.haskell.packages_ghc704.override { - extension = self : super : { - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_4; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_4_2; - network = self.network_2_3_0_5; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_3_1_0_1; - parsec = self.parsec_3_1_1; - QuickCheck = self.QuickCheck_2_4_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_95_1; - regexPosix = self.regexPosix_0_95_1; - stm = self.stm_2_2_0_1; - syb = self.syb_0_3_3; - xhtml = self.xhtml_3000_2_0_4; - zlib = self.zlib_0_5_3_1; - HTTP = self.HTTP_4000_1_2; - deepseq = self.deepseq_1_1_0_2; - text = self.text_0_11_1_5; - transformers = self.transformers_0_2_2_0; - mtl = self.mtl_2_0_1_0; - cabalInstall = self.cabalInstall_0_10_2; - alex = self.alex_2_3_5; - happy = self.happy_1_18_6; - }; - }; - - haskellPlatformPackages_2011_2_0_1 = pkgs.haskell.packages_ghc704.override { - ghcPath = ../../../compilers/ghc/7.0.3.nix; - extension = self : super : { - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_3; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_4; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_2_3; - network = self.network_2_3_0_2; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_3_1_0_1; - parsec = self.parsec_3_1_1; - QuickCheck = self.QuickCheck_2_4_0_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_93_1; - regexPosix = self.regexPosix_0_94_4; - stm = self.stm_2_2_0_1; - syb = self.syb_0_3; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_3_1; - HTTP = self.HTTP_4000_1_1; - deepseq = self.deepseq_1_1_0_2; - text = self.text_0_11_0_6; - transformers = self.transformers_0_2_2_0; - mtl = self.mtl_2_0_1_0; - cabalInstall = self.cabalInstall_0_10_2; - alex = self.alex_2_3_5; - happy = self.happy_1_18_6; - }; - }; - - haskellPlatformPackages_2011_2_0_0 = pkgs.haskell.packages_ghc704.override { - ghcPath = ../../../compilers/ghc/7.0.2.nix; - extension = self : super : { - cgi = self.cgi_3001_1_7_4; - fgl = self.fgl_5_4_2_3; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_4; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_2_3; - network = self.network_2_3_0_2; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_3_1_0_1; - parsec = self.parsec_3_1_1; - QuickCheck = self.QuickCheck_2_4_0_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_93_1; - regexPosix = self.regexPosix_0_94_4; - stm = self.stm_2_2_0_1; - syb = self.syb_0_3; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_3_1; - HTTP = self.HTTP_4000_1_1; - deepseq = self.deepseq_1_1_0_2; - text = self.text_0_11_0_5; - transformers = self.transformers_0_2_2_0; - mtl = self.mtl_2_0_1_0; - cabalInstall = self.cabalInstall_0_10_2; - alex = self.alex_2_3_5; - happy = self.happy_1_18_6; - }; - }; - - haskellPlatformPackages_2010_2_0_0 = pkgs.haskell.packages_ghc6123.override { - extension = self : super : { - cgi = self.cgi_3001_1_7_3; - fgl = self.fgl_5_4_2_3; - GLUT = self.GLUT_2_1_2_1; - haskellSrc = self.haskellSrc_1_0_1_3; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_2_1; - mtl = self.mtl_1_1_0_2; - network = self.network_2_2_1_7; - OpenGL = self.OpenGL_2_2_3_0; - parallel = self.parallel_2_2_0_1; - parsec = self.parsec_2_1_0_1; - QuickCheck = self.QuickCheck_2_1_1_1; - regexBase = self.regexBase_0_93_2; - regexCompat = self.regexCompat_0_93_1; - regexPosix = self.regexPosix_0_94_2; - stm = self.stm_2_1_2_1; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_2_0; - HTTP = self.HTTP_4000_0_9; - deepseq = self.deepseq_1_1_0_0; - text = self.text_0_11_0_5; - cabalInstall = self.cabalInstall_0_8_2; - alex = self.alex_2_3_3; - happy = self.happy_1_18_5; - }; - }; - - haskellPlatformPackages_2010_1_0_0 = pkgs.haskell.packages_ghc6123.override { - extension = self : super : { - haskellSrc = self.haskellSrc_1_0_1_3; - html = self.html_1_0_1_2; - fgl = self.fgl_5_4_2_2; - cabalInstall = self.cabalInstall_0_8_0; - GLUT = self.GLUT_2_1_2_1; - OpenGL = self.OpenGL_2_2_3_0; - zlib = self.zlib_0_5_2_0; - alex = self.alex_2_3_2; - cgi = self.cgi_3001_1_7_2; - QuickCheck = self.QuickCheck_2_1_1_1; - HTTP = self.HTTP_4000_0_9; - deepseq = self.deepseq_1_1_0_0; - HUnit = self.HUnit_1_2_2_1; - network = self.network_2_2_1_7; - parallel = self.parallel_2_2_0_1; - parsec = self.parsec_2_1_0_1; - regexBase = self.regexBase_0_93_1; - regexCompat = self.regexCompat_0_92; - regexPosix = self.regexPosix_0_94_1; - stm = self.stm_2_1_1_2; - xhtml = self.xhtml_3000_2_0_1; - happy = self.happy_1_18_4; - # not actually specified, but important to make the whole thing build - mtl = self.mtl_1_1_0_2; - }; - }; - - haskellPlatformPackages_2009_2_0_2 = pkgs.haskell.packages_ghc6104.override { - extension = self : super : { - time = self.time_1_1_2_4; - cgi = self.cgi_3001_1_7_1; - editline = self.editline_0_2_1_0; - fgl = self.fgl_5_4_2_2; - GLUT = self.GLUT_2_1_1_2; - haskellSrc = self.haskellSrc_1_0_1_3; - html = self.html_1_0_1_2; - HUnit = self.HUnit_1_2_0_3; - network = self.network_2_2_1_4; - OpenGL = self.OpenGL_2_2_1_1; - parallel = self.parallel_1_1_0_1; - parsec = self.parsec_2_1_0_1; - QuickCheck = self.QuickCheck_1_2_0_0; - regexBase = self.regexBase_0_72_0_2; - regexCompat = self.regexCompat_0_71_0_1; - regexPosix = self.regexPosix_0_72_0_3; - stm = self.stm_2_1_1_2; - xhtml = self.xhtml_3000_2_0_1; - zlib = self.zlib_0_5_0_0; - HTTP = self.HTTP_4000_0_6; - cabalInstall = self.cabalInstall_0_6_2; - alex = self.alex_2_3_1; - happy = self.happy_1_18_4; - # not actually specified, but important to make the whole thing build - mtl = self.mtl_1_1_0_2; - }; - }; - -in -{ - "2013_2_0_0" = haskellPlatformPackages_2013_2_0_0.callPackage ./2013.2.0.0.nix {}; - - "2012_4_0_0" = haskellPlatformPackages_2012_4_0_0.callPackage ./2012.4.0.0.nix {}; - - "2012_2_0_0" = haskellPlatformPackages_2012_2_0_0.callPackage ./2012.2.0.0.nix {}; - - "2011_4_0_0" = haskellPlatformPackages_2011_4_0_0.callPackage ./2011.4.0.0.nix {}; - - "2011_2_0_1" = haskellPlatformPackages_2011_2_0_1.callPackage ./2011.2.0.1.nix {}; - - "2011_2_0_0" = haskellPlatformPackages_2011_2_0_0.callPackage ./2011.2.0.0.nix {}; - - "2010_2_0_0" = haskellPlatformPackages_2010_2_0_0.callPackage ./2010.2.0.0.nix {}; - - "2010_1_0_0" = haskellPlatformPackages_2010_1_0_0.callPackage ./2010.1.0.0.nix {}; - - "2009_2_0_2" = haskellPlatformPackages_2009_2_0_2.callPackage ./2009.2.0.2.nix {}; -} diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal deleted file mode 100644 index fa09cb039dab..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.2.0.1.cabal +++ /dev/null @@ -1,90 +0,0 @@ -name: haskell-platform -version: 2011.2.0.1 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.6 -build-type: Custom -tested-with: GHC ==7.0.3 - -library - build-depends: - -- ghc 7.x - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- array ==0.3.0.2 - -- base ==4.3.1.0 - -- bytestring ==0.9.1.10 - -- Cabal ==1.10.1.0 - -- containers ==0.4.0.0 - -- directory ==1.1.0.0 - -- extensible-exceptions ==0.1.1.2 - -- filepath ==1.2.0.0 - -- haskell2010 ==1.0.0.0 - -- haskell98 ==1.1.0.1 - -- hpc ==0.5.0.6 - -- old-locale ==1.0.0.2 - -- old-time ==1.0.0.6 - -- pretty ==1.0.1.2 - -- process ==1.0.1.5 - -- random ==1.0.0.3 - -- template-haskell ==2.5.0.0 - -- time ==1.2.0.3 - -- unix ==XXX 2.4.2.0 - -- Win32 ==XXX 2.2.0.1 - - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - cgi ==3001.1.7.4, - fgl ==5.4.2.3, - GLUT ==2.1.2.1, - haskell-src ==1.0.1.4, - html ==1.0.1.2, - HUnit ==1.2.2.3, - network ==2.3.0.2, - OpenGL ==2.2.3.0, - parallel ==3.1.0.1, - parsec ==3.1.1, - QuickCheck ==2.4.0.1, - regex-base ==0.93.2, - regex-compat ==0.93.1, - regex-posix ==0.94.4, - stm ==2.2.0.1, - syb ==0.3, - xhtml ==3000.2.0.1, - zlib ==0.5.3.1, - HTTP ==4000.1.1, - deepseq ==1.1.0.2, - - -- 2011.1 proposals: - text ==0.11.0.6, - transformers ==0.2.2.0, - mtl ==2.0.1.0 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==0.10.2, - alex ==2.3.5, - happy ==1.18.6 - -- hscolour ==1.17 - -- haddock ==2.9.2 -- need to use the one shipped with ghc - diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal deleted file mode 100644 index 56414de90c5b..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2011.4.0.0.cabal +++ /dev/null @@ -1,90 +0,0 @@ -name: haskell-platform -version: 2011.4.0.0 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.8 -build-type: Custom -tested-with: GHC ==7.0.4 - -library - build-depends: - -- ghc 7.x - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- array ==0.3.0.2 - -- base ==4.3.1.0 - -- bytestring ==0.9.1.10 - -- Cabal ==1.10.2.0 - -- containers ==0.4.0.0 - -- directory ==1.1.0.0 - -- extensible-exceptions ==0.1.1.2 - -- filepath ==1.2.0.0 - -- haskell2010 ==1.0.0.0 - -- haskell98 ==1.1.0.1 - -- hpc ==0.5.0.6 - -- old-locale ==1.0.0.2 - -- old-time ==1.0.0.6 - -- pretty ==1.0.1.2 - -- process ==1.0.1.5 - -- random ==1.0.0.3 - -- template-haskell ==2.5.0.0 - -- time ==1.2.0.3 - -- unix ==XXX 2.4.2.0 - -- Win32 ==XXX 2.2.0.1 - - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - cgi ==3001.1.7.4, - fgl ==5.4.2.4, - GLUT ==2.1.2.1, - haskell-src ==1.0.1.4, - html ==1.0.1.2, - HUnit ==1.2.4.2, - network ==2.3.0.5, - OpenGL ==2.2.3.0, - parallel ==3.1.0.1, - parsec ==3.1.1, - QuickCheck ==2.4.1.1, - regex-base ==0.93.2, - regex-compat ==0.95.1, - regex-posix ==0.95.1, - stm ==2.2.0.1, - syb ==0.3.3, - xhtml ==3000.2.0.4, - zlib ==0.5.3.1, - HTTP ==4000.1.2, - deepseq ==1.1.0.2, - - -- 2011.1 proposals: - text ==0.11.1.5, - transformers ==0.2.2.0, - mtl ==2.0.1.0 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==0.10.2, - alex ==2.3.5, - happy ==1.18.6 - -- hscolour ==1.17 - -- haddock ==2.9.2 -- need to use the one shipped with ghc - diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal deleted file mode 100644 index 264d636f9942..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.2.0.0.cabal +++ /dev/null @@ -1,89 +0,0 @@ -name: haskell-platform -version: 2012.2.0.0 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.8 -build-type: Custom -tested-with: GHC ==7.4.1 - -library - build-depends: - -- ghc ==7.4.1, - - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- array ==0.4.0.0, - -- base ==4.5.0.0, - -- bytestring ==0.9.2.1, - -- Cabal ==1.14.0, - -- containers ==0.4.2.1, - -- deepseq ==1.3.0.0, - -- directory ==1.1.0.2, - -- extensible-exceptions ==0.1.1.4, - -- filepath ==1.3.0.0, - -- haskell2010 ==1.1.0.1, - -- haskell98 ==2.0.0.1, - -- hpc ==0.5.1.1, - -- old-locale ==1.0.0.4, - -- old-time ==1.1.0.0, - -- pretty ==1.1.1.0, - -- process ==1.1.0.1, - -- template-haskell ==2.7.0.0, - -- time ==1.4, - -- unix ==2.5.1.0, - -- Win32 ==2.2.2.0, - - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - cgi ==3001.1.7.4, - fgl ==5.4.2.4, - GLUT ==2.1.2.1, - haskell-src ==1.0.1.5, - html ==1.0.1.2, - HTTP ==4000.2.3, - HUnit ==1.2.4.2, - mtl ==2.1.1, - network ==2.3.0.13, - OpenGL ==2.2.3.1, - parallel ==3.2.0.2, - parsec ==3.1.2, - QuickCheck ==2.4.2, - random ==1.0.1.1, - regex-base ==0.93.2, - regex-compat ==0.95.1, - regex-posix ==0.95.1, - stm ==2.3, - syb ==0.3.6.1, - text ==0.11.2.0, - transformers ==0.3.0.0, - xhtml ==3000.2.1, - zlib ==0.5.3.3 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==0.14.0, - alex ==3.0.1, - happy ==1.18.9 - -- hscolour ==1.19 - -- haddock ==2.10.0 -- need to use the one shipped with ghc - diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal deleted file mode 100644 index 23d1f7a0a7d9..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal +++ /dev/null @@ -1,113 +0,0 @@ -name: haskell-platform -version: 2012.4.0.0 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.8 -build-type: Custom -tested-with: GHC ==7.4.2 - -flag include-ghc-depends - description: Include all the GHC provided packages in the dependencies - default: False - -library - if flag(include-ghc-depends) - build-depends: - ghc ==7.4.2, - - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- begin core packages - array ==0.4.0.0, - base ==4.5.1.0, - bytestring ==0.9.2.1, - Cabal ==1.14.0, - containers ==0.4.2.1, - deepseq ==1.3.0.0, - directory ==1.1.0.2, - extensible-exceptions ==0.1.1.4, - filepath ==1.3.0.0, - haskell2010 ==1.1.0.1, - haskell98 ==2.0.0.1, - hpc ==0.5.1.1, - old-locale ==1.0.0.4, - old-time ==1.1.0.0, - pretty ==1.1.1.0, - process ==1.1.0.1, - template-haskell ==2.7.0.0, - time ==1.4 - if !os(windows) - build-depends: - unix ==2.5.1.1 - -- end core packages - else - build-depends: - Win32 ==2.2.2.0 - - build-depends: - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - -- begin platform packages - async ==2.0.1.3, - cgi ==3001.1.7.4, - fgl ==5.4.2.4, - GLUT ==2.1.2.1, - haskell-src ==1.0.1.5, - html ==1.0.1.2, - HTTP ==4000.2.5, - HUnit ==1.2.5.1, - mtl ==2.1.2, - network ==2.3.1.0, - OpenGL ==2.2.3.1, - parallel ==3.2.0.3, - parsec ==3.1.3, - QuickCheck ==2.5.1.1, - random ==1.0.1.1, - regex-base ==0.93.2, - regex-compat ==0.95.1, - regex-posix ==0.95.2, - split ==0.2.1.1, - stm ==2.4, - syb ==0.3.7, - text ==0.11.2.3, - transformers ==0.3.0.0, - vector ==0.10.0.1, - xhtml ==3000.2.1, - zlib ==0.5.4.0, - - -- Libraries that are needed to support the above, - -- though are not officially part of the platform - primitive ==0.5.0.1 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==0.14.0, - alex ==3.0.2, - happy ==1.18.10 - -- end platform packages - -- hscolour ==1.19 -- ??? - -- haddock ==2.11.0 -- need to use the one shipped with ghc - --- N.B.: The begin/end comment annotations are used to build the source --- installer: Packages that are part of the core are checked at build time. --- Source of packages that are part of the platform are included in the tarball. diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal deleted file mode 100644 index cf676ab1d6e0..000000000000 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2013.2.0.0.cabal +++ /dev/null @@ -1,118 +0,0 @@ -name: haskell-platform -version: 2013.2.0.0 -homepage: http://haskell.org/platform -license: BSD3 -license-file: LICENSE -author: libraries@haskell.org -maintainer: haskell-platform@projects.haskell.org -category: System -synopsis: The Haskell Platform -description: - The Haskell Platform (HP) is the blessed set of libraries and tools on - which to build further Haskell libraries and applications. It is - intended to provide a comprehensive, stable, and quality tested base for - Haskell projects to work from. - . - This version specifies the following additional developer tools be - installed, for a system to be in full compliance: - . - * cabal-install - * alex - * happy - * haddock - -cabal-version: >= 1.8 -build-type: Custom -tested-with: GHC ==7.6.3 - -flag include-ghc-depends - description: Include all the GHC provided packages in the dependencies - default: False - -library - if flag(include-ghc-depends) - build-depends: - ghc ==7.6.3, - - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- begin core packages - array ==0.4.0.1, - base ==4.6.0.1, - bytestring ==0.10.0.2, - Cabal ==1.16.0, - containers ==0.5.0.0, - deepseq ==1.3.0.1, - directory ==1.2.0.1, - filepath ==1.3.0.1, - haskell2010 ==1.1.1.0, - haskell98 ==2.0.0.2, - hpc ==0.6.0.0, - old-locale ==1.0.0.5, - old-time ==1.1.0.1, - pretty ==1.1.1.0, - process ==1.1.0.2, - template-haskell ==2.8.0.0, - time ==1.4.0.1 - if !os(windows) - build-depends: - unix ==2.6.0.1 - -- end core packages - else - build-depends: - Win32 ==2.3.0.0 - - build-depends: - -- Libraries in addition to what GHC provides: - -- Note: newer versions of cgi need monad-catchio. - -- begin platform packages - async ==2.0.1.4, - attoparsec ==0.10.4.0, - case-insensitive ==1.0.0.1, - cgi ==3001.1.7.5, - fgl ==5.4.2.4, - GLUT ==2.4.0.0, - GLURaw ==1.3.0.0, - haskell-src ==1.0.1.5, - hashable ==1.1.2.5, - html ==1.0.1.2, - HTTP ==4000.2.8, - HUnit ==1.2.5.2, - mtl ==2.1.2, - network ==2.4.1.2, - OpenGL ==2.8.0.0, - OpenGLRaw ==1.3.0.0, - parallel ==3.2.0.3, - parsec ==3.1.3, - QuickCheck ==2.6, - random ==1.0.1.1, - regex-base ==0.93.2, - regex-compat ==0.95.1, - regex-posix ==0.95.2, - split ==0.2.2, - stm ==2.4.2, - syb ==0.4.0, - text ==0.11.3.1, - transformers ==0.3.0.0, - unordered-containers ==0.2.3.0, - vector ==0.10.0.1, - xhtml ==3000.2.1, - zlib ==0.5.4.1, - - -- Libraries that are needed to support the above, - -- though are not officially part of the platform - primitive ==0.5.0.1 - - -- Depending on programs does not work, they are not registered - -- We list them to help distro packaging. - build-tools: - cabal-install ==1.16.0.2, - alex ==3.0.5, - happy ==1.18.10 - -- end platform packages - -- hscolour ==1.20.3 -- ??? - -- haddock ==2.13.2 -- need to use the one shipped with ghc - --- N.B.: The begin/end comment annotations are used to build the source --- installer: Packages that are part of the core are checked at build time. --- Source of packages that are part of the platform are included in the tarball. diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix index ba907948b14a..822c2bdd82ea 100644 --- a/pkgs/development/libraries/haskell/hoogle/local.nix +++ b/pkgs/development/libraries/haskell/hoogle/local.nix @@ -24,7 +24,7 @@ # refer to their documentation via symlink so they are not garbage collected. { stdenv, hoogle, rehoo -, haskellPlatform, ghc, packages ? [ haskellPlatform ghc.ghc ] +, ghc, packages ? [ ghc.ghc ] }: let diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a86c7d34130f..0032e89740a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3275,7 +3275,6 @@ let ) haskell)); haskellPackages = haskellPackages_ghc783; - haskellPlatform = haskellPlatformPackages."2013_2_0_0"; haskellPackages_ghc6104 = haskell.packages_ghc6104; haskellPackages_ghc6123 = haskell.packages_ghc6123; @@ -3288,8 +3287,6 @@ let haskellPackages_ghc783 = recurseIntoAttrs haskell.packages_ghc783.highPrio; haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; - haskellPlatformPackages = recurseIntoAttrs (import ../development/libraries/haskell/haskell-platform { inherit pkgs; }); - haxe = callPackage ../development/compilers/haxe { }; hhvm = callPackage ../development/compilers/hhvm { }; From 26e9ed86b5d9c85d58e0fe0ab09b22edb3dc721e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:53:35 +0100 Subject: [PATCH 02/52] haskell-aeson: drop obsolete version 0.7.0.6 --- .../libraries/haskell/aeson/0.7.0.6.nix | 28 ------------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 29 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/aeson/0.7.0.6.nix diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix deleted file mode 100644 index b5626f63932a..000000000000 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix +++ /dev/null @@ -1,28 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit -, mtl, QuickCheck, scientific, syb, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, text, time -, unorderedContainers, vector -}: - -cabal.mkDerivation (self: { - pname = "aeson"; - version = "0.7.0.6"; - sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4"; - buildDepends = [ - attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb - text time unorderedContainers vector - ]; - testDepends = [ - attoparsec HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 text time unorderedContainers vector - ]; - meta = { - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8966683e7a48..391c6dce1512 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -144,7 +144,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in AES = callPackage ../development/libraries/haskell/AES {}; aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; }; - aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; }; aeson_0_8_0_2 = callPackage ../development/libraries/haskell/aeson/0.8.0.2.nix { blazeBuilder = null; }; aeson = self.aeson_0_8_0_2; From a7b529d57e4743155414e5adfa8d6d73bc950a70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:54:27 +0100 Subject: [PATCH 03/52] haskell-async: drop obsolete version 2.0.1.3 --- .../libraries/haskell/async/2.0.1.3.nix | 19 ------------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/async/2.0.1.3.nix diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix deleted file mode 100644 index a60830309e78..000000000000 --- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, HUnit, stm, testFramework, testFrameworkHunit }: - -cabal.mkDerivation (self: { - pname = "async"; - version = "2.0.1.3"; - sha256 = "1rbjr6xw5sp8npw17fxg0942kikssv2hyci2sy26r0na98483mkh"; - buildDepends = [ stm ]; - testDepends = [ HUnit testFramework testFrameworkHunit ]; - jailbreak = true; - meta = { - homepage = "https://github.com/simonmar/async"; - description = "Run IO operations asynchronously and wait for their results"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 391c6dce1512..1288f781b08b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -189,7 +189,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in asn1Types = callPackage ../development/libraries/haskell/asn1-types {}; - async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {}; async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {}; async_2_0_1_6 = callPackage ../development/libraries/haskell/async/2.0.1.6.nix {}; async = self.async_2_0_1_6; From 124e62d9d44a9dca85674a7574079a801e035b7e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:55:26 +0100 Subject: [PATCH 04/52] haskell-attoparsec: drop obsolete version 0.11.3.4 --- .../libraries/haskell/attoparsec/0.11.3.4.nix | 22 ------------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 23 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix deleted file mode 100644 index e322f6de4ce0..000000000000 --- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, QuickCheck, scientific, testFramework -, testFrameworkQuickcheck2, text -}: - -cabal.mkDerivation (self: { - pname = "attoparsec"; - version = "0.11.3.4"; - sha256 = "1zahmkb0n7jz0di35x3r8s0xnfg1awqybh2x2zicxbwazl4f53hi"; - buildDepends = [ deepseq scientific text ]; - testDepends = [ - QuickCheck testFramework testFrameworkQuickcheck2 text - ]; - meta = { - homepage = "https://github.com/bos/attoparsec"; - description = "Fast combinator parsing for bytestrings and text"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1288f781b08b..1ba808eb7875 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -201,7 +201,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {}; - attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {}; attoparsec_0_12_1_2 = callPackage ../development/libraries/haskell/attoparsec/0.12.1.2.nix {}; attoparsec = self.attoparsec_0_12_1_2; From 34c6c614fa1c71114d8e993bf59ca52c68d2b812 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:56:17 +0100 Subject: [PATCH 05/52] haskell-binary: drop obsolete version 0.6.1.0 --- .../libraries/haskell/binary/0.6.1.0.nix | 16 ---------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 17 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/binary/0.6.1.0.nix diff --git a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix b/pkgs/development/libraries/haskell/binary/0.6.1.0.nix deleted file mode 100644 index 06aca17cde3f..000000000000 --- a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "binary"; - version = "0.6.1.0"; - sha256 = "0d423k37973f5v9mz9401zmsfdgspnf9h6s9xgr3zh19giz7c3js"; - meta = { - homepage = "https://github.com/kolmodin/binary"; - description = "Binary serialisation for Haskell values using lazy ByteStrings"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1ba808eb7875..da86679832a4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -244,7 +244,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in bimap = callPackage ../development/libraries/haskell/bimap {}; - binary_0_6_1_0 = callPackage ../development/libraries/haskell/binary/0.6.1.0.nix {}; binary_0_7_2_2 = callPackage ../development/libraries/haskell/binary/0.7.2.2.nix {}; binary = null; # core package since ghc >= 7.2.x From a88c077acc368189cf01820ce587c052b3cd2522 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:57:43 +0100 Subject: [PATCH 06/52] haskell-Cabal: drop obsolete version 1.14.0 --- .../libraries/haskell/Cabal/1.14.0.nix | 24 ------------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/Cabal/1.14.0.nix diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix deleted file mode 100644 index a905017472f6..000000000000 --- a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, filepath, HUnit, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "Cabal"; - version = "1.14.0"; - sha256 = "1r5b4x1ham5gdg9m9l8idpvr9czlk1q21vqmg0di4adkp2fhlm3j"; - buildDepends = [ filepath ]; - testDepends = [ - extensibleExceptions filepath HUnit QuickCheck testFramework - testFrameworkHunit testFrameworkQuickcheck2 - ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "A framework for packaging Haskell software"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index da86679832a4..8e2c81b3975d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -343,7 +343,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in c2hsc = callPackage ../development/libraries/haskell/c2hsc {}; - Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {}; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {}; Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {}; Cabal_1_20_0_2 = callPackage ../development/libraries/haskell/Cabal/1.20.0.2.nix {}; From 0fd7525fb3040d1f9067c8a57d062f297b6e4cbe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 11:58:52 +0100 Subject: [PATCH 07/52] haskell-case-insensitive: drop obsolete version 1.1.0.3 --- .../haskell/case-insensitive/1.1.0.3.nix | 20 ------------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix deleted file mode 100644 index 3f75b41bb630..000000000000 --- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, hashable, HUnit, testFramework -, testFrameworkHunit, text -}: - -cabal.mkDerivation (self: { - pname = "case-insensitive"; - version = "1.1.0.3"; - sha256 = "0fr69lfb976gflr8w6d68zn4pz86jfxbb2i49fw3mmam67k5y9bv"; - buildDepends = [ deepseq hashable text ]; - testDepends = [ HUnit testFramework testFrameworkHunit text ]; - meta = { - homepage = "https://github.com/basvandijk/case-insensitive"; - description = "Case insensitive string comparison"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8e2c81b3975d..a01d3c99b858 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -373,7 +373,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cassava = callPackage ../development/libraries/haskell/cassava {}; caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; - caseInsensitive_1_1_0_3 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.3.nix {}; caseInsensitive_1_2_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.2.0.1.nix {}; caseInsensitive = self.caseInsensitive_1_2_0_1; From 9c6be179b7ea408cb11f0066a5876eb363302a31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:00:20 +0100 Subject: [PATCH 08/52] haskell-cgi: drop obsolete versions 3001.1.7.1 3001.1.7.2, 3001.1.7.3, 3001.1.7.4, and 3001.1.8.5 --- .../libraries/haskell/cgi/3001.1.7.1.nix | 16 ---------------- .../libraries/haskell/cgi/3001.1.7.2.nix | 16 ---------------- .../libraries/haskell/cgi/3001.1.7.3.nix | 17 ----------------- .../libraries/haskell/cgi/3001.1.7.4.nix | 17 ----------------- .../libraries/haskell/cgi/3001.1.8.5.nix | 18 ------------------ pkgs/top-level/haskell-packages.nix | 5 ----- 6 files changed, 89 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix delete mode 100644 pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix delete mode 100644 pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix delete mode 100644 pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix delete mode 100644 pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix deleted file mode 100644 index 068d1b7dadfa..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.7.1"; - sha256 = "7d1d710871fffbbec2a33d7288b2959ddbcfd794d47f0122127576c02550b339"; - buildDepends = [ mtl network parsec xhtml ]; - meta = { - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix deleted file mode 100644 index c10fa2416f71..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.7.2"; - sha256 = "ad35971388fa1809a5cd71bb2f051d69d753e4153b43d843b431674cf79a1c39"; - buildDepends = [ mtl network parsec xhtml ]; - meta = { - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix deleted file mode 100644 index 7cb7e77dd778..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.7.3"; - sha256 = "f1f4bc6b06e8a191db4ddb43617fee3ef37635e380d6a17c29efb5641ce91df0"; - buildDepends = [ extensibleExceptions mtl network parsec xhtml ]; - meta = { - homepage = "http://andersk.mit.edu/haskell/cgi/"; - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix deleted file mode 100644 index 6071ecc7597e..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.7.4"; - sha256 = "1fiild4djzhyz683kwwb0k4wvhd89ihbn6vncjl270xvwj5xmrbd"; - buildDepends = [ extensibleExceptions mtl network parsec xhtml ]; - meta = { - homepage = "http://andersk.mit.edu/haskell/cgi/"; - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix deleted file mode 100644 index 31d523717c5e..000000000000 --- a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, MonadCatchIOMtl, mtl, network, parsec, xhtml }: - -cabal.mkDerivation (self: { - pname = "cgi"; - version = "3001.1.8.5"; - sha256 = "0ffvn9ki5yq2zc65afmy04353v4s66lajc7y563fhj2kz5ib5ks6"; - buildDepends = [ MonadCatchIOMtl mtl network parsec xhtml ]; - meta = { - homepage = "http://andersk.mit.edu/haskell/cgi/"; - description = "A library for writing CGI programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a01d3c99b858..c08b4b681d85 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -386,12 +386,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in certificate = callPackage ../development/libraries/haskell/certificate {}; - cgi_3001_1_7_1 = callPackage ../development/libraries/haskell/cgi/3001.1.7.1.nix {}; - cgi_3001_1_7_2 = callPackage ../development/libraries/haskell/cgi/3001.1.7.2.nix {}; - cgi_3001_1_7_3 = callPackage ../development/libraries/haskell/cgi/3001.1.7.3.nix {}; - cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {}; cgi_3001_1_7_5 = callPackage ../development/libraries/haskell/cgi/3001.1.7.5.nix {}; - cgi_3001_1_8_5 = callPackage ../development/libraries/haskell/cgi/3001.1.8.5.nix {}; cgi_3001_2_0_0 = callPackage ../development/libraries/haskell/cgi/3001.2.0.0.nix {}; cgi = self.cgi_3001_2_0_0; From f27adbed3ce2e599e5d4cadcbb7bd2a297e32b02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:01:41 +0100 Subject: [PATCH 09/52] haskell-convertible: drop obsolete version 1.0.11.1 --- .../haskell/convertible/1.0.11.1.nix | 19 ------------------- .../convertible/{1.1.0.0.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/convertible/1.0.11.1.nix rename pkgs/development/libraries/haskell/convertible/{1.1.0.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix b/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix deleted file mode 100644 index 57423c1b71f0..000000000000 --- a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, text, time }: - -cabal.mkDerivation (self: { - pname = "convertible"; - version = "1.0.11.1"; - sha256 = "1r50a2rpfsx0s7dv8ww5xck33b1mhy73gfilffrbqd4hxjgnxlj6"; - isLibrary = true; - isExecutable = true; - buildDepends = [ mtl text time ]; - meta = { - homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible"; - description = "Typeclasses and instances for converting between types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix b/pkgs/development/libraries/haskell/convertible/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/convertible/1.1.0.0.nix rename to pkgs/development/libraries/haskell/convertible/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c08b4b681d85..1be451ce09b9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -499,9 +499,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {}; - convertible_1_0_11_1 = callPackage ../development/libraries/haskell/convertible/1.0.11.1.nix {}; - convertible_1_1_0_0 = callPackage ../development/libraries/haskell/convertible/1.1.0.0.nix {}; - convertible = self.convertible_1_1_0_0; + convertible = callPackage ../development/libraries/haskell/convertible {}; continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {}; From 350a6a014b53c658a925bcafe5290da28a8809bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:02:30 +0100 Subject: [PATCH 10/52] haskell-deepseq: drop obsolete versions 1.1.0.0 and 1.1.0.2 --- .../libraries/haskell/deepseq/1.1.0.0.nix | 15 --------------- .../libraries/haskell/deepseq/1.1.0.2.nix | 15 --------------- pkgs/top-level/haskell-packages.nix | 2 -- 3 files changed, 32 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix deleted file mode 100644 index 4d7a0b9b818a..000000000000 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "deepseq"; - version = "1.1.0.0"; - sha256 = "947c45e7ee862159f190fb8e905c1328f7672cb9e6bf3abd1d207bbcf1eee50a"; - meta = { - description = "Fully evaluate data structures"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix deleted file mode 100644 index 7748ff96a8af..000000000000 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "deepseq"; - version = "1.1.0.2"; - sha256 = "1iqk8lc2an2rd1j9lcr76yabiz18h10lazlmdg5c528yssyd6135"; - meta = { - description = "Deep evaluation of data structures"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1be451ce09b9..eeb7ca6b8a2a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -617,8 +617,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Decimal = callPackage ../development/libraries/haskell/Decimal {}; - deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {}; - deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {}; deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {}; deepseq_1_3_0_2 = callPackage ../development/libraries/haskell/deepseq/1.3.0.2.nix {}; deepseq = null; # core package since ghc >= 7.4.x From 5e1bd2b5083bd2356cb8c68fc8e4ee8a46afb670 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:04:23 +0100 Subject: [PATCH 11/52] haskell-editline: drop obsolete version 0.2.1.0 --- .../libraries/haskell/editline/0.2.1.0.nix | 17 ----------------- .../editline/{0.2.1.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/editline/0.2.1.0.nix rename pkgs/development/libraries/haskell/editline/{0.2.1.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix deleted file mode 100644 index d36a2ee11f28..000000000000 --- a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, libedit }: - -cabal.mkDerivation (self: { - pname = "editline"; - version = "0.2.1.0"; - sha256 = "1qa65iqr5k3ajq1glf5y84lld132i2i3l0zmsw8xqkq7hrgqwqc3"; - extraLibraries = [ libedit ]; - meta = { - homepage = "http://code.haskell.org/editline"; - description = "Bindings to the editline library (libedit)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix b/pkgs/development/libraries/haskell/editline/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/editline/0.2.1.1.nix rename to pkgs/development/libraries/haskell/editline/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index eeb7ca6b8a2a..51bcc33a0fc4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -725,9 +725,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in editDistance = callPackage ../development/libraries/haskell/edit-distance {}; - editline_0_2_1_0 = callPackage ../development/libraries/haskell/editline/0.2.1.0.nix {}; - editline_0_2_1_1 = callPackage ../development/libraries/haskell/editline/0.2.1.1.nix {}; - editline = self.editline_0_2_1_1; + editline = callPackage ../development/libraries/haskell/editline {}; ekg = callPackage ../development/libraries/haskell/ekg {}; ekgCarbon = callPackage ../development/libraries/haskell/ekg-carbon {}; From 78ccd47130b802ff7ce1f6b3495399cf115c6603 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:05:18 +0100 Subject: [PATCH 12/52] haskell-equivalence: drop obsolete version 0.2.3 --- .../libraries/haskell/equivalence/0.2.3.nix | 23 ------------------- .../equivalence/{0.2.5.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/equivalence/0.2.3.nix rename pkgs/development/libraries/haskell/equivalence/{0.2.5.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/equivalence/0.2.3.nix b/pkgs/development/libraries/haskell/equivalence/0.2.3.nix deleted file mode 100644 index c21c0e161703..000000000000 --- a/pkgs/development/libraries/haskell/equivalence/0.2.3.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, QuickCheck, STMonadTrans, testFramework -, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "equivalence"; - version = "0.2.3"; - sha256 = "0dd986y0sn89fparyz6kz9yhzysbqjcp8s99r81ihghg7s9yc743"; - buildDepends = [ mtl STMonadTrans ]; - testDepends = [ - mtl QuickCheck STMonadTrans testFramework testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://bitbucket.org/paba/equivalence/"; - description = "Maintaining an equivalence relation implemented as union-find using STT"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/equivalence/0.2.5.nix b/pkgs/development/libraries/haskell/equivalence/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/equivalence/0.2.5.nix rename to pkgs/development/libraries/haskell/equivalence/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 51bcc33a0fc4..b2f7ff933cf9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -766,9 +766,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in equationalReasoning = callPackage ../development/libraries/haskell/equational-reasoning {}; - equivalence_0_2_3 = callPackage ../development/libraries/haskell/equivalence/0.2.3.nix {}; - equivalence_0_2_5 = callPackage ../development/libraries/haskell/equivalence/0.2.5.nix {}; - equivalence = self.equivalence_0_2_5; + equivalence = callPackage ../development/libraries/haskell/equivalence {}; erf = callPackage ../development/libraries/haskell/erf {}; From 2b28fc73f9984dc8581b8162a2276f46d519f3d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:06:32 +0100 Subject: [PATCH 13/52] haskell-extensible-exceptions: drop obsolete versions 0.1.1.0 0.1.1.2, 0.1.1.3, and 0.1.1.4 --- .../haskell/extensible-exceptions/0.1.1.0.nix | 15 --------------- .../haskell/extensible-exceptions/0.1.1.2.nix | 15 --------------- .../haskell/extensible-exceptions/0.1.1.3.nix | 15 --------------- .../{0.1.1.4.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +----- 5 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix delete mode 100644 pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix delete mode 100644 pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix rename pkgs/development/libraries/haskell/extensible-exceptions/{0.1.1.4.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix deleted file mode 100644 index e9c1f352a095..000000000000 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "extensible-exceptions"; - version = "0.1.1.0"; - sha256 = "c252dc5a505332700f041d4e1fd3d309cde6158892f9c35339bf5e67bad7f781"; - meta = { - description = "Extensible exceptions"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix deleted file mode 100644 index 8003b47f64e1..000000000000 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "extensible-exceptions"; - version = "0.1.1.2"; - sha256 = "0rsdvb7k8mp88s1jjmna17qa6363vbjgvlkpncmn8516dnxhypg3"; - meta = { - description = "Extensible exceptions"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix deleted file mode 100644 index ee5abc006b67..000000000000 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "extensible-exceptions"; - version = "0.1.1.3"; - sha256 = "1i8rjfczsx1wjfaq423a7cp7qrnxh053865z7bg6hwhk2pxsrxkm"; - meta = { - description = "Extensible exceptions"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix b/pkgs/development/libraries/haskell/extensible-exceptions/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix rename to pkgs/development/libraries/haskell/extensible-exceptions/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b2f7ff933cf9..2c522c4252a3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -816,11 +816,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in extensibleEffects = callPackage ../development/libraries/haskell/extensible-effects {}; - extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {}; - extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {}; - extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {}; - extensibleExceptions_0_1_1_4 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.4.nix {}; - extensibleExceptions = self.extensibleExceptions_0_1_1_4; + extensibleExceptions = callPackage ../development/libraries/haskell/extensible-exceptions {}; extra = callPackage ../development/libraries/haskell/extra {}; From 66439fcb3dafcb44b874f1e0e000ab4aad946012 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:08:11 +0100 Subject: [PATCH 14/52] haskell-fgl: drop obsolete versions 5.4.2.2, 5.4.2.3, 5.4.2.4, 5.5.0.0, and 5.5.0.1 --- .../libraries/haskell/fgl/5.4.2.2.nix | 17 ----------------- .../libraries/haskell/fgl/5.4.2.3.nix | 17 ----------------- .../libraries/haskell/fgl/5.4.2.4.nix | 17 ----------------- .../libraries/haskell/fgl/5.5.0.0.nix | 17 ----------------- .../haskell/fgl/{5.5.0.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +----- 6 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/fgl/5.4.2.2.nix delete mode 100644 pkgs/development/libraries/haskell/fgl/5.4.2.3.nix delete mode 100644 pkgs/development/libraries/haskell/fgl/5.4.2.4.nix delete mode 100644 pkgs/development/libraries/haskell/fgl/5.5.0.0.nix rename pkgs/development/libraries/haskell/fgl/{5.5.0.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix deleted file mode 100644 index 61043f82f976..000000000000 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "fgl"; - version = "5.4.2.2"; - sha256 = "8232c337f0792854bf2a12a5fd1bc46726fff05d2f599053286ff873364cd7d2"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; - description = "Martin Erwig's Functional Graph Library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix deleted file mode 100644 index 1ecc9fb05e71..000000000000 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "fgl"; - version = "5.4.2.3"; - sha256 = "1f46siqqv8bc9v8nxr72nxabpzfax117ncgdvif6rax5ansl48g7"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; - description = "Martin Erwig's Functional Graph Library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix deleted file mode 100644 index 65596c350dea..000000000000 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "fgl"; - version = "5.4.2.4"; - sha256 = "0rh22786f37mpsvhkv075wjh5sd0c83nlhk669xil9rd7swcr66f"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; - description = "Martin Erwig's Functional Graph Library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix b/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix deleted file mode 100644 index 4fd2a4d05971..000000000000 --- a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "fgl"; - version = "5.5.0.0"; - sha256 = "1kdqxbpsaka97rx0c7czlc1nfi72mdxs46gnqa8p0wxn1vx437g3"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; - description = "Martin Erwig's Functional Graph Library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix b/pkgs/development/libraries/haskell/fgl/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/fgl/5.5.0.1.nix rename to pkgs/development/libraries/haskell/fgl/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2c522c4252a3..748d7e2710b2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -848,11 +848,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in final = callPackage ../development/libraries/haskell/final {}; - fgl_5_4_2_2 = callPackage ../development/libraries/haskell/fgl/5.4.2.2.nix {}; - fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {}; - fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {}; - fgl_5_5_0_1 = callPackage ../development/libraries/haskell/fgl/5.5.0.1.nix {}; - fgl = self.fgl_5_5_0_1; + fgl = callPackage ../development/libraries/haskell/fgl {}; fglVisualize = callPackage ../development/libraries/haskell/fgl-visualize {}; From b6f913d41f00ccdd36d8985d4f2975d48ee204c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:12:33 +0100 Subject: [PATCH 15/52] 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 --- .../libraries/haskell/OpenGL/2.2.1.1.nix | 17 -------------- .../libraries/haskell/OpenGL/2.2.3.0.nix | 17 -------------- .../libraries/haskell/OpenGL/2.2.3.1.nix | 17 -------------- .../libraries/haskell/OpenGL/2.4.0.2.nix | 20 ----------------- .../libraries/haskell/OpenGL/2.6.0.1.nix | 22 ------------------- .../libraries/haskell/OpenGL/2.8.0.0.nix | 18 --------------- .../OpenGL/{2.9.2.0.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 9 +------- 8 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix delete mode 100644 pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix delete mode 100644 pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix delete mode 100644 pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix rename pkgs/development/libraries/haskell/OpenGL/{2.9.2.0.nix => default.nix} (100%) 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 747720eba85c..000000000000 --- 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 af01702b01b1..000000000000 --- 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 fa3ae576bfae..000000000000 --- 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 81e754e269f8..000000000000 --- 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 f8bcd405d0ea..000000000000 --- 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 ea1fdcc97115..000000000000 --- 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 similarity index 100% rename from pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix rename to pkgs/development/libraries/haskell/OpenGL/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 748d7e2710b2..48c481fb3c96 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 {}; From 103cf8e78ae07cb3e8b1af8f5aed76d170a27761 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:14:14 +0100 Subject: [PATCH 16/52] 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 88a10caac094..000000000000 --- 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 a9988a533285..000000000000 --- 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 c92565ca4afa..000000000000 --- 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 0bac3e0d5dba..000000000000 --- 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 9402d56f687e..000000000000 --- 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 c28194d7adbe..000000000000 --- 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 48c481fb3c96..aacc35f11817 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 {}; From f7bb952d56377a34157de80b52491287ab0ec3ef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:15:37 +0100 Subject: [PATCH 17/52] haskell-GLURaw: drop obsolete version 1.3.0.0 --- .../libraries/haskell/GLURaw/1.3.0.0.nix | 18 ------------------ .../GLURaw/{1.4.0.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix rename pkgs/development/libraries/haskell/GLURaw/{1.4.0.1.nix => default.nix} (100%) 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 bf23628a7101..000000000000 --- 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 aacc35f11817..147bac240743 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 {}; From c2e47bbb6dc675f0c10a1e0193689c8e98a5fdde Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:16:31 +0100 Subject: [PATCH 18/52] haskell-hashable: drop obsolete version 1.1.2.5 --- .../libraries/haskell/hashable/1.1.2.5.nix | 22 ------------------- .../hashable/{1.2.2.0.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/hashable/1.1.2.5.nix rename pkgs/development/libraries/haskell/hashable/{1.2.2.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix deleted file mode 100644 index 3c8330e82ae9..000000000000 --- a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, QuickCheck, random, testFramework -, testFrameworkQuickcheck2, text -}: - -cabal.mkDerivation (self: { - pname = "hashable"; - version = "1.1.2.5"; - sha256 = "0gbiaj5ck2bvvinndp2pg7qsm2h2izbnz9wi97dbm7i8r4qd9d9z"; - buildDepends = [ text ]; - testDepends = [ - QuickCheck random testFramework testFrameworkQuickcheck2 text - ]; - meta = { - homepage = "http://github.com/tibbe/hashable"; - description = "A class for types that can be converted to a hash value"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/hashable/1.2.2.0.nix b/pkgs/development/libraries/haskell/hashable/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/hashable/1.2.2.0.nix rename to pkgs/development/libraries/haskell/hashable/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 147bac240743..0e4578806de8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1054,9 +1054,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in happstackFastCGI = callPackage ../development/libraries/haskell/happstack/happstack-fastcgi.nix {}; - hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; - hashable_1_2_2_0 = callPackage ../development/libraries/haskell/hashable/1.2.2.0.nix {}; - hashable = self.hashable_1_2_2_0; + hashable = callPackage ../development/libraries/haskell/hashable {}; hashableExtras = callPackage ../development/libraries/haskell/hashable-extras {}; From 760e9812666692bb0274b625cc6f801cfce355dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:17:45 +0100 Subject: [PATCH 19/52] haskell-src: drop obsolete versions 1.0.1.3, 1.0.1.4, and 1.0.1.5.nix --- .../libraries/haskell/haskell-src/1.0.1.3.nix | 16 ---------------- .../libraries/haskell/haskell-src/1.0.1.4.nix | 17 ----------------- .../libraries/haskell/haskell-src/1.0.1.5.nix | 18 ------------------ .../haskell-src/{1.0.1.6.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +----- 5 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix delete mode 100644 pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix rename pkgs/development/libraries/haskell/haskell-src/{1.0.1.6.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix deleted file mode 100644 index e2e5ffa304d5..000000000000 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, happy }: - -cabal.mkDerivation (self: { - pname = "haskell-src"; - version = "1.0.1.3"; - sha256 = "a7872900acd2293775a6bdc6dc8f70438ccd80e62d2d1e2394ddff15b1883e89"; - buildTools = [ happy ]; - meta = { - description = "Manipulating Haskell source code"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix deleted file mode 100644 index 54decb79f2b5..000000000000 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, happy, syb }: - -cabal.mkDerivation (self: { - pname = "haskell-src"; - version = "1.0.1.4"; - sha256 = "02h33d7970641p9vi62sgcxb5v4yaz8xx9vf2yxyvxs3hglm7f0j"; - buildDepends = [ syb ]; - buildTools = [ happy ]; - meta = { - description = "Support for manipulating Haskell source code"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix deleted file mode 100644 index 02032c21120b..000000000000 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, happy, syb }: - -cabal.mkDerivation (self: { - pname = "haskell-src"; - version = "1.0.1.5"; - sha256 = "1ay3i2sbrp0pzg6fagg8gqrwq5lcnm5jb5sr11frbk274a82cdwz"; - buildDepends = [ syb ]; - buildTools = [ happy ]; - preConfigure = "runhaskell Setup.hs clean"; - meta = { - description = "Support for manipulating Haskell source code"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix b/pkgs/development/libraries/haskell/haskell-src/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix rename to pkgs/development/libraries/haskell/haskell-src/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0e4578806de8..93adaf1dde15 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1083,11 +1083,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in haskellPackages = callPackage ../development/libraries/haskell/haskell-packages {}; - haskellSrc_1_0_1_3 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.3.nix {}; - haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {}; - haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {}; - haskellSrc_1_0_1_6 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.6.nix {}; - haskellSrc = self.haskellSrc_1_0_1_6; + haskellSrc = callPackage ../development/libraries/haskell/haskell-src {}; haskellSrcExts_1_15_0_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.15.0.1.nix {}; haskellSrcExts_1_16_0_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.16.0.1.nix {}; From 57bdeaa3758d822536e76edf8e79fc635c6a5c22 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:21:07 +0100 Subject: [PATCH 20/52] alex: drop obsolete versions 2.3.1, 2.3.2, 2.3.3, 3.0.1, 3.0.2, and 3.0.5 --- pkgs/development/tools/parsing/alex/2.3.1.nix | 20 ------------------ pkgs/development/tools/parsing/alex/2.3.2.nix | 20 ------------------ pkgs/development/tools/parsing/alex/2.3.3.nix | 20 ------------------ pkgs/development/tools/parsing/alex/3.0.1.nix | 21 ------------------- pkgs/development/tools/parsing/alex/3.0.2.nix | 21 ------------------- pkgs/development/tools/parsing/alex/3.0.5.nix | 20 ------------------ pkgs/top-level/haskell-packages.nix | 6 ------ 7 files changed, 128 deletions(-) delete mode 100644 pkgs/development/tools/parsing/alex/2.3.1.nix delete mode 100644 pkgs/development/tools/parsing/alex/2.3.2.nix delete mode 100644 pkgs/development/tools/parsing/alex/2.3.3.nix delete mode 100644 pkgs/development/tools/parsing/alex/3.0.1.nix delete mode 100644 pkgs/development/tools/parsing/alex/3.0.2.nix delete mode 100644 pkgs/development/tools/parsing/alex/3.0.5.nix diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix deleted file mode 100644 index 83138e2e0ffd..000000000000 --- a/pkgs/development/tools/parsing/alex/2.3.1.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, perl }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "2.3.1"; - sha256 = "cdd42fd992a72fedeff1f38debc21aa315d90dc070f0945d7819c0bccd549a44"; - isLibrary = false; - isExecutable = true; - buildTools = [ perl ]; - doCheck = false; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix deleted file mode 100644 index 0bc13d160170..000000000000 --- a/pkgs/development/tools/parsing/alex/2.3.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, perl }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "2.3.2"; - sha256 = "6715a4c27b15a74d8f31cbb6a7d654b9cb6766d74980c75b65dee7c627049f43"; - isLibrary = false; - isExecutable = true; - buildTools = [ perl ]; - doCheck = false; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix deleted file mode 100644 index ccef30058c50..000000000000 --- a/pkgs/development/tools/parsing/alex/2.3.3.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, perl }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "2.3.3"; - sha256 = "338fc492a1fddd6c528d0eb89857cadab211cb42680aeee1f9702bbfa7c5e1c8"; - isLibrary = false; - isExecutable = true; - buildTools = [ perl ]; - doCheck = false; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix deleted file mode 100644 index 7dc18c63c915..000000000000 --- a/pkgs/development/tools/parsing/alex/3.0.1.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, perl, QuickCheck }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "3.0.1"; - sha256 = "1w7s9kzgr4kfh6cyhb4qkvxwy9gcw3xa1d2k5dy575k3wk73awkj"; - isLibrary = false; - isExecutable = true; - buildDepends = [ QuickCheck ]; - buildTools = [ perl ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/3.0.2.nix b/pkgs/development/tools/parsing/alex/3.0.2.nix deleted file mode 100644 index c18c5d89d1be..000000000000 --- a/pkgs/development/tools/parsing/alex/3.0.2.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, perl, QuickCheck }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "3.0.2"; - sha256 = "0r1i10i9svnd0ayd229d8hgndgc6q8ghabw6zzghwviw5hs36zlr"; - isLibrary = false; - isExecutable = true; - buildDepends = [ QuickCheck ]; - buildTools = [ perl ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/alex/3.0.5.nix b/pkgs/development/tools/parsing/alex/3.0.5.nix deleted file mode 100644 index af32598ee473..000000000000 --- a/pkgs/development/tools/parsing/alex/3.0.5.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ cabal, fetchpatch, perl, QuickCheck }: - -cabal.mkDerivation (self: { - pname = "alex"; - version = "3.0.5"; - sha256 = "0ncnp7cl7dlfcrwzzcp8j59i9j5r66wim1yib9g3b3jkl0bn8cn3"; - isLibrary = false; - isExecutable = true; - buildDepends = [ QuickCheck ]; - buildTools = [ perl ]; - patches = [ (fetchpatch { url="http://github.com/simonmar/alex/pull/21.patch"; sha256="050psfwmjlxhyxiy65jsn3v6b9rnfzy8x5q9mmhzwbirqwi0zkfm"; }) ]; - meta = { - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 93adaf1dde15..9dd9e2912cd8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2997,13 +2997,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Development tools. - alex_2_3_1 = callPackage ../development/tools/parsing/alex/2.3.1.nix {}; - alex_2_3_2 = callPackage ../development/tools/parsing/alex/2.3.2.nix {}; - alex_2_3_3 = callPackage ../development/tools/parsing/alex/2.3.3.nix {}; alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {}; - alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {}; - alex_3_0_2 = callPackage ../development/tools/parsing/alex/3.0.2.nix {}; - alex_3_0_5 = callPackage ../development/tools/parsing/alex/3.0.5.nix {}; alex_3_1_3 = callPackage ../development/tools/parsing/alex/3.1.3.nix {}; alex = self.alex_3_1_3; From e1af9e865d434c6f267300ea4d7d281e1242f95d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:23:48 +0100 Subject: [PATCH 21/52] haddock: drop obsolete versions 2.4.2, 2.7.2, 2.9.2, 2.9.4, 2.11.0, 2.12.0, 2.13.2, 2.13.2.1, 2.14.2, and 2.14.3 --- .../tools/documentation/haddock/2.10.0.nix | 26 ------------------ .../tools/documentation/haddock/2.11.0.nix | 26 ------------------ .../tools/documentation/haddock/2.12.0.nix | 22 --------------- .../tools/documentation/haddock/2.13.2.1.nix | 26 ------------------ .../tools/documentation/haddock/2.13.2.nix | 26 ------------------ .../tools/documentation/haddock/2.14.2.nix | 27 ------------------- .../tools/documentation/haddock/2.14.3.nix | 23 ---------------- .../tools/documentation/haddock/2.4.2.nix | 21 --------------- .../tools/documentation/haddock/2.7.2.nix | 24 ----------------- .../tools/documentation/haddock/2.9.2.nix | 26 ------------------ .../tools/documentation/haddock/2.9.4.nix | 23 ---------------- .../haddock/{2.15.0.nix => default.nix} | 0 pkgs/top-level/haskell-defaults.nix | 6 ----- pkgs/top-level/haskell-packages.nix | 13 +-------- 14 files changed, 1 insertion(+), 288 deletions(-) delete mode 100644 pkgs/development/tools/documentation/haddock/2.10.0.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.11.0.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.12.0.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.13.2.1.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.13.2.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.14.2.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.14.3.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.4.2.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.7.2.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.9.2.nix delete mode 100644 pkgs/development/tools/documentation/haddock/2.9.4.nix rename pkgs/development/tools/documentation/haddock/{2.15.0.nix => default.nix} (100%) diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix deleted file mode 100644 index af9a72058b29..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.10.0.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml, makeWrapper }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.10.0"; - sha256 = "045lmmna5nwj07si81vxms5xkkmqvjsiif20nny5mvlabshxn1yi"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix deleted file mode 100644 index d43e529585ba..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.11.0.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml, makeWrapper }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.11.0"; - sha256 = "0a29n6y9lmk5w78f6j8s7pg0m0k3wm7bx5r2lhk7bnzkr5f7rkcd"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix deleted file mode 100644 index b1249eee3278..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.12.0.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.12.0"; - sha256 = "00kdmpa6vhn6x790641ln40v3pn7aj4ws6pq854n1iyg5ly3ridn"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; - testDepends = [ Cabal filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix deleted file mode 100644 index 749fee28571c..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml, makeWrapper }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.13.2.1"; - sha256 = "0kpk3bmlyd7cb6s39ix8s0ak65xhrln9mg481y3h24lf5syy5ky9"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal deepseq filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.nix b/pkgs/development/tools/documentation/haddock/2.13.2.nix deleted file mode 100644 index aa5be90fbae2..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.13.2.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml, makeWrapper }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.13.2"; - sha256 = "1qwj13ks3fzar14s587svv1pdiwk80m7x5pzn74v3jrqkn0xbrr5"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal deepseq filepath ]; - buildTools = [ alex happy ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.14.2.nix b/pkgs/development/tools/documentation/haddock/2.14.2.nix deleted file mode 100644 index c8ef4299f560..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.14.2.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck -, xhtml, makeWrapper -}: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.14.2"; - sha256 = "0h96jj6y093h4gcqpiq0nyv7h5wjg8ji7z1im9ydivmsv0627prk"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; - testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.14.3.nix b/pkgs/development/tools/documentation/haddock/2.14.3.nix deleted file mode 100644 index 7ce4782bb60c..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.14.3.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck -, xhtml -}: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.14.3"; - sha256 = "031ikrsbkpmmwgdkgdr8s19dfx5y6n39rmyljjdfqygas17gcm6l"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; - testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; - preCheck = "unset GHC_PACKAGE_PATH"; - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix deleted file mode 100644 index 6493302218f9..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.4.2.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, alex, Cabal, filepath, ghcPaths, happy }: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.4.2"; - sha256 = "dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths ]; - buildTools = [ alex happy ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.7.2.nix b/pkgs/development/tools/documentation/haddock/2.7.2.nix deleted file mode 100644 index 53178aca0a18..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.7.2.nix +++ /dev/null @@ -1,24 +0,0 @@ -{cabal, ghcPaths, alex, happy, makeWrapper}: - -cabal.mkDerivation (self : { - pname = "haddock"; - version = "2.7.2"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 - name = self.fname; - sha256 = "4eaaaf62785f0ba3d37ba356cfac4679faef91c0902d8cdbf42837cbe5daab82"; - buildTools = [alex happy makeWrapper]; - propagatedBuildInputs = [ghcPaths]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.9.2.nix b/pkgs/development/tools/documentation/haddock/2.9.2.nix deleted file mode 100644 index 2ed94ff072ab..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.9.2.nix +++ /dev/null @@ -1,26 +0,0 @@ -{cabal, ghcPaths, xhtml, alex, happy, makeWrapper}: - -cabal.mkDerivation (self : { - pname = "haddock"; - version = "2.9.2"; # Haskell Platform 2011.2.0.0 - name = self.fname; - sha256 = "189vvp173pqc69zgzqqx6vyhvsc13p1s86ql60rs1j5qlhh8ajg8"; - buildTools = [alex happy makeWrapper]; - propagatedBuildInputs = [ghcPaths xhtml]; - doCheck = false; - - postInstall = '' - wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" - ''; - - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ - self.stdenv.lib.maintainers.andres - ]; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix deleted file mode 100644 index 80d7c623c1e9..000000000000 --- a/pkgs/development/tools/documentation/haddock/2.9.4.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, alex, Cabal, filepath, ghcPaths, happy, regexCompat, xhtml -}: - -cabal.mkDerivation (self: { - pname = "haddock"; - version = "2.9.4"; - sha256 = "18w5pa1zpjy9mmdzjh0hs8jybmky8j87vzry54nni6a3517c5x86"; - isLibrary = true; - isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml ]; - testDepends = [ Cabal filepath regexCompat ]; - buildTools = [ alex happy ]; - doCheck = false; - meta = { - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/documentation/haddock/2.15.0.nix b/pkgs/development/tools/documentation/haddock/default.nix similarity index 100% rename from pkgs/development/tools/documentation/haddock/2.15.0.nix rename to pkgs/development/tools/documentation/haddock/default.nix diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 6ee3e4d9e0ab..e6773ea1fda4 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -49,7 +49,6 @@ }; entropy = super.entropy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; gloss = null; # requires base >= 4.7 - haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_2; }; rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_2; }; @@ -70,7 +69,6 @@ }; extensibleExceptions = null; # core package in ghc <= 7.4.x hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; - haddock = self.haddock_2_11_0; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; primitive = self.primitive_0_5_3_0; # later versions don't compile random = self.random_1_0_1_1; # requires base >= 4.6.x @@ -81,14 +79,12 @@ caseInsensitive = self.caseInsensitive_1_0_0_1; deepseq = self.deepseq_1_3_0_2; DrIFT = null; # doesn't compile with old GHC versions - haddock = self.haddock_2_9_4; syb = self.syb_0_4_0; }; ghc704Prefs = self : super : ghc722Prefs self super // { binary = self.binary_0_7_2_2; # core package in ghc >= 7.2.2 caseInsensitive = super.caseInsensitive; # undo the override from ghc 7.2.2 - haddock = self.haddock_2_9_2.override { alex = self.alex_2_3_5; }; HsSyck = self.HsSyck_0_51; jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; random = null; # core package in ghc <= 7.0.x @@ -103,7 +99,6 @@ deepseq = self.deepseq_1_2_0_1; dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; exceptions = null; # none of our versions compile - haddock = self.haddock_2_7_2; logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; monadPar = self.monadPar_0_1_0_3; nats = null; # none of our versions compile @@ -129,7 +124,6 @@ cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2; caseInsensitive = super.caseInsensitive.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; GLUT = self.GLUT_2_2_2_1; - haddock = self.haddock_2_4_2; happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9dd9e2912cd8..065ca17fff4a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -3009,18 +3009,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in DrIFT = callPackage ../development/tools/haskell/DrIFT {}; - haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix { Cabal = null; }; - haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix { alex = self.alex_2_3_5; }; - haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {}; - haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {}; - haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {}; - haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {}; - haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {}; - haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {}; - haddock_2_14_2 = callPackage ../development/tools/documentation/haddock/2.14.2.nix {}; - haddock_2_14_3 = callPackage ../development/tools/documentation/haddock/2.14.3.nix {}; - haddock_2_15_0 = callPackage ../development/tools/documentation/haddock/2.15.0.nix {}; - haddock = self.haddock_2_15_0; + haddock = callPackage ../development/tools/documentation/haddock {}; haddockApi = callPackage ../development/libraries/haskell/haddock-api {}; From cdaccfbad4bfcaa768059fd2fe5ebafa45596b50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:26:43 +0100 Subject: [PATCH 22/52] haskell-HTTP: drop obsolete versions 4000.0.6, 4000.0.9, 4000.1.1, 4000.1.2, 4000.2.1, 4000.2.2, 4000.2.3, 4000.2.5, and 4000.2.8 --- .../libraries/haskell/HTTP/4000.0.6.nix | 18 ------------- .../libraries/haskell/HTTP/4000.0.9.nix | 18 ------------- .../libraries/haskell/HTTP/4000.1.1.nix | 18 ------------- .../libraries/haskell/HTTP/4000.1.2.nix | 18 ------------- .../libraries/haskell/HTTP/4000.2.1.nix | 23 ---------------- .../libraries/haskell/HTTP/4000.2.2.nix | 23 ---------------- .../libraries/haskell/HTTP/4000.2.3.nix | 23 ---------------- .../libraries/haskell/HTTP/4000.2.5.nix | 25 ------------------ .../libraries/haskell/HTTP/4000.2.8.nix | 26 ------------------- .../HTTP/{4000.2.18.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 12 +-------- 11 files changed, 1 insertion(+), 203 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.0.6.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.0.9.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.1.2.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.1.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.2.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.3.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.5.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.8.nix rename pkgs/development/libraries/haskell/HTTP/{4000.2.18.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix deleted file mode 100644 index a41dd3c25dc4..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec }: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.0.6"; - sha256 = "75af1ac4dc21b10c8a1a54a33179ea822e591887bab7278360a3d6b38304d39b"; - buildDepends = [ mtl network parsec ]; - doCheck = false; - meta = { - homepage = "http://projects.haskell.org/http/"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix deleted file mode 100644 index e530452b08c3..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec }: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.0.9"; - sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba"; - buildDepends = [ mtl network parsec ]; - doCheck = false; - meta = { - homepage = "http://projects.haskell.org/http/"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix deleted file mode 100644 index 76356134589e..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec }: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.1.1"; - sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3"; - buildDepends = [ mtl network parsec ]; - doCheck = false; - meta = { - homepage = "http://projects.haskell.org/http/"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix deleted file mode 100644 index 344a86a0da88..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, network, parsec }: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.1.2"; - sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8"; - buildDepends = [ mtl network parsec ]; - doCheck = false; - meta = { - homepage = "http://projects.haskell.org/http/"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix deleted file mode 100644 index c677bbf40db4..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, httpdShed, HUnit, mtl, network, parsec, split -, testFramework, testFrameworkHunit -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.1"; - sha256 = "01076rk7ly5228pszn54x4nqc6rqq1xw11ij9ajvhzf419islh0a"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - httpdShed HUnit network split testFramework testFrameworkHunit - ]; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix deleted file mode 100644 index c18fd35c8a08..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, httpdShed, HUnit, mtl, network, parsec, split -, testFramework, testFrameworkHunit -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.2"; - sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - httpdShed HUnit network split testFramework testFrameworkHunit - ]; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix deleted file mode 100644 index 86c4dc8fcc01..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, httpdShed, HUnit, mtl, network, parsec, split -, testFramework, testFrameworkHunit -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.3"; - sha256 = "1z7s5rkyljwdl95cwqbqg64i207wjwxgpksrdmvcv82k39srzx80"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - httpdShed HUnit network split testFramework testFrameworkHunit - ]; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix deleted file mode 100644 index 54c8733c5840..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes -, HUnit, mtl, network, parsec, pureMD5, split, testFramework -, testFrameworkHunit, wai, warp -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.5"; - sha256 = "03ij1zkykc438x2r1szz6ddvfhrjywlx61nrz377srcpbdmhxpb7"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl - network pureMD5 split testFramework testFrameworkHunit wai warp - ]; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix deleted file mode 100644 index d308d547c78d..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes -, HUnit, mtl, network, parsec, pureMD5, split, testFramework -, testFrameworkHunit, wai, warp -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.8"; - sha256 = "0p0cwzjw2102bsyfaga6m8b53s6qnhd6byg2j2qla653f6kjlsh8"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl - network pureMD5 split testFramework testFrameworkHunit wai warp - ]; - jailbreak = true; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.18.nix b/pkgs/development/libraries/haskell/HTTP/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/HTTP/4000.2.18.nix rename to pkgs/development/libraries/haskell/HTTP/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 065ca17fff4a..ac77f35e0875 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1129,17 +1129,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HTF = callPackage ../development/libraries/haskell/HTF {}; - HTTP_4000_0_6 = callPackage ../development/libraries/haskell/HTTP/4000.0.6.nix {}; - HTTP_4000_0_9 = callPackage ../development/libraries/haskell/HTTP/4000.0.9.nix {}; - HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {}; - HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {}; - HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; - HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; - HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; - HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; - HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; - HTTP_4000_2_18 = callPackage ../development/libraries/haskell/HTTP/4000.2.18.nix {}; - HTTP = self.HTTP_4000_2_18; + HTTP = callPackage ../development/libraries/haskell/HTTP {}; httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; From a3c4b817a562a51b99793ce993c0e17ead273806 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:28:48 +0100 Subject: [PATCH 23/52] haskell-html: rename the expression file from 1.0.1.2.nix to default.nix --- .../libraries/haskell/html/{1.0.1.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/development/libraries/haskell/html/{1.0.1.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/html/1.0.1.2.nix b/pkgs/development/libraries/haskell/html/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/html/1.0.1.2.nix rename to pkgs/development/libraries/haskell/html/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ac77f35e0875..3c9dc32391cc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1319,8 +1319,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; - html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {}; - html = self.html_1_0_1_2; + html = callPackage ../development/libraries/haskell/html {}; htmlConduit = callPackage ../development/libraries/haskell/html-conduit {}; From 3f7ccb4114056187ada67c7abc76a8abf488286b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:30:33 +0100 Subject: [PATCH 24/52] haskell-HUnit: drop obsolete versions 1.2.0.3, 1.2.2.1, 1.2.2.3, 1.2.4.2, 1.2.4.3, and 1.2.5.1 --- .../libraries/haskell/HUnit/1.2.0.3.nix | 16 ---------------- .../libraries/haskell/HUnit/1.2.2.1.nix | 18 ------------------ .../libraries/haskell/HUnit/1.2.2.3.nix | 18 ------------------ .../libraries/haskell/HUnit/1.2.4.2.nix | 18 ------------------ .../libraries/haskell/HUnit/1.2.4.3.nix | 19 ------------------- .../libraries/haskell/HUnit/1.2.5.1.nix | 17 ----------------- .../HUnit/{1.2.5.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 9 +-------- 8 files changed, 1 insertion(+), 114 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix delete mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix delete mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix delete mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix delete mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix delete mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix rename pkgs/development/libraries/haskell/HUnit/{1.2.5.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix deleted file mode 100644 index 7bd199555d79..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.0.3"; - sha256 = "954f584f7c096c3ddef677e70b3811195bb4fd18dfdb4727a260ca7d7465de12"; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix deleted file mode 100644 index e995adab83c8..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.2.1"; - sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853"; - isLibrary = true; - isExecutable = true; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix deleted file mode 100644 index 02757e9074c2..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.2.3"; - sha256 = "158i6s014ybh5bflzspd21qzdlhdyk89yqpmk8kwc59lxjvvjsxz"; - isLibrary = true; - isExecutable = true; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix deleted file mode 100644 index 13483375823f..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.4.2"; - sha256 = "0yijvrjmmz6vvgi5h1195z4psmymvhq6rr7kkd26nqbd34lbrg7x"; - isLibrary = true; - isExecutable = true; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix deleted file mode 100644 index 6f866137945c..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.4.3"; - sha256 = "0sk2s0g28wly64nisgrj4wr914zx940pvj5zvkv9n467vssywzbr"; - isLibrary = true; - isExecutable = true; - buildDepends = [ deepseq ]; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix deleted file mode 100644 index ae33779597bf..000000000000 --- a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "HUnit"; - version = "1.2.5.1"; - sha256 = "0wa4yqgfyrfxzhdyd04xvzi4qaswbg0rrbywz8sxzkp71v91a35w"; - buildDepends = [ deepseq ]; - meta = { - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix b/pkgs/development/libraries/haskell/HUnit/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix rename to pkgs/development/libraries/haskell/HUnit/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3c9dc32391cc..50b92f2f12e0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1335,14 +1335,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in holyProject = callPackage ../development/libraries/haskell/holy-project {}; - HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {}; - HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {}; - HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; - HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; - HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.3.nix {}; - HUnit_1_2_5_1 = callPackage ../development/libraries/haskell/HUnit/1.2.5.1.nix {}; - HUnit_1_2_5_2 = callPackage ../development/libraries/haskell/HUnit/1.2.5.2.nix {}; - HUnit = self.HUnit_1_2_5_2; + HUnit = callPackage ../development/libraries/haskell/HUnit {}; HUnitApprox = callPackage ../development/libraries/haskell/HUnit-approx {}; From 82aab38251753a4cc38b516707f8a16a1686cc2e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:38:08 +0100 Subject: [PATCH 25/52] haskell-language-java: drop obsolete version 0.2.6 --- .../libraries/haskell/language-java/0.2.6.nix | 25 ------------------- .../language-java/{0.2.7.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +-- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/language-java/0.2.6.nix rename pkgs/development/libraries/haskell/language-java/{0.2.7.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/language-java/0.2.6.nix b/pkgs/development/libraries/haskell/language-java/0.2.6.nix deleted file mode 100644 index 316a95481a5b..000000000000 --- a/pkgs/development/libraries/haskell/language-java/0.2.6.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "language-java"; - version = "0.2.6"; - sha256 = "1rwkc71c77v1lm5vnfkf7wr4lzvkpdylwz8wia40xwyxidq9qv27"; - buildDepends = [ cpphs parsec syb ]; - testDepends = [ - filepath HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - buildTools = [ alex ]; - doCheck = false; - meta = { - homepage = "http://github.com/vincenthz/language-java"; - description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/language-java/0.2.7.nix b/pkgs/development/libraries/haskell/language-java/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/language-java/0.2.7.nix rename to pkgs/development/libraries/haskell/language-java/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 50b92f2f12e0..d1366024cec6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1468,9 +1468,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in languageGlsl = callPackage ../development/libraries/haskell/language-glsl {}; - languageJava_0_2_6 = callPackage ../development/libraries/haskell/language-java/0.2.6.nix {}; - languageJava_0_2_7 = callPackage ../development/libraries/haskell/language-java/0.2.7.nix {}; - languageJava = self.languageJava_0_2_7; + languageJava = callPackage ../development/libraries/haskell/language-java {}; languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; From e278868975e9073c30d9f010258cfdb2dde14512 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:40:32 +0100 Subject: [PATCH 26/52] haskell-libsystemd-journal: re-generate expression with cabal2nix --- .../libraries/haskell/libsystemd-journal/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix index 8cf84a5a14e3..e4dc138eae05 100644 --- a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix +++ b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix @@ -1,6 +1,6 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd-journal, text +{ cabal, hashable, hsyslog, pipes, pipesSafe, systemd, text , transformers, uniplate, unixBytestring, unorderedContainers, uuid , vector }: @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { hashable hsyslog pipes pipesSafe text transformers uniplate unixBytestring unorderedContainers uuid vector ]; - extraLibraries = [ systemd-journal ]; + extraLibraries = [ systemd ]; jailbreak = true; meta = { homepage = "http://github.com/ocharles/libsystemd-journal"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d1366024cec6..406c1220a114 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1521,9 +1521,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; - libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal { - systemd-journal = pkgs.systemd; - }; + libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal {}; libxmlSax = callPackage ../development/libraries/haskell/libxml-sax {}; From b1aa6efc1a00499004c80b8c63afcd8476cd438d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:43:05 +0100 Subject: [PATCH 27/52] haskell-MonadRandom: drop obsolete version 0.1.13 --- .../libraries/haskell/MonadRandom/0.1.13.nix | 16 ---------------- pkgs/top-level/haskell-defaults.nix | 2 +- pkgs/top-level/haskell-packages.nix | 1 - 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix b/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix deleted file mode 100644 index 0cbd926b1f18..000000000000 --- a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, random, transformers }: - -cabal.mkDerivation (self: { - pname = "MonadRandom"; - version = "0.1.13"; - sha256 = "1pi12ymsbl2l0ly3ggihg8r0ac87ax267m419cga60wp5ry5zbnk"; - buildDepends = [ mtl random transformers ]; - meta = { - description = "Random-number generation monad"; - license = "unknown"; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index e6773ea1fda4..e53e21fc68db 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -23,7 +23,7 @@ ghc783Prefs = self : super : ghcHEADPrefs self super // { cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; - MonadRandom = self.MonadRandom_0_1_13; # requires transformers >= 0.4.x + MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x mtl = self.mtl_2_1_3_1; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 406c1220a114..633742f463ea 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1667,7 +1667,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {}; - MonadRandom_0_1_13 = callPackage ../development/libraries/haskell/MonadRandom/0.1.13.nix {}; MonadRandom_0_2_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.2.0.1.nix {}; MonadRandom_0_3 = callPackage ../development/libraries/haskell/MonadRandom/0.3.nix {}; MonadRandom = self.MonadRandom_0_3; From 49d273d54863dc441a02552f41025a54ef550c12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:45:51 +0100 Subject: [PATCH 28/52] haskell-mtl: drop obsolete versions 1.1.0.2, 2.0.1.0, 2.1.1, and 2.1.2 --- .../libraries/haskell/mtl/1.1.0.2.nix | 15 --------------- .../libraries/haskell/mtl/2.0.1.0.nix | 16 ---------------- .../development/libraries/haskell/mtl/2.1.1.nix | 16 ---------------- .../development/libraries/haskell/mtl/2.1.2.nix | 17 ----------------- pkgs/top-level/haskell-packages.nix | 4 ---- 5 files changed, 68 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/mtl/1.1.0.2.nix delete mode 100644 pkgs/development/libraries/haskell/mtl/2.0.1.0.nix delete mode 100644 pkgs/development/libraries/haskell/mtl/2.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/mtl/2.1.2.nix diff --git a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix deleted file mode 100644 index 3cc240114dfe..000000000000 --- a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "mtl"; - version = "1.1.0.2"; - sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36"; - meta = { - description = "Monad transformer library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix deleted file mode 100644 index e528736d95a7..000000000000 --- a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "mtl"; - version = "2.0.1.0"; - sha256 = "1w6jpzyl08mringnd6gxwcl3y9q506r240vm1sv0aacml1hy8szk"; - buildDepends = [ transformers ]; - meta = { - description = "Monad classes, using functional dependencies"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/mtl/2.1.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.1.nix deleted file mode 100644 index 8cfb60ddfefd..000000000000 --- a/pkgs/development/libraries/haskell/mtl/2.1.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "mtl"; - version = "2.1.1"; - sha256 = "143s0c5hygwnd72x14jwinpnd92gx4y9blhmv6086rxijqbq6l4j"; - buildDepends = [ transformers ]; - meta = { - description = "Monad classes, using functional dependencies"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/mtl/2.1.2.nix b/pkgs/development/libraries/haskell/mtl/2.1.2.nix deleted file mode 100644 index d72f8bc79d62..000000000000 --- a/pkgs/development/libraries/haskell/mtl/2.1.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "mtl"; - version = "2.1.2"; - sha256 = "1vwb98ci3jnjpndym012amia41h3cjdwpy9330ws881l6dj5fxwc"; - buildDepends = [ transformers ]; - meta = { - homepage = "http://github.com/ekmett/mtl"; - description = "Monad classes, using functional dependencies"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 633742f463ea..407023683f27 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1695,10 +1695,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in msgpack = callPackage ../development/libraries/haskell/msgpack {}; - mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; - mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {}; - mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {}; - mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {}; mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {}; mtl_2_2_1 = callPackage ../development/libraries/haskell/mtl/2.2.1.nix {}; mtl = null; # tightly coupled with 'transformers' which is a core package From 1bcecaed5d59bbf0fd012df294b1dcbb50e14050 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:48:37 +0100 Subject: [PATCH 29/52] haskell-network: drop obsolete versions 2.2.1.4, 2.3.0.2, 2.3.0.5, 2.3.1.0, and 2.4.1.2 --- .../libraries/haskell/network/2.2.1.4.nix | 16 -------------- .../libraries/haskell/network/2.3.0.2.nix | 17 -------------- .../libraries/haskell/network/2.3.0.5.nix | 17 -------------- .../libraries/haskell/network/2.3.1.0.nix | 18 --------------- .../libraries/haskell/network/2.4.1.2.nix | 22 ------------------- pkgs/top-level/haskell-packages.nix | 5 ----- 6 files changed, 95 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/network/2.2.1.4.nix delete mode 100644 pkgs/development/libraries/haskell/network/2.3.0.2.nix delete mode 100644 pkgs/development/libraries/haskell/network/2.3.0.5.nix delete mode 100644 pkgs/development/libraries/haskell/network/2.3.1.0.nix delete mode 100644 pkgs/development/libraries/haskell/network/2.4.1.2.nix diff --git a/pkgs/development/libraries/haskell/network/2.2.1.4.nix b/pkgs/development/libraries/haskell/network/2.2.1.4.nix deleted file mode 100644 index 481ad16a2a34..000000000000 --- a/pkgs/development/libraries/haskell/network/2.2.1.4.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.2.1.4"; - sha256 = "16a842bee5db116f754b459ef261426b6705a6d79383c6d545c9df5f6329cd25"; - buildDepends = [ parsec ]; - meta = { - description = "Networking-related facilities"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.2.nix b/pkgs/development/libraries/haskell/network/2.3.0.2.nix deleted file mode 100644 index 3cf17949380e..000000000000 --- a/pkgs/development/libraries/haskell/network/2.3.0.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.0.2"; - sha256 = "1s4hm0ilsd67ircrl0h5b72kwrw1imb3cj5z52h99bv7qjdbag03"; - buildDepends = [ parsec ]; - meta = { - homepage = "http://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix deleted file mode 100644 index f10d8c0dbcc7..000000000000 --- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.0.5"; - sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0"; - buildDepends = [ parsec ]; - meta = { - homepage = "http://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.3.1.0.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix deleted file mode 100644 index 02185e860414..000000000000 --- a/pkgs/development/libraries/haskell/network/2.3.1.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, HUnit, parsec, testFramework, testFrameworkHunit }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.1.0"; - sha256 = "1fp25wkl5cc4kx0jv5w02b7pzgqadjg1yrknzzwsqxc5s3cpyz6l"; - buildDepends = [ parsec ]; - testDepends = [ HUnit testFramework testFrameworkHunit ]; - meta = { - homepage = "http://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/network/2.4.1.2.nix b/pkgs/development/libraries/haskell/network/2.4.1.2.nix deleted file mode 100644 index 2ec39f7d4578..000000000000 --- a/pkgs/development/libraries/haskell/network/2.4.1.2.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, HUnit, parsec, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.4.1.2"; - sha256 = "0f7ykdv7xbsr5m3h2ml0hw3nlbnq785m0gr624pwk2s289jwakdh"; - buildDepends = [ parsec ]; - testDepends = [ - HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2 - ]; - meta = { - homepage = "https://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 407023683f27..7955a06c523c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1746,13 +1746,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in netwire = callPackage ../development/libraries/haskell/netwire {}; - network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {}; network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; - network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; - network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; - network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {}; - network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {}; network_2_5_0_0 = callPackage ../development/libraries/haskell/network/2.5.0.0.nix {}; network_2_6_0_2 = callPackage ../development/libraries/haskell/network/2.6.0.2.nix {}; network = self.network_2_6_0_2; From 0ce19e1fd2602e7a99d3a5930acec328b8d7b1fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:50:07 +0100 Subject: [PATCH 30/52] 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 c3d8ce498819..000000000000 --- 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 a2ffc9b4ad13..000000000000 --- 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 7955a06c523c..2e74ce184fd1 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 {}; From d3b2c3f46c5bce8466e0813351afcaf2fe8fa92d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:55:07 +0100 Subject: [PATCH 31/52] haskell-pandoc-citeproc: drop obsolete versions 0.4 and 0.5 --- .../libraries/haskell/pandoc-citeproc/0.4.nix | 29 ------------------- .../libraries/haskell/pandoc-citeproc/0.5.nix | 29 ------------------- .../pandoc-citeproc/{0.6.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 9 ++---- 4 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix delete mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix rename pkgs/development/libraries/haskell/pandoc-citeproc/{0.6.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix deleted file mode 100644 index c4706634eccd..000000000000 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix +++ /dev/null @@ -1,29 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat -, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb -, tagsoup, temporary, text, time, vector, yaml -}: - -cabal.mkDerivation (self: { - pname = "pandoc-citeproc"; - version = "0.4.0.1"; - sha256 = "1z21mdxa2hrwqdclriyn3s1qqij3ccbkg7hb0acxrk3pzgidcinx"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc - pandocTypes parsec rfc5051 split syb tagsoup temporary text time - vector yaml - ]; - testDepends = [ - aeson filepath pandoc pandocTypes temporary text yaml - ]; - doCheck = false; - meta = { - description = "Supports using pandoc with citeproc"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix deleted file mode 100644 index c6dc859ed8df..000000000000 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix +++ /dev/null @@ -1,29 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat -, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb -, tagsoup, temporary, text, time, vector, yaml -}: - -cabal.mkDerivation (self: { - pname = "pandoc-citeproc"; - version = "0.5"; - sha256 = "00azhpll0xnb9nnkh7c3hbfk0fzmvh5cgdxlgx7jvaglrmsnvzw3"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc - pandocTypes parsec rfc5051 split syb tagsoup temporary text time - vector yaml - ]; - testDepends = [ - aeson filepath pandoc pandocTypes temporary text yaml - ]; - doCheck = false; - meta = { - description = "Supports using pandoc with citeproc"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix rename to pkgs/development/libraries/haskell/pandoc-citeproc/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2e74ce184fd1..3029fd4cd9dd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1040,9 +1040,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in groupoids = callPackage ../development/libraries/haskell/groupoids {}; - hakyll = callPackage ../development/libraries/haskell/hakyll { - pandocCiteproc = self.pandocCiteproc_0_4; - }; + hakyll = callPackage ../development/libraries/haskell/hakyll {}; hamlet = callPackage ../development/libraries/haskell/hamlet {}; @@ -1825,10 +1823,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pandoc = callPackage ../development/libraries/haskell/pandoc {}; - pandocCiteproc_0_4 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.4.nix {}; - pandocCiteproc_0_5 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.5.nix {}; - pandocCiteproc_0_6 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.6.nix {}; - pandocCiteproc = self.pandocCiteproc_0_6; + pandocCiteproc = callPackage ../development/libraries/haskell/pandoc-citeproc {}; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; From f19bddedcb50c7d768e6acbacb5e7797f066d91b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:57:16 +0100 Subject: [PATCH 32/52] haskell-parallel: drop obsolete versions 1.1.0.1, 2.2.0.1, 3.1.0.1, and 3.2.0.2 --- .../libraries/haskell/parallel/1.1.0.1.nix | 15 --------------- .../libraries/haskell/parallel/2.2.0.1.nix | 16 ---------------- .../libraries/haskell/parallel/3.1.0.1.nix | 16 ---------------- .../libraries/haskell/parallel/3.2.0.2.nix | 16 ---------------- pkgs/top-level/haskell-packages.nix | 4 ---- 5 files changed, 67 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/parallel/1.1.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/parallel/2.2.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/parallel/3.1.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/parallel/3.2.0.2.nix diff --git a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix deleted file mode 100644 index 99575921cc68..000000000000 --- a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "parallel"; - version = "1.1.0.1"; - sha256 = "0885086660268f3626effacb29a02b5c81f3e5a8dfa99dabe0981ddbc407999f"; - meta = { - description = "parallel programming library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix deleted file mode 100644 index 52a5d3c3c339..000000000000 --- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "parallel"; - version = "2.2.0.1"; - sha256 = "255310023138ecf618c8b450203fa2fc65feb68cd08ee4d369ceae72054168fd"; - buildDepends = [ deepseq ]; - meta = { - description = "Parallel programming library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix deleted file mode 100644 index 095603717b7b..000000000000 --- a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "parallel"; - version = "3.1.0.1"; - sha256 = "0j03i5467iyz98fl4fnzlwrr93j2as733kbrxnlcgyh455kb89ns"; - buildDepends = [ deepseq ]; - meta = { - description = "Parallel programming library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix deleted file mode 100644 index f881e2f83c78..000000000000 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "parallel"; - version = "3.2.0.2"; - sha256 = "0sy67cdbwh17wng6b77h9hnkg59mgnyilwvirihmq9535jm9yml2"; - buildDepends = [ deepseq ]; - meta = { - description = "Parallel programming library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3029fd4cd9dd..d43a2c2af8c0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1839,10 +1839,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in }; pango = self.pango_0_13_0_3; - parallel_1_1_0_1 = callPackage ../development/libraries/haskell/parallel/1.1.0.1.nix {}; - parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {}; - parallel_3_1_0_1 = callPackage ../development/libraries/haskell/parallel/3.1.0.1.nix {}; - parallel_3_2_0_2 = callPackage ../development/libraries/haskell/parallel/3.2.0.2.nix {}; parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {}; parallel_3_2_0_4 = callPackage ../development/libraries/haskell/parallel/3.2.0.4.nix {}; parallel = self.parallel_3_2_0_4; From d04ebcf64ed2aa135b6de19ba25233bcaf62b7c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:58:52 +0100 Subject: [PATCH 33/52] haskell-parsec: drop obsolete versions 2.1.0.1, 3.1.1, 3.1.2, and 3.1.3 --- .../libraries/haskell/parsec/2.1.0.1.nix | 16 ---------------- .../libraries/haskell/parsec/3.1.1.nix | 17 ----------------- .../libraries/haskell/parsec/3.1.2.nix | 18 ------------------ .../libraries/haskell/parsec/3.1.3.nix | 18 ------------------ .../haskell/parsec/{3.1.7.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 7 +------ 6 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/parsec/2.1.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/parsec/3.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/parsec/3.1.2.nix delete mode 100644 pkgs/development/libraries/haskell/parsec/3.1.3.nix rename pkgs/development/libraries/haskell/parsec/{3.1.7.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix deleted file mode 100644 index 458a2bd29773..000000000000 --- a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "parsec"; - version = "2.1.0.1"; - sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df"; - meta = { - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; - description = "Monadic parser combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.1.nix b/pkgs/development/libraries/haskell/parsec/3.1.1.nix deleted file mode 100644 index e997acd4b49e..000000000000 --- a/pkgs/development/libraries/haskell/parsec/3.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "parsec"; - version = "3.1.1"; - sha256 = "0x34gwn9k68h69c3hw7yaah6zpdwq8hvqss27f3n4n4cp7dh81fk"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; - description = "Monadic parser combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix deleted file mode 100644 index dd55106fa0df..000000000000 --- a/pkgs/development/libraries/haskell/parsec/3.1.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, text }: - -cabal.mkDerivation (self: { - pname = "parsec"; - version = "3.1.2"; - sha256 = "0lhn9j2j5jlh7g0qx9f6ms63n9x1xlxg9isdvm6z0ksy3ywj9wch"; - buildDepends = [ mtl text ]; - jailbreak = true; - meta = { - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; - description = "Monadic parser combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.3.nix b/pkgs/development/libraries/haskell/parsec/3.1.3.nix deleted file mode 100644 index 3e81947cfed7..000000000000 --- a/pkgs/development/libraries/haskell/parsec/3.1.3.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, text }: - -cabal.mkDerivation (self: { - pname = "parsec"; - version = "3.1.3"; - sha256 = "1a64gzirgpa1i78gbbp9z059nh29xmcja4g8vgjb1fbylx6vn54z"; - buildDepends = [ mtl text ]; - jailbreak = true; - meta = { - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; - description = "Monadic parser combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsec/3.1.7.nix b/pkgs/development/libraries/haskell/parsec/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/parsec/3.1.7.nix rename to pkgs/development/libraries/haskell/parsec/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d43a2c2af8c0..680642c037bd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1847,12 +1847,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parseargs = callPackage ../development/libraries/haskell/parseargs {}; - parsec_2_1_0_1 = callPackage ../development/libraries/haskell/parsec/2.1.0.1.nix {}; - parsec_3_1_1 = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {}; - parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {}; - parsec_3_1_3 = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {}; - parsec_3_1_7 = callPackage ../development/libraries/haskell/parsec/3.1.7.nix {}; - parsec = self.parsec_3_1_7; + parsec = callPackage ../development/libraries/haskell/parsec {}; parsers = callPackage ../development/libraries/haskell/parsers {}; From dc6e0d95acf48879265e88f11843d54e8ddea5b7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:00:17 +0100 Subject: [PATCH 34/52] haskell-primitive: drop obsolete version 0.5.2.1 --- .../libraries/haskell/primitive/0.5.2.1.nix | 16 ---------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 17 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/primitive/0.5.2.1.nix diff --git a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix deleted file mode 100644 index d9bbd51c1998..000000000000 --- a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "primitive"; - version = "0.5.2.1"; - sha256 = "1vn3y5gh4lwvgvklhn8k1z7gxjy27ik621f4gpa9cb7gqa0nnl8f"; - meta = { - homepage = "https://github.com/haskell/primitive"; - description = "Primitive memory-related operations"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 680642c037bd..1c5a64a4d7f6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1978,7 +1978,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pureCdb = callPackage ../development/libraries/haskell/pure-cdb {}; primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; - primitive_0_5_2_1 = callPackage ../development/libraries/haskell/primitive/0.5.2.1.nix {}; primitive_0_5_3_0 = callPackage ../development/libraries/haskell/primitive/0.5.3.0.nix {}; primitive_0_5_4_0 = callPackage ../development/libraries/haskell/primitive/0.5.4.0.nix {}; primitive = self.primitive_0_5_4_0; From c6b48a1486e2b0eed0836c97113d3930894c2464 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:01:28 +0100 Subject: [PATCH 35/52] haskell-test-framework-quickcheck: drop obsolete package --- .../test-framework-quickcheck/default.nix | 20 ------------------- pkgs/top-level/haskell-packages.nix | 4 ---- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix deleted file mode 100644 index 5b822c2418c8..000000000000 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, extensibleExceptions, QuickCheck, random -, testFramework -}: - -cabal.mkDerivation (self: { - pname = "test-framework-quickcheck"; - version = "0.3.0"; - sha256 = "0g8sh3x3mhns03svccgbdbw8crzpzmahp1hr1fs6ag66fqr8p9mv"; - buildDepends = [ - deepseq extensibleExceptions QuickCheck random testFramework - ]; - meta = { - homepage = "http://batterseapower.github.com/test-framework/"; - description = "QuickCheck support for the test-framework package"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1c5a64a4d7f6..33cbd92424ce 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2515,10 +2515,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {}; - testFrameworkQuickcheck = callPackage ../development/libraries/haskell/test-framework-quickcheck { - QuickCheck = self.QuickCheck_1_2_0_1; # doesn't support version 2.x - }; - testFrameworkQuickcheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {}; testFrameworkSmallcheck = callPackage ../development/libraries/haskell/test-framework-smallcheck {}; From 0271e44d2501a588ecc0e4dc8af818dbda4c7981 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:03:52 +0100 Subject: [PATCH 36/52] haskell-QuickCheck: drop obsolete versions 1.2.0.0 1.2.0.1, 2.1.1.1, 2.4.0.1, 2.4.1.1, 2.4.2, 2.5.1.1, 2.6, and 2.7.5 --- .../libraries/haskell/QuickCheck/1.2.0.0.nix | 17 ----------------- .../libraries/haskell/QuickCheck/1.2.0.1.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.1.1.1.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.4.0.1.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.4.1.1.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.4.2.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.5.1.1.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.6.nix | 17 ----------------- .../libraries/haskell/QuickCheck/2.7.5.nix | 19 ------------------- .../QuickCheck/{2.7.6.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 14 ++------------ 11 files changed, 2 insertions(+), 167 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.6.nix delete mode 100644 pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix rename pkgs/development/libraries/haskell/QuickCheck/{2.7.6.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix deleted file mode 100644 index 465fb510b50e..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "1.2.0.0"; - sha256 = "21672d817913ac7ab6d3fd7f102dd5d0f115a0826c95b9604c8c0b0171e8d4ed"; - buildDepends = [ random ]; - meta = { - homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix deleted file mode 100644 index ba16967249db..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "1.2.0.1"; - sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld"; - buildDepends = [ random ]; - meta = { - homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix deleted file mode 100644 index 373742a9755a..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, mtl, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.1.1.1"; - sha256 = "626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9"; - buildDepends = [ extensibleExceptions mtl random ]; - meta = { - homepage = "http://www.cse.chalmers.se/~koen"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix deleted file mode 100644 index 3bee4ac97026..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, mtl, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.4.0.1"; - sha256 = "1x7jc2svpxbll8qkrbswh5q59sqcjf2v5a6jnqslf5gwr5qpq18r"; - buildDepends = [ extensibleExceptions mtl random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix deleted file mode 100644 index d936d4b37841..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.4.1.1"; - sha256 = "06vrn0j26ai2jfl32yd3kx8by4pimcinjf23b0dyc35z2gb139wj"; - buildDepends = [ extensibleExceptions random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix deleted file mode 100644 index 58a04593c494..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, extensibleExceptions, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.4.2"; - sha256 = "17qp73sdp780lha3i6xdsrvgshqz47qwldqknadc0w3vmscw61bg"; - buildDepends = [ extensibleExceptions random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix deleted file mode 100644 index 438c4cfff8db..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.5.1.1"; - sha256 = "1ff2mhm27l8cc8nrsbw2z65dc9m7h879jykl5g7yqip5l88j0jcq"; - buildDepends = [ random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix deleted file mode 100644 index 0ed568384358..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.6"; - sha256 = "03cp7mshjy2yrg31i13b9kmc2a6lrmrbl1sh9s8lswcj305c00c0"; - buildDepends = [ random ]; - meta = { - homepage = "http://code.haskell.org/QuickCheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix deleted file mode 100644 index 26115cb8814a..000000000000 --- a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, random, testFramework, tfRandom, transformers }: - -cabal.mkDerivation (self: { - pname = "QuickCheck"; - version = "2.7.5"; - sha256 = "1bak50yxf8qfwfw1f5bd2p1ynx1ndjv24yp6gd2a2a1fag34x0rb"; - buildDepends = [ random tfRandom transformers ]; - testDepends = [ testFramework ]; - noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; - meta = { - homepage = "https://github.com/nick8325/quickcheck"; - description = "Automatic testing of Haskell programs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix b/pkgs/development/libraries/haskell/QuickCheck/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix rename to pkgs/development/libraries/haskell/QuickCheck/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 33cbd92424ce..d63dcb7c285b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -401,7 +401,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ChartDiagrams = callPackage ../development/libraries/haskell/Chart-diagrams {}; ChartGtk = callPackage ../development/libraries/haskell/Chart-gtk {}; - ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms { QuickCheck = self.QuickCheck_2_6; }; + ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {}; cheapskate = callPackage ../development/libraries/haskell/cheapskate {}; @@ -2012,17 +2012,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pwstoreFast = callPackage ../development/libraries/haskell/pwstore-fast {}; - QuickCheck_1_2_0_0 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.0.nix {}; - QuickCheck_1_2_0_1 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.1.nix {}; - QuickCheck_2_1_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.1.1.1.nix {}; - QuickCheck_2_4_0_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.0.1.nix {}; - QuickCheck_2_4_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.1.1.nix {}; - QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; - QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; - QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; - QuickCheck_2_7_5 = callPackage ../development/libraries/haskell/QuickCheck/2.7.5.nix {}; - QuickCheck_2_7_6 = callPackage ../development/libraries/haskell/QuickCheck/2.7.6.nix {}; - QuickCheck = self.QuickCheck_2_7_6; + QuickCheck = callPackage ../development/libraries/haskell/QuickCheck {}; quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {}; From e612537df9c1b449c84a77d95df7af3af041a3a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:17:21 +0100 Subject: [PATCH 37/52] haskell-regex-base: drop obsolete versions 0.72.0.2 and 0.93.1 --- .../libraries/haskell/regex-base/0.72.0.2.nix | 16 ---------------- .../libraries/haskell/regex-base/0.93.1.nix | 17 ----------------- .../regex-base/{0.93.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 5 +---- 4 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix delete mode 100644 pkgs/development/libraries/haskell/regex-base/0.93.1.nix rename pkgs/development/libraries/haskell/regex-base/{0.93.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix deleted file mode 100644 index b5b7068da01d..000000000000 --- a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "regex-base"; - version = "0.72.0.2"; - sha256 = "38a4901b942fea646a422d52c52ef14eec4d6561c258b3c54cd96a8a354141ee"; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix deleted file mode 100644 index 5aa971ac3478..000000000000 --- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl }: - -cabal.mkDerivation (self: { - pname = "regex-base"; - version = "0.93.1"; - sha256 = "24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef"; - buildDepends = [ mtl ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/regex-base/0.93.2.nix rename to pkgs/development/libraries/haskell/regex-base/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d63dcb7c285b..dd4d32e28db8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2073,10 +2073,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regexApplicative = callPackage ../development/libraries/haskell/regex-applicative {}; - regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {}; - regexBase_0_93_1 = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {}; - regexBase_0_93_2 = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {}; - regexBase = self.regexBase_0_93_2; + regexBase = callPackage ../development/libraries/haskell/regex-base {}; regexCompat_0_71_0_1 = callPackage ../development/libraries/haskell/regex-compat/0.71.0.1.nix {}; regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {}; From cbc39a26f7fa610ed65869bc2374524ff3dabfc9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:18:37 +0100 Subject: [PATCH 38/52] haskell-regex-compat: drop obsolete versions 0.71.0.1, 0.92, 0.93.1 --- .../libraries/haskell/regex-compat/0.71.0.1.nix | 17 ----------------- .../libraries/haskell/regex-compat/0.92.nix | 17 ----------------- .../libraries/haskell/regex-compat/0.93.1.nix | 17 ----------------- .../regex-compat/{0.95.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +----- 5 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/regex-compat/0.92.nix delete mode 100644 pkgs/development/libraries/haskell/regex-compat/0.93.1.nix rename pkgs/development/libraries/haskell/regex-compat/{0.95.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix deleted file mode 100644 index 306d603a9cb5..000000000000 --- a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase, regexPosix }: - -cabal.mkDerivation (self: { - pname = "regex-compat"; - version = "0.71.0.1"; - sha256 = "904552f7d690686b2602f37494827d09b09fc0a8a2565522b61847bec8d1de8d"; - buildDepends = [ regexBase regexPosix ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix deleted file mode 100644 index 91dda463e6d0..000000000000 --- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase, regexPosix }: - -cabal.mkDerivation (self: { - pname = "regex-compat"; - version = "0.92"; - sha256 = "430d251bd704071fca1e38c9b250543f00d4e370382ed552ac3d7407d4f27936"; - buildDepends = [ regexBase regexPosix ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix deleted file mode 100644 index 7fddc11a672a..000000000000 --- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase, regexPosix }: - -cabal.mkDerivation (self: { - pname = "regex-compat"; - version = "0.93.1"; - sha256 = "1zlsx7a2iz5gmgrwzr6w5fz6s4ayab5bm71xlq28r3iph3vp80zf"; - buildDepends = [ regexBase regexPosix ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix b/pkgs/development/libraries/haskell/regex-compat/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/regex-compat/0.95.1.nix rename to pkgs/development/libraries/haskell/regex-compat/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dd4d32e28db8..ee2aa19e7733 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2075,11 +2075,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regexBase = callPackage ../development/libraries/haskell/regex-base {}; - regexCompat_0_71_0_1 = callPackage ../development/libraries/haskell/regex-compat/0.71.0.1.nix {}; - regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {}; - regexCompat_0_93_1 = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix {}; - regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix {}; - regexCompat = self.regexCompat_0_95_1; + regexCompat = callPackage ../development/libraries/haskell/regex-compat {}; regexCompatTdfa = callPackage ../development/libraries/haskell/regex-compat-tdfa {}; From eef8352a92d1d8489398ab46abc57caddd8a3d80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:19:34 +0100 Subject: [PATCH 39/52] haskell-regex-posix: drop obsolete versions 0.72.0.3, 0.94.1, 0.94.2, 0.94.4, and 0.95.1 --- .../libraries/haskell/regex-posix/0.72.0.3.nix | 17 ----------------- .../libraries/haskell/regex-posix/0.94.1.nix | 17 ----------------- .../libraries/haskell/regex-posix/0.94.2.nix | 17 ----------------- .../libraries/haskell/regex-posix/0.94.4.nix | 17 ----------------- .../libraries/haskell/regex-posix/0.95.1.nix | 17 ----------------- .../regex-posix/{0.95.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 +------- 7 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix delete mode 100644 pkgs/development/libraries/haskell/regex-posix/0.94.1.nix delete mode 100644 pkgs/development/libraries/haskell/regex-posix/0.94.2.nix delete mode 100644 pkgs/development/libraries/haskell/regex-posix/0.94.4.nix delete mode 100644 pkgs/development/libraries/haskell/regex-posix/0.95.1.nix rename pkgs/development/libraries/haskell/regex-posix/{0.95.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix deleted file mode 100644 index 893e36677011..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.72.0.3"; - sha256 = "327ab87f3d4f5315a9414331eb382b8b997de8836d577c3f7d232c574606feb1"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix deleted file mode 100644 index ec4bdaab4319..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.94.1"; - sha256 = "63e76de0610d35f1b576ae65a25a38e04e758ed64b9b3512de95bdffd649485c"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix deleted file mode 100644 index 20f2dd714140..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.94.2"; - sha256 = "ea0c1ed0ab49ade4dba1eea7a42197652ccb18b7a98c4040e37ba11d26f33067"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix deleted file mode 100644 index 49923bf2d6c1..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.94.4"; - sha256 = "1ykirysvz9ganm2k7fmrppklsgh0h35mjfsi9g1icv43pqpr6ldw"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix deleted file mode 100644 index 0bcc6d260525..000000000000 --- a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, regexBase }: - -cabal.mkDerivation (self: { - pname = "regex-posix"; - version = "0.95.1"; - sha256 = "02pgxwbgz738kpdmsg18xs6kmq6my5hqd9cl4rm7cg2v39di9vbl"; - buildDepends = [ regexBase ]; - meta = { - homepage = "http://sourceforge.net/projects/lazy-regex"; - description = "Replaces/Enhances Text.Regex"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix b/pkgs/development/libraries/haskell/regex-posix/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/regex-posix/0.95.2.nix rename to pkgs/development/libraries/haskell/regex-posix/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ee2aa19e7733..4c3a986821be 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2081,13 +2081,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regexPcreBuiltin = callPackage ../development/libraries/haskell/regex-pcre-builtin {}; - regexPosix_0_72_0_3 = callPackage ../development/libraries/haskell/regex-posix/0.72.0.3.nix {}; - regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {}; - regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {}; - regexPosix_0_94_4 = callPackage ../development/libraries/haskell/regex-posix/0.94.4.nix {}; - regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix {}; - regexPosix_0_95_2 = callPackage ../development/libraries/haskell/regex-posix/0.95.2.nix {}; - regexPosix = self.regexPosix_0_95_2; + regexPosix = callPackage ../development/libraries/haskell/regex-posix {}; regexTdfa = callPackage ../development/libraries/haskell/regex-tdfa {}; From 8e1b3f3635898db837ef1bf69da1e04daac9efc6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:21:08 +0100 Subject: [PATCH 40/52] haskell-shelly: drop obsolete version 0.15.4.1 --- .../libraries/haskell/shelly/0.15.4.1.nix | 24 ------------------- pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/shelly/0.15.4.1.nix diff --git a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix b/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix deleted file mode 100644 index 2840ba736f5b..000000000000 --- a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, hspec, HUnit, mtl, systemFileio, systemFilepath, text -, time, unixCompat -}: - -cabal.mkDerivation (self: { - pname = "shelly"; - version = "0.15.4.1"; - sha256 = "12m11s22izz0ny1syb1ykp2hi9n240myf0nhapvn8jx1fgf5iyck"; - buildDepends = [ - mtl systemFileio systemFilepath text time unixCompat - ]; - testDepends = [ - hspec HUnit mtl systemFileio systemFilepath text time unixCompat - ]; - meta = { - homepage = "https://github.com/yesodweb/Shelly.hs"; - description = "shell-like (systems) programming in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4c3a986821be..2cc48820fe3c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2200,9 +2200,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in shellmate = callPackage ../development/libraries/haskell/shellmate {}; - shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {}; - shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {}; - shelly = self.shelly_1_5_3_1; + shelly = callPackage ../development/libraries/haskell/shelly {}; shell-conduit = callPackage ../development/libraries/haskell/shell-conduit {}; From 837b903cb49b99d20a8eb11eb34b4b759b46ee71 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:21:56 +0100 Subject: [PATCH 41/52] haskell-syb: drop obsolete 0.3.x versions --- pkgs/development/libraries/haskell/syb/0.3.3.nix | 16 ---------------- .../libraries/haskell/syb/0.3.6.1.nix | 16 ---------------- pkgs/development/libraries/haskell/syb/0.3.7.nix | 16 ---------------- pkgs/development/libraries/haskell/syb/0.3.nix | 16 ---------------- pkgs/top-level/haskell-packages.nix | 4 ---- 5 files changed, 68 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/syb/0.3.3.nix delete mode 100644 pkgs/development/libraries/haskell/syb/0.3.6.1.nix delete mode 100644 pkgs/development/libraries/haskell/syb/0.3.7.nix delete mode 100644 pkgs/development/libraries/haskell/syb/0.3.nix diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix deleted file mode 100644 index 967bc75e5221..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3.3"; - sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix deleted file mode 100644 index de9da0478892..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3.6.1"; - sha256 = "1xyz6ahyvairzb5n1mrmryzrxrkd4m8ywxa6r6x5nqm2xa7zqv34"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.7.nix b/pkgs/development/libraries/haskell/syb/0.3.7.nix deleted file mode 100644 index 72f883e52432..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.7.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3.7"; - sha256 = "0wysa348icabskih3k9xbmwaaw34hg58lpz3w3075942h650bx2r"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix deleted file mode 100644 index 355fd3671e41..000000000000 --- a/pkgs/development/libraries/haskell/syb/0.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "syb"; - version = "0.3"; - sha256 = "1gnqw76zy7xvlabhbyk8hml88hpz2igf7b3mz2ic091f77qkkch7"; - meta = { - homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; - description = "Scrap Your Boilerplate"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2cc48820fe3c..6db10831ecc6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2306,10 +2306,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {}; - syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; - syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; - syb_0_3_6_1 = callPackage ../development/libraries/haskell/syb/0.3.6.1.nix {}; - syb_0_3_7 = callPackage ../development/libraries/haskell/syb/0.3.7.nix {}; syb_0_4_0 = callPackage ../development/libraries/haskell/syb/0.4.0.nix {}; syb_0_4_2 = callPackage ../development/libraries/haskell/syb/0.4.2.nix {}; syb = self.syb_0_4_2; From 7503e32356eca695838faf5d061a6df126494d0e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 13:22:40 +0100 Subject: [PATCH 42/52] haskell-split: drop obsolete version 0.2.1.1 --- .../libraries/haskell/split/0.2.1.1.nix | 16 ---------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 17 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/split/0.2.1.1.nix diff --git a/pkgs/development/libraries/haskell/split/0.2.1.1.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix deleted file mode 100644 index 5dfcdf6de0cc..000000000000 --- a/pkgs/development/libraries/haskell/split/0.2.1.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, QuickCheck }: - -cabal.mkDerivation (self: { - pname = "split"; - version = "0.2.1.1"; - sha256 = "1zzp4dwf846s74a4lhw2gf4awsk9iblhl5zcg2zccgv1lr4w2dmz"; - testDepends = [ QuickCheck ]; - meta = { - description = "Combinator library for splitting lists"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6db10831ecc6..fc503cdc2133 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2361,7 +2361,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sourcemap = callPackage ../development/libraries/haskell/sourcemap {}; split_0_1_4_3 = callPackage ../development/libraries/haskell/split/0.1.4.3.nix {}; - split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {}; split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {}; split = self.split_0_2_2; From fad637f23ff3e8cb284784539b2c31ec00ee4559 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:25:53 +0100 Subject: [PATCH 43/52] haskell-stm: drop obsolete versions 2.1.1.2 2.1.2.1, 2.2.0.1, 2.3, and 2.4 --- .../development/libraries/haskell/stm/2.1.1.2.nix | 15 --------------- .../development/libraries/haskell/stm/2.1.2.1.nix | 15 --------------- .../development/libraries/haskell/stm/2.2.0.1.nix | 15 --------------- pkgs/development/libraries/haskell/stm/2.3.nix | 15 --------------- pkgs/development/libraries/haskell/stm/2.4.nix | 15 --------------- pkgs/top-level/haskell-packages.nix | 5 ----- 6 files changed, 80 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/stm/2.1.1.2.nix delete mode 100644 pkgs/development/libraries/haskell/stm/2.1.2.1.nix delete mode 100644 pkgs/development/libraries/haskell/stm/2.2.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/stm/2.3.nix delete mode 100644 pkgs/development/libraries/haskell/stm/2.4.nix diff --git a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix deleted file mode 100644 index d69827bbb69d..000000000000 --- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "stm"; - version = "2.1.1.2"; - sha256 = "68d550067ae180373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d"; - meta = { - description = "Software Transactional Memory"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix deleted file mode 100644 index ab99000b7e74..000000000000 --- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "stm"; - version = "2.1.2.1"; - sha256 = "0d7d8babd2f07c726909030461e1f9b3aaf02dc809fd5e1c0509a67d23b784b8"; - meta = { - description = "Software Transactional Memory"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix deleted file mode 100644 index cfe7ff65871b..000000000000 --- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "stm"; - version = "2.2.0.1"; - sha256 = "1p0x414ffsd77mmlfz1cmwg2cbhinnbpxypxgvygg05js67msj8q"; - meta = { - description = "Software Transactional Memory"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/stm/2.3.nix deleted file mode 100644 index c5f62c9c8275..000000000000 --- a/pkgs/development/libraries/haskell/stm/2.3.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "stm"; - version = "2.3"; - sha256 = "1321l1qkmvnqdw73i21jnh2b8c1iw1mxjbp23hmqdvljjb9mlzsm"; - meta = { - description = "Software Transactional Memory"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/stm/2.4.nix b/pkgs/development/libraries/haskell/stm/2.4.nix deleted file mode 100644 index 6007e845e9b8..000000000000 --- a/pkgs/development/libraries/haskell/stm/2.4.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "stm"; - version = "2.4"; - sha256 = "13flyzh2vnqnap78qjawdh3150rmp9bxnlgynsf793lm1b3z15fl"; - meta = { - description = "Software Transactional Memory"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fc503cdc2133..6a0473e501cf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2368,11 +2368,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in stbImage = callPackage ../development/libraries/haskell/stb-image {}; - stm_2_1_1_2 = callPackage ../development/libraries/haskell/stm/2.1.1.2.nix {}; - stm_2_1_2_1 = callPackage ../development/libraries/haskell/stm/2.1.2.1.nix {}; - stm_2_2_0_1 = callPackage ../development/libraries/haskell/stm/2.2.0.1.nix {}; - stm_2_3 = callPackage ../development/libraries/haskell/stm/2.3.nix {}; - stm_2_4 = callPackage ../development/libraries/haskell/stm/2.4.nix {}; stm_2_4_2 = callPackage ../development/libraries/haskell/stm/2.4.2.nix {}; stm_2_4_3 = callPackage ../development/libraries/haskell/stm/2.4.3.nix {}; stm = self.stm_2_4_3; From b3a3e099d82096388766d49e65509907b0f3f486 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:28:07 +0100 Subject: [PATCH 44/52] haskell-terminfo: drop obsolete version 0.3.2.6 --- .../libraries/haskell/terminfo/0.3.2.6.nix | 17 ----------------- .../terminfo/{0.4.0.0.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix rename pkgs/development/libraries/haskell/terminfo/{0.4.0.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix b/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix deleted file mode 100644 index 6a065cb6e845..000000000000 --- a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, ncurses }: - -cabal.mkDerivation (self: { - pname = "terminfo"; - version = "0.3.2.6"; - sha256 = "0ag81rwwwaanxdn9ccanvdi1qnh62vy8y2jbgp5bp95hhgqq887f"; - extraLibraries = [ ncurses ]; - meta = { - homepage = "http://code.haskell.org/terminfo"; - description = "Haskell bindings to the terminfo library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix b/pkgs/development/libraries/haskell/terminfo/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix rename to pkgs/development/libraries/haskell/terminfo/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6a0473e501cf..79b610b68e1c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2472,9 +2472,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in terminalSize = callPackage ../development/libraries/haskell/terminal-size {}; - terminfo_0_3_2_6 = callPackage ../development/libraries/haskell/terminfo/0.3.2.6.nix { inherit (pkgs) ncurses; }; - terminfo_0_4_0_0 = callPackage ../development/libraries/haskell/terminfo/0.4.0.0.nix { inherit (pkgs) ncurses; }; - terminfo = self.terminfo_0_4_0_0; + terminfo = callPackage ../development/libraries/haskell/terminfo { inherit (pkgs) ncurses; }; testFramework = callPackage ../development/libraries/haskell/test-framework {}; From 49f0ff941d0ff224fcfde9b22c20fb5ba4aeaf2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:30:28 +0100 Subject: [PATCH 45/52] haskell-text: drop obsolete versions 0.11.0.5, 0.11.0.6, 0.11.1.5, 0.11.2.0, and 0.11.3.1 --- .../libraries/haskell/text/0.11.0.5.nix | 18 -------------- .../libraries/haskell/text/0.11.0.6.nix | 18 -------------- .../libraries/haskell/text/0.11.1.5.nix | 18 -------------- .../libraries/haskell/text/0.11.2.0.nix | 24 ------------------- .../libraries/haskell/text/0.11.3.1.nix | 24 ------------------- pkgs/top-level/haskell-packages.nix | 5 ---- 6 files changed, 107 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/text/0.11.0.5.nix delete mode 100644 pkgs/development/libraries/haskell/text/0.11.0.6.nix delete mode 100644 pkgs/development/libraries/haskell/text/0.11.1.5.nix delete mode 100644 pkgs/development/libraries/haskell/text/0.11.2.0.nix delete mode 100644 pkgs/development/libraries/haskell/text/0.11.3.1.nix diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix deleted file mode 100644 index 5f63f68cfe76..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.0.5"; - sha256 = "1a5y2i7qrkyyvm112q44rhd7jbqxvfxssz2g5ngbx11yypl3hcdv"; - buildDepends = [ deepseq ]; - doCheck = false; - meta = { - homepage = "http://bitbucket.org/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix deleted file mode 100644 index c922db7e9597..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.0.6"; - sha256 = "103l1c8jfwpddsqzwj9jqh89vay8ax1znxqgjqprv2fvr7s0zvkp"; - buildDepends = [ deepseq ]; - doCheck = false; - meta = { - homepage = "http://bitbucket.org/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix deleted file mode 100644 index afaa25305a32..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.1.5"; - sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l"; - buildDepends = [ deepseq ]; - doCheck = false; - meta = { - homepage = "https://bitbucket.org/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix deleted file mode 100644 index f465f4c2afc5..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, HUnit, QuickCheck, random, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.2.0"; - sha256 = "1fx5302m41awzbms410x3gcixsck36rl7i1ma7pz6l5d1pmi538p"; - buildDepends = [ deepseq ]; - testDepends = [ - deepseq HUnit QuickCheck random testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://github.com/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/text/0.11.3.1.nix b/pkgs/development/libraries/haskell/text/0.11.3.1.nix deleted file mode 100644 index 6cbed7c1268d..000000000000 --- a/pkgs/development/libraries/haskell/text/0.11.3.1.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, HUnit, QuickCheck, random, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "text"; - version = "0.11.3.1"; - sha256 = "17smd4h8xiqlggwd3n4j2dszfqsjpjjbjgk9badhkmya8ykd9akn"; - buildDepends = [ deepseq ]; - testDepends = [ - deepseq HUnit QuickCheck random testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://github.com/bos/text"; - description = "An efficient packed Unicode text type"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 79b610b68e1c..3e80575acb1e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2492,12 +2492,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in texmath = callPackage ../development/libraries/haskell/texmath {}; - text_0_11_0_5 = callPackage ../development/libraries/haskell/text/0.11.0.5.nix {}; - text_0_11_0_6 = callPackage ../development/libraries/haskell/text/0.11.0.6.nix {}; - text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; - text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; - text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {}; text_1_1_1_3 = callPackage ../development/libraries/haskell/text/1.1.1.3.nix {}; text_1_2_0_0 = callPackage ../development/libraries/haskell/text/1.2.0.0.nix {}; text = self.text_1_2_0_0; From 1676f7a43ba75ace7aa9c3970cfdadae424021e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:33:05 +0100 Subject: [PATCH 46/52] haskell-transformers: drop obsolete version 0.2.2.0 --- .../libraries/haskell/transformers/0.2.2.0.nix | 15 --------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 16 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/transformers/0.2.2.0.nix diff --git a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix deleted file mode 100644 index cb3dd611ef36..000000000000 --- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "transformers"; - version = "0.2.2.0"; - sha256 = "1nkazxy2p0w5ad76vg1lc4l0nla1kdqjdf9pymjgk75dpiyijbdz"; - meta = { - description = "Concrete functor and monad transformers"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3e80575acb1e..4435080a960d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2555,7 +2555,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in tostring = callPackage ../development/libraries/haskell/tostring {}; - transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}; transformers_0_4_1_0 = callPackage ../development/libraries/haskell/transformers/0.4.1.0.nix {}; transformers = null; # core package since ghc >= 7.8.x From 6c6f8a5cc82905063b908d7f20598b3ed6100153 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:34:23 +0100 Subject: [PATCH 47/52] haskell-unordered-containers: drop obsolete versions 0.2.3.0 and 0.2.4.0 --- .../haskell/unordered-containers/0.2.3.0.nix | 24 ------------------- .../haskell/unordered-containers/0.2.4.0.nix | 24 ------------------- .../{0.2.5.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 5 +--- 4 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix delete mode 100644 pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix rename pkgs/development/libraries/haskell/unordered-containers/{0.2.5.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix deleted file mode 100644 index d7040ac611a3..000000000000 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "unordered-containers"; - version = "0.2.3.0"; - sha256 = "1vzgjr9jxdkmgq970ng9zi2j60awvx8iv1v6kzjlrkwzxx1a9dpd"; - buildDepends = [ deepseq hashable ]; - testDepends = [ - ChasingBottoms hashable HUnit QuickCheck testFramework - testFrameworkHunit testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://github.com/tibbe/unordered-containers"; - description = "Efficient hashing-based container types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix deleted file mode 100644 index 9cb06b029e66..000000000000 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -}: - -cabal.mkDerivation (self: { - pname = "unordered-containers"; - version = "0.2.4.0"; - sha256 = "1x6djgmawzq8i8spib729pdlpnxyi4gz4p08lyn6jhfqjq6fpsil"; - buildDepends = [ deepseq hashable ]; - testDepends = [ - ChasingBottoms hashable HUnit QuickCheck testFramework - testFrameworkHunit testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - homepage = "https://github.com/tibbe/unordered-containers"; - description = "Efficient hashing-based container types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.5.1.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/unordered-containers/0.2.5.1.nix rename to pkgs/development/libraries/haskell/unordered-containers/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4435080a960d..398b1ea812ff 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2625,10 +2625,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in unlambda = callPackage ../development/libraries/haskell/unlambda {}; - unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {}; - unorderedContainers_0_2_4_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.4.0.nix {}; - unorderedContainers_0_2_5_1 = callPackage ../development/libraries/haskell/unordered-containers/0.2.5.1.nix {}; - unorderedContainers = self.unorderedContainers_0_2_5_1; + unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {}; uri = callPackage ../development/libraries/haskell/uri {}; From e4e0708397ae599e017833b9cb350d165c569023 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:35:48 +0100 Subject: [PATCH 48/52] haskell-vector: drop obsolete versions 0.10.0.1 and 0.10.11.0 --- .../libraries/haskell/vector/0.10.0.1.nix | 18 ------------------ .../libraries/haskell/vector/0.10.11.0.nix | 18 ------------------ pkgs/top-level/haskell-packages.nix | 2 -- 3 files changed, 38 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/vector/0.10.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/vector/0.10.11.0.nix diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix deleted file mode 100644 index 634116b3d9b7..000000000000 --- a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, primitive }: - -cabal.mkDerivation (self: { - pname = "vector"; - version = "0.10.0.1"; - sha256 = "1bq8am8qnpnsla315i21f1kikikalyz9ps1izxgpr9q1ic2lbsgc"; - buildDepends = [ deepseq primitive ]; - configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}"; - meta = { - homepage = "http://code.haskell.org/vector"; - description = "Efficient Arrays"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix deleted file mode 100644 index 6929594c62ba..000000000000 --- a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, primitive }: - -cabal.mkDerivation (self: { - pname = "vector"; - version = "0.10.11.0"; - sha256 = "0f5jks8q0287zgzlfg3x7akpahck6dm1c37hb8kk6qn51csx515j"; - buildDepends = [ deepseq primitive ]; - configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}"; - meta = { - homepage = "https://github.com/haskell/vector"; - description = "Efficient Arrays"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 398b1ea812ff..44db3790cbdb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2673,9 +2673,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vect = callPackage ../development/libraries/haskell/vect {}; - vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; vector_0_10_9_3 = callPackage ../development/libraries/haskell/vector/0.10.9.3.nix {}; - vector_0_10_11_0 = callPackage ../development/libraries/haskell/vector/0.10.11.0.nix {}; vector_0_10_12_1 = callPackage ../development/libraries/haskell/vector/0.10.12.1.nix {}; vector = self.vector_0_10_12_1; From b2ac4769abe787adc348037d7a1a88625747cdf7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:37:04 +0100 Subject: [PATCH 49/52] haskell-xhtml: drop obsolete versions 3000.2.0.1, 3000.2.0.4, and 3000.2.0.5 --- .../libraries/haskell/xhtml/3000.2.0.1.nix | 15 --------------- .../libraries/haskell/xhtml/3000.2.0.4.nix | 16 ---------------- .../libraries/haskell/xhtml/3000.2.0.5.nix | 16 ---------------- .../haskell/xhtml/{3000.2.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +----- 5 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix delete mode 100644 pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix delete mode 100644 pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix rename pkgs/development/libraries/haskell/xhtml/{3000.2.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix deleted file mode 100644 index 3cb0238b82f3..000000000000 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "xhtml"; - version = "3000.2.0.1"; - sha256 = "15pcigascajky67v0lhdhn4bv8xq16cvzib05mg4f1ynwr5a9mv0"; - meta = { - description = "An XHTML combinator library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix deleted file mode 100644 index 74b9fc5620c0..000000000000 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "xhtml"; - version = "3000.2.0.4"; - sha256 = "07kqii5dsfdaf46y4k19l9llhzhxssr24jbjpr5i8p1qh7117abw"; - meta = { - homepage = "https://github.com/haskell/xhtml"; - description = "An XHTML combinator library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix deleted file mode 100644 index 065252d31b76..000000000000 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal }: - -cabal.mkDerivation (self: { - pname = "xhtml"; - version = "3000.2.0.5"; - sha256 = "1gqq910pncqppb2dscxnfxvm1ly4qpb5mwmady2i4irar3gngh9v"; - meta = { - homepage = "https://github.com/haskell/xhtml"; - description = "An XHTML combinator library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix b/pkgs/development/libraries/haskell/xhtml/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/xhtml/3000.2.1.nix rename to pkgs/development/libraries/haskell/xhtml/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 44db3790cbdb..f57129c3f5b5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2787,11 +2787,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in xdot = callPackage ../development/libraries/haskell/xdot {}; - xhtml_3000_2_0_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.1.nix {}; - xhtml_3000_2_0_4 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.4.nix {}; - xhtml_3000_2_0_5 = callPackage ../development/libraries/haskell/xhtml/3000.2.0.5.nix {}; - xhtml_3000_2_1 = callPackage ../development/libraries/haskell/xhtml/3000.2.1.nix {}; - xhtml = self.xhtml_3000_2_1; + xhtml = callPackage ../development/libraries/haskell/xhtml {}; xml = callPackage ../development/libraries/haskell/xml {}; From 64ff17d4e648153c2fd7b9ed94d28cec7f89e5f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:38:32 +0100 Subject: [PATCH 50/52] haskell-zlib: drop obsolete versions 0.5.0.0, 0.5.2.0, 0.5.3.1, 0.5.3.3, and 0.5.4.0 --- .../libraries/haskell/zlib/0.5.0.0.nix | 16 ---------------- .../libraries/haskell/zlib/0.5.2.0.nix | 16 ---------------- .../libraries/haskell/zlib/0.5.3.1.nix | 16 ---------------- .../libraries/haskell/zlib/0.5.3.3.nix | 17 ----------------- .../libraries/haskell/zlib/0.5.4.0.nix | 16 ---------------- .../haskell/zlib/{0.5.4.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 +------- 7 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.0.0.nix delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.2.0.nix delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.3.1.nix delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.3.3.nix delete mode 100644 pkgs/development/libraries/haskell/zlib/0.5.4.0.nix rename pkgs/development/libraries/haskell/zlib/{0.5.4.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix deleted file mode 100644 index b67604821293..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.0.0"; - sha256 = "20e067cfbec87ec062ac144875a60e158ea6cf7836aac031ec367fcdd5446891"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix deleted file mode 100644 index f3669c97c0a8..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.2.0"; - sha256 = "4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix deleted file mode 100644 index 1bed95bc2e82..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.3.1"; - sha256 = "1hj56lk4g2zr7acdda39zib1bj02777q0asm5ms9rfj7kp81caiq"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix deleted file mode 100644 index 5260b55a0277..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.3.3"; - sha256 = "1hrq34w9y8m7nahvrdpnkh9rdb4jycpcpv9ix6qrxijvbz2vdbg2"; - extraLibraries = [ zlib ]; - jailbreak = true; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix deleted file mode 100644 index 8b13da93ce34..000000000000 --- a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, zlib }: - -cabal.mkDerivation (self: { - pname = "zlib"; - version = "0.5.4.0"; - sha256 = "18hc4wr8brzbl9qapjbjyb9kyqrznv2xbw7rv1a6k8i3392ilxv1"; - extraLibraries = [ zlib ]; - meta = { - description = "Compression and decompression in the gzip and zlib formats"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix b/pkgs/development/libraries/haskell/zlib/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/zlib/0.5.4.1.nix rename to pkgs/development/libraries/haskell/zlib/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f57129c3f5b5..42d6a9575638 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2867,13 +2867,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in zippers = callPackage ../development/libraries/haskell/zippers {}; - zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; - zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.3.nix { inherit (pkgs) zlib; }; - zlib_0_5_4_0 = callPackage ../development/libraries/haskell/zlib/0.5.4.0.nix { inherit (pkgs) zlib; }; - zlib_0_5_4_1 = callPackage ../development/libraries/haskell/zlib/0.5.4.1.nix { inherit (pkgs) zlib;}; - zlib = self.zlib_0_5_4_1; + zlib = callPackage ../development/libraries/haskell/zlib { inherit (pkgs) zlib;}; zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; From b8d631a6040fea5ca044a3910b1a755d477ce2f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:41:14 +0100 Subject: [PATCH 51/52] happy: drop obsolete versions 1.18.10 1.18.4, 1.18.5, 1.18.6, and 1.18.9 --- .../tools/parsing/happy/1.18.10.nix | 20 ------------------- .../tools/parsing/happy/1.18.4.nix | 19 ------------------ .../tools/parsing/happy/1.18.5.nix | 19 ------------------ .../tools/parsing/happy/1.18.6.nix | 19 ------------------ .../tools/parsing/happy/1.18.9.nix | 20 ------------------- .../parsing/happy/{1.19.4.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 +------- 7 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 pkgs/development/tools/parsing/happy/1.18.10.nix delete mode 100644 pkgs/development/tools/parsing/happy/1.18.4.nix delete mode 100644 pkgs/development/tools/parsing/happy/1.18.5.nix delete mode 100644 pkgs/development/tools/parsing/happy/1.18.6.nix delete mode 100644 pkgs/development/tools/parsing/happy/1.18.9.nix rename pkgs/development/tools/parsing/happy/{1.19.4.nix => default.nix} (100%) diff --git a/pkgs/development/tools/parsing/happy/1.18.10.nix b/pkgs/development/tools/parsing/happy/1.18.10.nix deleted file mode 100644 index 187fd3628e83..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.10.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.10"; - sha256 = "0jq6p5vvdh4wbam80q2d6j2fa6bmbgnbmqk1w9904x06g7vj1jf1"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix deleted file mode 100644 index c7e3f919568b..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.4.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.4"; - sha256 = "909bec4541a92d3765e74756f752514d2d03ec7a5d3e74c18268a57fe7ffa832"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.5.nix b/pkgs/development/tools/parsing/happy/1.18.5.nix deleted file mode 100644 index f66f20893516..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.5.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.5"; - sha256 = "91e1c29ac42bc5cabcac2c2e28e693fc59fbdf30636e5c52cb51b779a74d755e"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.6.nix b/pkgs/development/tools/parsing/happy/1.18.6.nix deleted file mode 100644 index 7919908681e1..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.6.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.6"; - sha256 = "0q6dnwihi1q761qdq0hhi733nh5d53xz6frwmr7slpvrp6v8y344"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.9.nix b/pkgs/development/tools/parsing/happy/1.18.9.nix deleted file mode 100644 index 4ad9bf546b5f..000000000000 --- a/pkgs/development/tools/parsing/happy/1.18.9.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.9"; - sha256 = "12k1rg7dqa02az9d1zasdnp51zs4h30kpi5lyqsw3jxfp09cad3x"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.19.4.nix b/pkgs/development/tools/parsing/happy/default.nix similarity index 100% rename from pkgs/development/tools/parsing/happy/1.19.4.nix rename to pkgs/development/tools/parsing/happy/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 42d6a9575638..cc3d25d7bb16 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2905,13 +2905,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HandsomeSoup = callPackage ../development/libraries/haskell/HandsomeSoup {}; - happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; - happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; - happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {}; - happy_1_18_9 = callPackage ../development/tools/parsing/happy/1.18.9.nix {}; - happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {}; - happy_1_19_4 = callPackage ../development/tools/parsing/happy/1.19.4.nix {}; - happy = self.happy_1_19_4; + happy = callPackage ../development/tools/parsing/happy {}; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; From 0b36cbf8e7f6885951ccf4f6679b21fcec03102a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:45:38 +0100 Subject: [PATCH 52/52] cabal-install: drop obsolete versions 0.10.2, 0.14.0, 0.6.2, 0.8.0, and 0.8.2 --- .../cabal-install/0.10.2.nix | 20 -------------- .../cabal-install/0.14.0.nix | 26 ------------------- .../cabal-install/0.6.2.nix | 20 -------------- .../cabal-install/0.8.0.nix | 20 -------------- .../cabal-install/0.8.2.nix | 20 -------------- pkgs/top-level/haskell-defaults.nix | 4 --- pkgs/top-level/haskell-packages.nix | 5 ---- 7 files changed, 115 deletions(-) delete mode 100644 pkgs/tools/package-management/cabal-install/0.10.2.nix delete mode 100644 pkgs/tools/package-management/cabal-install/0.14.0.nix delete mode 100644 pkgs/tools/package-management/cabal-install/0.6.2.nix delete mode 100644 pkgs/tools/package-management/cabal-install/0.8.0.nix delete mode 100644 pkgs/tools/package-management/cabal-install/0.8.2.nix diff --git a/pkgs/tools/package-management/cabal-install/0.10.2.nix b/pkgs/tools/package-management/cabal-install/0.10.2.nix deleted file mode 100644 index 3d7b2d72d719..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.10.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.10.2"; - sha256 = "05gmgxdlymp66c87szx1vq6hlraispdh6pm0n85s74yihjwwhmv3"; - isLibrary = false; - isExecutable = true; - buildDepends = [ Cabal filepath HTTP network random time zlib ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/tools/package-management/cabal-install/0.14.0.nix b/pkgs/tools/package-management/cabal-install/0.14.0.nix deleted file mode 100644 index c5a67e61999c..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.14.0.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.14.0"; - sha256 = "1n2vvlmfgfrj3z4ag5bj278vmdh6fw7xb0ixbxxxcngzd41bbwpl"; - isLibrary = false; - isExecutable = true; - buildDepends = [ - Cabal filepath HTTP mtl network random time zlib - ]; - postInstall = '' - mkdir $out/etc - mv bash-completion $out/etc/bash_completion.d - ''; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/tools/package-management/cabal-install/0.6.2.nix b/pkgs/tools/package-management/cabal-install/0.6.2.nix deleted file mode 100644 index 3c79857f6e78..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.6.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, network, random, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.6.2"; - sha256 = "d8ea91bd0a2a624ab1cf52ddfe48cef02b532bb5e2fcda3fd72ca51efc04b41a"; - isLibrary = false; - isExecutable = true; - buildDepends = [ Cabal filepath HTTP network random zlib ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/tools/package-management/cabal-install/0.8.0.nix b/pkgs/tools/package-management/cabal-install/0.8.0.nix deleted file mode 100644 index d27fbbca7d47..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.8.0.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.8.0"; - sha256 = "6d16618ff454f8d732cad64a53b767b5b6bb95ba4970b260a40e8f467035493c"; - isLibrary = false; - isExecutable = true; - buildDepends = [ Cabal filepath HTTP network random time zlib ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/tools/package-management/cabal-install/0.8.2.nix b/pkgs/tools/package-management/cabal-install/0.8.2.nix deleted file mode 100644 index 6f8881b504bd..000000000000 --- a/pkgs/tools/package-management/cabal-install/0.8.2.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }: - -cabal.mkDerivation (self: { - pname = "cabal-install"; - version = "0.8.2"; - sha256 = "8f896ab46ec6c578f620ce4150f7cd04a2088be793113b33cc570b13b6b86e0b"; - isLibrary = false; - isExecutable = true; - buildDepends = [ Cabal filepath HTTP network random time zlib ]; - meta = { - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - maintainers = with self.stdenv.lib.maintainers; [ simons ]; - }; -}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index e53e21fc68db..72a00c1f5cf2 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -63,10 +63,6 @@ ghc742Prefs = self : super : ghc763Prefs self super // { aeson = self.aeson_0_7_0_4.override { blazeBuilder = self.blazeBuilder; }; - cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { - HTTP = self.HTTP.override { network = self.network_2_3_0_13; }; - network = self.network_2_3_0_13; - }; extensibleExceptions = null; # core package in ghc <= 7.4.x hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cc3d25d7bb16..df16bb125bad 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -3065,11 +3065,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalg = callPackage ../development/libraries/haskell/cabalg {}; - cabalInstall_0_6_2 = callPackage ../tools/package-management/cabal-install/0.6.2.nix {}; - cabalInstall_0_8_0 = callPackage ../tools/package-management/cabal-install/0.8.0.nix {}; - cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {}; - cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; - cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix {