diff --git a/pkgs/development/tools/documentation/haddock/2.13.1.nix b/pkgs/development/tools/documentation/haddock/2.13.1.nix new file mode 100644 index 00000000000..1eed852f537 --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.13.1.nix @@ -0,0 +1,18 @@ +{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: + +cabal.mkDerivation (self: { + pname = "haddock"; + version = "2.13.1"; + sha256 = "0zsflbc3ayjsn542sa58zl62dd78ykr489f18sh467hrrnaj4pkf"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + buildTools = [ alex happy ]; + 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; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 44bb7aef8c7..3794aa970a2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -145,7 +145,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_4_0; # 7.6 ok cabalInstall = self.cabalInstall_1_16_0; # 7.6 ok alex = self.alex_3_0_1; # 7.6 ok - haddock = self.haddock_2_12_0; # 7.6 ok + haddock = self.haddock_2_13_1; # 7.6 ok happy = self.happy_1_18_10; # 7.6 ok }; @@ -1816,7 +1816,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 = self.haddock_2_12_0; + haddock_2_13_1 = callPackage ../development/tools/documentation/haddock/2.13.1.nix {}; + haddock = self.haddock_2_13_1; 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 {};