[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
252/257: gnu: ghc-haddock: Update to 2.19.0.1.
From: |
Ricardo Wurmus |
Subject: |
252/257: gnu: ghc-haddock: Update to 2.19.0.1. |
Date: |
Thu, 27 Sep 2018 15:47:40 -0400 (EDT) |
rekado pushed a commit to branch wip-haskell
in repository guix.
commit 996a4b008a4a72e4530e53ccf3433fd848d41412
Author: Timothy Sample <address@hidden>
Date: Wed Aug 29 00:31:02 2018 -0400
gnu: ghc-haddock: Update to 2.19.0.1.
* gnu/packages/haskell.scm (ghc-haddock): Update to 2.19.0.1.
[arguments]: Add a phase that deletes four test suites to avoid a
dependency on haddock-test.
[native-inputs]: Remove ghc-haddock-test.
---
gnu/packages/haskell.scm | 37 +++++++++++++++++++++++++++++--------
1 file changed, 29 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 8b2c157..f153b48 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1049,7 +1049,7 @@ documentation-generation tool for Haskell libraries.")
(define-public ghc-haddock
(package
(name "ghc-haddock")
- (version "2.17.4")
+ (version "2.19.0.1")
(source
(origin
(method url-fetch)
@@ -1059,16 +1059,37 @@ documentation-generation tool for Haskell libraries.")
".tar.gz"))
(sha256
(base32
- "1z3h3v7w84dzsm47iavdppc2w899mr4c1agq9fzghgz902i0a655"))))
+ "1g1j9j0hf2yhyyh0gwz6bzbvfvliqz9x8a8hnkmwghm7w3xa6sb7"))))
(build-system haskell-build-system)
- ;; FIXME: Tests fail with this error:
- ;; driver-test/Main.hs:4:1: error:
- ;; Failed to load interface for ‘ResponseFileSpec’
- (arguments `(#:tests? #f))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ ;; There are four test suites that require the ghc-haddock-test
+ ;; package, which no longer builds with GHC 8.4.3. This phase
+ ;; removes these four test suites from the Cabal file, so that we
+ ;; do not need ghc-haddock-test as an input.
+ (add-before 'configure 'remove-haddock-test-test-suites
+ (lambda _
+ (use-modules (ice-9 rdelim))
+ (with-atomic-file-replacement "haddock.cabal"
+ (lambda (in out)
+ (let loop ((line (read-line in 'concat)) (deleting? #f))
+ (cond
+ ((eof-object? line) #t)
+ ((string-every char-set:whitespace line)
+ (unless deleting? (display line out))
+ (loop (read-line in 'concat) #f))
+ ((member line '("test-suite html-test\n"
+ "test-suite hypsrc-test\n"
+ "test-suite latex-test\n"
+ "test-suite hoogle-test\n"))
+ (loop (read-line in 'concat) #t))
+ (else
+ (unless deleting? (display line out))
+ (loop (read-line in 'concat) deleting?)))))))))))
(inputs `(("ghc-haddock-api" ,ghc-haddock-api)))
(native-inputs
- `(("ghc-hspec" ,ghc-hspec)
- ("ghc-haddock-test" ,ghc-haddock-test)))
+ `(("ghc-hspec" ,ghc-hspec)))
(home-page "https://www.haskell.org/haddock/")
(synopsis
"Documentation-generation tool for Haskell libraries")
- branch wip-haskell created (now 75ac367), Ricardo Wurmus, 2018/09/27
- 105/257: gnu: ghc-hinotify: Update to 0.3.10., Ricardo Wurmus, 2018/09/27
- 252/257: gnu: ghc-haddock: Update to 2.19.0.1.,
Ricardo Wurmus <=
- 247/257: gnu: ghc-haddock-library: Update to 1.5.0.1., Ricardo Wurmus, 2018/09/27
- 257/257: gnu: ghc-tasty-golden: Update to 2.3.2., Ricardo Wurmus, 2018/09/27
- 255/257: gnu: Remove address@hidden, Ricardo Wurmus, 2018/09/27
- 251/257: gnu: ghc-yesod-form: Update to 1.6.2., Ricardo Wurmus, 2018/09/27
- 256/257: gnu: ghc-base-compat: Update to 0.10.4., Ricardo Wurmus, 2018/09/27
- 253/257: gnu: ghc-pandoc-citeproc: Update to 0.14.3.1., Ricardo Wurmus, 2018/09/27
- 242/257: gnu: ghc-yesod-core: Update to 1.6.6., Ricardo Wurmus, 2018/09/27
- 254/257: gnu: ghc-yesod: Update to 1.6.0., Ricardo Wurmus, 2018/09/27
- 238/257: gnu: ghc-trifecta: Update to 2., Ricardo Wurmus, 2018/09/27
- 229/257: gnu: Add ghc-resolv., Ricardo Wurmus, 2018/09/27