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

pkgs/development/tools/documentation/haddock/2.10.0.nix

@@ -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 ];
-  };
-})

pkgs/development/tools/documentation/haddock/2.11.0.nix

@@ -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 ];
-  };
-})

pkgs/development/tools/documentation/haddock/2.12.0.nix

@@ -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;
-  };
-})

pkgs/development/tools/documentation/haddock/2.13.2.1.nix

@@ -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 ];
-  };
-})

pkgs/development/tools/documentation/haddock/2.13.2.nix

@@ -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 ];
-  };
-})

pkgs/development/tools/documentation/haddock/2.14.2.nix

@@ -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 ];
-  };
-})

pkgs/development/tools/documentation/haddock/2.14.3.nix

@@ -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;
-  };
-})

pkgs/development/tools/documentation/haddock/2.4.2.nix

@@ -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;
-  };
-})

pkgs/development/tools/documentation/haddock/2.7.2.nix

@@ -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 ];
-  };
-})

pkgs/development/tools/documentation/haddock/2.9.2.nix

@@ -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
-    ];
-  };
-})

pkgs/development/tools/documentation/haddock/2.9.4.nix

@@ -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;
-  };
-})

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; }; };

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 = callPackage ../development/tools/documentation/haddock {};
-  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;
 
   haddockApi = callPackage ../development/libraries/haskell/haddock-api {};