guix-commits
[Top][All Lists]
Advanced

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

01/01: gnu: ghc-8.6: Fix patch to read from file.


From: guix-commits
Subject: 01/01: gnu: ghc-8.6: Fix patch to read from file.
Date: Tue, 30 Jul 2019 14:20:44 -0400 (EDT)

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

commit e82b9658aab682d402e45554c70a6db34639050c
Author: Robert Vollmert <address@hidden>
Date:   Tue Jul 30 20:19:21 2019 +0200

    gnu: ghc-8.6: Fix patch to read from file.
    
    * gnu/packages/haskell.scm (ghc-8.6): Add "-i" to patch command.
---
 gnu/packages/haskell.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 1800c9f..85550c2 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -591,7 +591,7 @@ interactive environment for the functional language 
Haskell.")
        ;; GHC 8.6.5 must be built with GHC >= 8.2.
        ("ghc-bootstrap" ,ghc-8.4)
        ;; test patch must be applied after unpacking test suite
-       ("ghc-tests-patch" ,(car (search-patches "ghc-8.6.5-skip-tests.patch")))
+       ("ghc-skip-tests-patch" ,(car (search-patches 
"ghc-8.6.5-skip-tests.patch")))
        ("ghc-testsuite"
         ,(origin
            (method url-fetch)
@@ -641,7 +641,7 @@ interactive environment for the functional language 
Haskell.")
              #t))
          (add-after 'unpack-testsuite 'skip-tests
            (lambda* (#:key inputs #:allow-other-keys)
-             (invoke "patch" "-p1" (assoc-ref inputs "ghc-tests-patch"))))
+             (invoke "patch" "-p1" "-i" (assoc-ref inputs 
"ghc-skip-tests-patch"))))
          ;; 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



reply via email to

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