gnu: ghc-9.4: Inherit from and bootstrap with the same GHC

This makes ghc-9.2 mostly redundant since packages are built with 9.10
and 9.2 is not used in bootstrapping.

* gnu/packages/haskell.scm (ghc-9.4): Inherit from ghc-9.0
[arguments]: Copy a fix from ghc-9.2.

Change-Id: I13dcf9a76af35b52a1bfd963736ad2aba83fe524
Signed-off-by: Andreas Enge <andreas@enge.fr>

1 files changed, 8 insertions, 4 deletions

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 4000d3ff799..338cace4c97 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1826,8 +1826,7 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
      (license license:bsd-3))))
 
 (define-public ghc-9.4
-  ;; Inherit from 9.2, which added a few fixes, but boot from 9.0 (see above).
-  (let ((base ghc-9.2))
+  (let ((base ghc-bootstrap-for-9.4))
     (package
       (inherit base)
       (name "ghc")
@@ -1845,12 +1844,17 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
          ((#:phases phases '%standard-phases)
           #~(modify-phases #$phases
              ;; Files don’t exist any more.
-             (delete 'skip-tests)))
+             (delete 'skip-tests)
+             ;; File Common.hs has been moved to src/ in the 9.2 release.
+             (replace 'fix-cc-reference
+               (lambda _
+                 (substitute* "utils/hsc2hs/src/Common.hs"
+                   (("\"cc\"") "\"gcc\""))))))
          ((#:tests? _ #f)
           #f)))
       (native-inputs
        `(;; GHC 9.4 must be built with GHC >= 9.0.
-         ("ghc-bootstrap" ,ghc-bootstrap-for-9.4)
+         ("ghc-bootstrap" ,base)
          ("ghc-testsuite"
           ,(origin
              (method url-fetch)