From f9250b47d58540516ac3817568e9e475f976ec8f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 15 Sep 2021 13:26:40 +0200 Subject: gnu: ghc-8: Update to 8.10. * gnu/packages/haskell.scm (ghc-8): Update to 8.10. (ghc-8.8): Rename to just ghc. (ghc-8.10): Dito. --- gnu/packages/haskell.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6b134ab1cc..86ed095b8d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -612,14 +612,9 @@ interactive environment for the functional language Haskell.") (file-pattern ".*\\.conf\\.d$") (file-type 'directory)))))) -;; Versions newer than ghc defined below (i.e. the compiler -;; haskell-build-system uses) should use ghc-next as their name to -;; ensure ghc (without version specification) and ghc-* packages are -;; always compatible. See https://issues.guix.gnu.org/issue/47335. - (define-public ghc-8.8 (package (inherit ghc-8.6) - (name "ghc-next") + (name "ghc") (version "8.8.4") (source (origin @@ -672,7 +667,7 @@ interactive environment for the functional language Haskell.") (define-public ghc-8.10 (package (inherit ghc-8.8) - (name "ghc-next") + (name "ghc") (version "8.10.7") (source (origin @@ -723,7 +718,12 @@ interactive environment for the functional language Haskell.") (file-pattern ".*\\.conf\\.d$") (file-type 'directory)))))) -(define-public ghc-8 ghc-8.6) +;; Versions newer than ghc defined below (i.e. the compiler +;; haskell-build-system uses) should use ghc-next as their name to +;; ensure ghc (without version specification) and ghc-* packages are +;; always compatible. See https://issues.guix.gnu.org/issue/47335. + +(define-public ghc-8 ghc-8.10) (define-public ghc ghc-8) -- cgit v1.2.3 From 89de1924cb535fc2c97d3654e21badaebd43518e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 9 Oct 2021 15:32:27 +0200 Subject: gnu: ghc-8.10: Disable failing test on i686. Not sure why it fails. * gnu/packages/haskell.scm (ghc-8.10) [#:phases]: Add new conditional phase to disable failing testcase on i686 without modifying derivation for other architectures to avoid rebuild. --- gnu/packages/haskell.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/haskell.scm') diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 86ed095b8d..e8bbc9dd10 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -710,7 +710,15 @@ interactive environment for the functional language Haskell.") (substitute* '("testsuite/tests/driver/T16521/all.T") (("extra_files" all) (string-append "[" all)) (("\\]\\), " all) - (string-append all "expect_broken(0)], "))))))))) + (string-append all "expect_broken(0)], "))))) + ;; TODO: Turn this into an undconditional patch on the next rebuild. + ,@(if (string=? "i686-linux" (%current-system)) + '((add-after 'skip-more-tests 'skip-failing-tests-i686 + (lambda _ + (substitute* '("testsuite/tests/codeGen/should_compile/all.T") + (("(test\\('T15155l', )when\\(unregisterised\\(\\), skip\\)" all before) + (string-append before "when(arch('i386'), skip)")))))) + '()))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH") (files (list -- cgit v1.2.3