guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/10: gnu: ghc-8.6: Rewrite using G-exps.


From: guix-commits
Subject: 06/10: gnu: ghc-8.6: Rewrite using G-exps.
Date: Tue, 23 Aug 2022 11:05:41 -0400 (EDT)

efraim pushed a commit to branch staging
in repository guix.

commit 279563ffe8cdf16b94603706e32c94d1bdc169ac
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Aug 22 10:32:34 2022 +0300

    gnu: ghc-8.6: Rewrite using G-exps.
    
    * gnu/packages/haskell.scm (ghc-8.6)[arguments]: Rewrite using g-exps.
    Remove trailing #t from phases.
---
 gnu/packages/haskell.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index fcad88f240..8c0cc48ef5 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -769,10 +769,10 @@ interactive environment for the functional language 
Haskell.")
     (arguments
      (substitute-keyword-arguments (package-arguments ghc-8.4)
        ((#:make-flags make-flags ''())
-        `(cons "EXTRA_RUNTEST_OPTS=--skip-perf-tests"
-               ,make-flags))
+        #~(cons "EXTRA_RUNTEST_OPTS=--skip-perf-tests"
+                #$make-flags))
        ((#:phases phases '%standard-phases)
-        `(modify-phases ,phases
+        #~(modify-phases #$phases
            (add-after 'install 'remove-unnecessary-references
              (lambda* (#:key outputs #:allow-other-keys)
                (substitute* (find-files (string-append (assoc-ref outputs 
"out") "/lib/")
@@ -797,8 +797,7 @@ interactive environment for the functional language 
Haskell.")
                                     (new    (string-append out subdir)))
                                (mkdir-p (dirname new))
                                (rename-file haddock-file new)))
-                           (find-files doc "\\.haddock$")))
-               #t))
+                           (find-files doc "\\.haddock$")))))
            (add-after 'unpack-testsuite 'skip-tests
              (lambda _
                ;; These two tests refer to the root user, which doesn't exist
@@ -806,8 +805,7 @@ interactive environment for the functional language 
Haskell.")
                (substitute* "libraries/unix/tests/all.T"
                  (("^test\\('T8108'") "# guix skipped: test('T8108'"))
                (substitute* "libraries/unix/tests/libposix/all.T"
-                 (("^test\\('posix010'") "# guix skipped: test('posix010'"))
-               #t))))))
+                 (("^test\\('posix010'") "# guix skipped: 
test('posix010'"))))))))
     (native-search-paths (list (search-path-specification
                                 (variable "GHC_PACKAGE_PATH")
                                 (files (list



reply via email to

[Prev in Thread] Current Thread [Next in Thread]