diff options
| author | Timothy Sample <samplet@ngyro.com> | 2019-11-15 12:50:30 -0500 |
|---|---|---|
| committer | Timothy Sample <samplet@ngyro.com> | 2019-11-20 20:48:55 -0500 |
| commit | 1b84d8ef34b03744185ca831c3a88a890dea2ac4 (patch) | |
| tree | 073615ef6b489ba81edc1d5d6a41d7e1d4081ebb /gnu/packages/patches | |
| parent | c1637311b6331588734791a87376023338b6a4a3 (diff) | |
| download | guix-1b84d8ef34b03744185ca831c3a88a890dea2ac4.tar guix-1b84d8ef34b03744185ca831c3a88a890dea2ac4.tar.gz | |
gnu: ghc-haddock-api: Update to 2.22.0.
* gnu/packages/patches/ghc-haddock-api-fix-haddock.patch: New file.
* gnu/local.mk: Add it.
* gnu/packages/haskell-xyz.scm (ghc-haddock-api): Update to 2.22.0.
[source]: Use the new patch.
[arguments]: Change the 'update-constraints' phase to allow newer
versions of 'QuickCheck' and 'hspec'.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/ghc-haddock-api-fix-haddock.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/gnu/packages/patches/ghc-haddock-api-fix-haddock.patch b/gnu/packages/patches/ghc-haddock-api-fix-haddock.patch new file mode 100644 index 0000000000..927cb5b366 --- /dev/null +++ b/gnu/packages/patches/ghc-haddock-api-fix-haddock.patch @@ -0,0 +1,54 @@ +This patch is taken from upstream. It fixes documentation generation. +The patch has been lightly adapted to apply to the release tarball, but +the commit message was left untouched, so it refers to some changes not +included in the patch. + +From 0d9a81e20238a6b72f9f5c005f1f7e9cf05f6fb9 Mon Sep 17 00:00:00 2001 +From: Alec Theriault <alec.theriault@gmail.com> +Date: Sat, 27 Oct 2018 10:05:04 -0700 +Subject: [PATCH] Fix documentation in `haddock-api` (#957) + +* Fix misplaced Haddocks in Haddock itself + +Haddock should be able to generate documentation for 'haddock-api' +again. + +* Make CI check that documentation can be built. + +* Add back a doc that is OK +--- + .travis.yml | 3 +++ + haddock-api/src/Haddock/Backends/LaTeX.hs | 10 +++++----- + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/src/Haddock/Backends/LaTeX.hs b/src/Haddock/Backends/LaTeX.hs +index 4e0e6eba..613c6deb 100644 +--- a/src/Haddock/Backends/LaTeX.hs ++++ b/src/Haddock/Backends/LaTeX.hs +@@ -243,8 +243,8 @@ ppDocGroup lev doc = sec lev <> braces doc + + -- | Given a declaration, extract out the names being declared + declNames :: LHsDecl DocNameI +- -> ( LaTeX -- ^ to print before each name in an export list +- , [DocName] -- ^ names being declared ++ -> ( LaTeX -- to print before each name in an export list ++ , [DocName] -- names being declared + ) + declNames (L _ decl) = case decl of + TyClD _ d -> (empty, [tcdName d]) +@@ -444,9 +444,9 @@ ppLPatSig doc docnames ty unicode + -- arguments as needed. + ppTypeOrFunSig :: HsType DocNameI + -> DocForDecl DocName -- ^ documentation +- -> ( LaTeX -- ^ first-line (no-argument docs only) +- , LaTeX -- ^ first-line (argument docs only) +- , LaTeX -- ^ type prefix (argument docs only) ++ -> ( LaTeX -- first-line (no-argument docs only) ++ , LaTeX -- first-line (argument docs only) ++ , LaTeX -- type prefix (argument docs only) + ) + -> Bool -- ^ unicode + -> LaTeX +-- +2.23.0 + |