From c6da40c42f8e4feb2271e5398c70b71e68a57461 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Mar 2014 22:06:23 +0200
Subject: [PATCH] haskell-haddock: add version 2.14.1
---
.../tools/documentation/haddock/2.14.1.nix | 22 +++++++++++++++++++
pkgs/top-level/haskell-packages.nix | 6 ++---
2 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 pkgs/development/tools/documentation/haddock/2.14.1.nix
diff --git a/pkgs/development/tools/documentation/haddock/2.14.1.nix b/pkgs/development/tools/documentation/haddock/2.14.1.nix
new file mode 100644
index 000000000000..c63503c85baa
--- /dev/null
+++ b/pkgs/development/tools/documentation/haddock/2.14.1.nix
@@ -0,0 +1,22 @@
+{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, hspec
+, QuickCheck, xhtml
+}:
+
+cabal.mkDerivation (self: {
+ pname = "haddock";
+ version = "2.14.1";
+ sha256 = "1mxkphzdfd5c8dklfl09ajqwhw8ibvzl0cqrfr2j8rn0j03w46x6";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ];
+ testDepends = [ Cabal deepseq filepath hspec QuickCheck ];
+ 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;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d3192e4e9f7d..d9f00fb3f0bb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -175,7 +175,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
zlib = self.zlib_0_5_4_1;
cabalInstall = self.cabalInstall_1_18_0_3;
alex = self.alex_3_1_3;
- haddock = self.haddock_2_13_2_1;
+ haddock = self.haddock_2_14_1;
happy = self.happy_1_19_3;
primitive = self.primitive_0_5_2_1; # semi-official, but specified
};
@@ -2839,8 +2839,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
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_13_2_1 = callPackage ../development/tools/documentation/haddock/2.13.2.1.nix {};
- haddock = self.haddock_2_13_2_1;
+ haddock_2_14_1 = callPackage ../development/tools/documentation/haddock/2.14.1.nix {};
+ haddock = self.haddock_2_14_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 {};