01/02: gnu: ghc-8.6: Clean up phase ordering.

[guix-commits]

rob pushed a commit to branch wip-haskell-updates
in repository guix.

commit 3a9e9074862073eee6b001b01592ac106eb25a92
Author: Robert Vollmert <address@hidden>
Date:   Wed Jul 31 10:09:48 2019 +0200

    gnu: ghc-8.6: Clean up phase ordering.
    
    * gnu/packages/haskell.scm (ghc-8.6): Reorder phases.
---
 gnu/packages/haskell.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index c8ad1d8..5491b09 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -639,9 +639,17 @@ interactive environment for the functional language 
Haskell.")
                      (assoc-ref inputs "ghc-testsuite")
                      "--strip-components=1")
              #t))
-         (add-after 'unpack-testsuite 'skip-tests
+         (add-after 'unpack-testsuite 'patch-out-broken-tests
            (lambda* (#:key inputs #:allow-other-keys)
              (invoke "patch" "-p2" "-i" (assoc-ref inputs 
"ghc-skip-tests-patch"))))
+         (add-after 'patch-out-broken-tests 'fix-shell-wrappers
+           (lambda _
+             (substitute* '("driver/ghci/ghc.mk"
+                            "utils/mkdirhier/ghc.mk"
+                            "rules/shell-wrapper.mk")
+               (("echo '#!/bin/sh'")
+                (format #f "echo '#!~a'" (which "sh"))))
+             #t))
          ;; This phase patches the 'ghc-pkg' command so that it sorts the list
          ;; of packages in the binary cache it generates.
          (add-before 'build 'fix-ghc-pkg-nondeterminism
@@ -650,14 +658,6 @@ interactive environment for the functional language 
Haskell.")
                (("confs = map \\(path </>\\) \\$ filter \\(\".conf\" 
`isSuffixOf`\\) fs")
                 "confs = map (path </>) $ filter (\".conf\" `isSuffixOf`) 
(sort fs)"))
              #t))
-         (add-after 'unpack-testsuite 'fix-shell-wrappers
-           (lambda _
-             (substitute* '("driver/ghci/ghc.mk"
-                            "utils/mkdirhier/ghc.mk"
-                            "rules/shell-wrapper.mk")
-               (("echo '#!/bin/sh'")
-                (format #f "echo '#!~a'" (which "sh"))))
-             #t))
          ;; This is necessary because the configure system no longer uses
          ;; “AC_PATH_” but “AC_CHECK_”, setting the variables to just the
          ;; plain command names.