mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-12 22:26:40 -05:00
gnu: ghc-8.8: Rewrite using G-exps.
* gnu/packages/haskell.scm (ghc-8.8)[arguments]: Rewrite using g-exps. Remove trailing #t from phases.
This commit is contained in:
parent
279563ffe8
commit
9e26302773
1 changed files with 3 additions and 5 deletions
|
@ -845,19 +845,17 @@ (define-public ghc-8.8
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments ghc-8.6)
|
(substitute-keyword-arguments (package-arguments ghc-8.6)
|
||||||
((#:phases phases '%standard-phases)
|
((#:phases phases '%standard-phases)
|
||||||
`(modify-phases ,phases
|
#~(modify-phases #$phases
|
||||||
(add-before 'build 'fix-cc-reference
|
(add-before 'build 'fix-cc-reference
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "utils/hsc2hs/Common.hs"
|
(substitute* "utils/hsc2hs/Common.hs"
|
||||||
(("\"cc\"") "\"gcc\""))
|
(("\"cc\"") "\"gcc\""))))
|
||||||
#t))
|
|
||||||
(add-after 'unpack-testsuite 'skip-more-tests
|
(add-after 'unpack-testsuite 'skip-more-tests
|
||||||
(lambda _
|
(lambda _
|
||||||
;; XXX: This test fails because our ld-wrapper script
|
;; XXX: This test fails because our ld-wrapper script
|
||||||
;; mangles the response file passed to the linker.
|
;; mangles the response file passed to the linker.
|
||||||
(substitute* "testsuite/tests/hp2ps/all.T"
|
(substitute* "testsuite/tests/hp2ps/all.T"
|
||||||
(("^test\\('T15904'") "# guix skipped: test('T15904'"))
|
(("^test\\('T15904'") "# guix skipped: test('T15904'"))))))))
|
||||||
#t))))))
|
|
||||||
(native-search-paths (list (search-path-specification
|
(native-search-paths (list (search-path-specification
|
||||||
(variable "GHC_PACKAGE_PATH")
|
(variable "GHC_PACKAGE_PATH")
|
||||||
(files (list
|
(files (list
|
||||||
|
|
Loading…
Reference in a new issue