all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#49606] [PATCH] gnu: Add ghc-8.10.
@ 2021-07-17 15:34 Xinglu Chen
  2021-07-17 19:24 ` Sarah Morgensen via Guix-patches via
  2021-07-30 22:12 ` [bug#49606] [PATCH wip-haskell v2] " Xinglu Chen
  0 siblings, 2 replies; 12+ messages in thread
From: Xinglu Chen @ 2021-07-17 15:34 UTC (permalink / raw)
  To: 49606

* gnu/packages/haskell.scm (ghc-8.10): New variable.
---
Two tests are failing, I am not sure why, but I have already spent too much
time on this.

gnu/packages/haskell.scm | 52 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 09732fc594..4e31867bfd 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -657,6 +657,58 @@ interactive environment for the functional language Haskell.")
                                 (file-pattern ".*\\.conf\\.d$")
                                 (file-type 'directory))))))
 
+(define-public ghc-8.10
+  (package
+    (inherit ghc-8.8)
+    (name "ghc")
+    (version "8.10.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.haskell.org/ghc/dist/"
+                           version "/ghc-" version "-src.tar.xz"))
+       (sha256
+        (base32 "0vq7wch0wfvy2b5dbi308lq5225vf691n95m19c9igagdvql22gi"))))
+    (native-inputs
+     `(("ghc-bootstrap" ,ghc-8.8)
+       ("ghc-testsuite"
+        ,(origin
+           (method url-fetch)
+           (uri (string-append
+                 "https://www.haskell.org/ghc/dist/"
+                 version "/ghc-" version "-testsuite.tar.xz"))
+           (patches (search-patches "ghc-testsuite-dlopen-pie.patch"))
+           (sha256
+            (base32
+             "0vcq774rfb6q8vsnh7p5clxp2qaz8ip6d2bm2ghbq53n8jl296d6"))))
+       ("git" ,git-minimal)                     ; invoked during tests
+       ,@(filter (match-lambda
+                   (("ghc-bootstrap" . _) #f)
+                   (("ghc-testsuite" . _) #f)
+                   (_ #t))
+                 (package-native-inputs ghc-8.8))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments ghc-8.8)
+       ((#:phases phases '%standard-phases)
+        `(modify-phases ,phases
+           (add-after 'unpack 'fix-cc-name
+             (lambda _
+               (substitute* "utils/hsc2hs/Common.hs"
+                 (("\"cc\"") "\"gcc\""))))
+           (add-after 'skip-more-tests 'skip-even-more-tests
+             (lambda _
+               ;; Not sure why these tests fail
+               (substitute* '("testsuite/tests/driver/T8602/T8602.T"
+                              "testsuite/tests/driver/T16521/all.T")
+                 (("^.*" all)
+                  (string-append "# guix skipped: " all)))))))))
+    (native-search-paths (list (search-path-specification
+                                (variable "GHC_PACKAGE_PATH")
+                                (files (list
+                                        (string-append "lib/ghc-" version)))
+                                (file-pattern ".*\\.conf\\.d$")
+                                (file-type 'directory))))))
+
 (define-public ghc-8 ghc-8.6)
 
 (define-public ghc ghc-8)

base-commit: 9cb35c02164d929fcb8929e7f454df215df8cf25
-- 
2.32.0






^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2021-09-15 19:38 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-17 15:34 [bug#49606] [PATCH] gnu: Add ghc-8.10 Xinglu Chen
2021-07-17 19:24 ` Sarah Morgensen via Guix-patches via
2021-07-23 20:48   ` Xinglu Chen
2021-07-30 22:12 ` [bug#49606] [PATCH wip-haskell v2] " Xinglu Chen
2021-08-12 10:18   ` Xinglu Chen
2021-09-13 14:24     ` Lars-Dominik Braun
2021-09-13 16:07       ` Xinglu Chen
2021-09-13 16:55         ` John Kehayias via Guix-patches via
2021-09-14 13:02         ` Lars-Dominik Braun
2021-09-14 15:21           ` Xinglu Chen
2021-09-15  7:46             ` bug#49606: " Lars-Dominik Braun
2021-09-15 19:31               ` [bug#49606] " John Kehayias via Guix-patches via

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.