aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorTimothy Sample <samplet@ngyro.com>2018-08-29 00:31:02 -0400
committerRicardo Wurmus <rekado@elephly.net>2018-10-01 12:12:22 +0200
commit1b29af3d16ef9f8636031c8136e50be8abeef5f0 (patch)
tree33103c9e07f76f22423011e74d751f0628830b14 /gnu/packages
parent69054c92854075ffc2027ef9a6459540571ef1f2 (diff)
downloadguix-1b29af3d16ef9f8636031c8136e50be8abeef5f0.tar
guix-1b29af3d16ef9f8636031c8136e50be8abeef5f0.tar.gz
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/haskell.scm37
1 files changed, 29 insertions, 8 deletions
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 8b2c157a71..f153b48034 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")