me/guix
Archived
1
0
Fork 0
Code Activity

gnu: ghc-9.2: Make the skip-T21694-i686 phase unconditional.

Browse source 
* gnu/packages/haskell.scm (ghc-9.2) [arguments]: Remove match conditional for
the skip-T21694-i686 phase.
This commit is contained in:
Maxim Cournoyer 2023-04-14 21:13:05 -04:00
parent e6090152a6
commit e244ea2445
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/haskell.scm
View file

@ -23,6 +23,7 @@
;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org> ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1325,20 +1326,16 @@ interactive environment for the functional language Haskell.")
(substitute-keyword-arguments (package-arguments base) (substitute-keyword-arguments (package-arguments base)
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
#~(modify-phases #$phases #~(modify-phases #$phases
;; File Common.hs has been moved to src/ in this release. ;; File Common.hs has been moved to src/ in this release.
(replace 'fix-cc-reference (replace 'fix-cc-reference
(lambda _ (lambda _
(substitute* "utils/hsc2hs/src/Common.hs" (substitute* "utils/hsc2hs/src/Common.hs"
(("\"cc\"") "\"gcc\"")))) (("\"cc\"") "\"gcc\""))))
;; FIXME: Remove i686-specific match on the next rebuild cycle. (add-after 'skip-more-tests 'skip-T21694-i686
#$@(match (%current-system) (lambda _
("i686-linux" (substitute* '("testsuite/tests/simplCore/should_compile/all.T")
#~((add-after 'skip-more-tests 'skip-T21694-i686 (("^test\\('T21694', \\[ " all)
(lambda _ (string-append all "when(arch('i386'), skip), ")))))))
(substitute* '("testsuite/tests/simplCore/should_compile/all.T")
(("^test\\('T21694', \\[ " all)
(string-append all "when(arch('i386'), skip), ")))))))
(_ #~()))))
;; Increase verbosity, so running the test suite does not time out on CI. ;; Increase verbosity, so running the test suite does not time out on CI.
((#:make-flags make-flags ''()) ((#:make-flags make-flags ''())
#~(cons "VERBOSE=4" #$make-flags)))) #~(cons "VERBOSE=4" #$make-flags))))
@ -1350,8 +1347,8 @@ interactive environment for the functional language Haskell.")
,(origin ,(origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://www.haskell.org/ghc/dist/" "https://www.haskell.org/ghc/dist/"
version "/ghc-" version "-testsuite.tar.xz")) version "/ghc-" version "-testsuite.tar.xz"))
(sha256 (sha256
(base32 (base32
"19ha0hidrijawy53vm2r0sgml5zkl8126mqy7p0pyacmw3k7913l")) "19ha0hidrijawy53vm2r0sgml5zkl8126mqy7p0pyacmw3k7913l"))