guix-commits
[Top][All Lists]
Advanced

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

04/04: gnu: ghc: Patch runtime references to /bin/sh.


From: Eric Bavier
Subject: 04/04: gnu: ghc: Patch runtime references to /bin/sh.
Date: Fri, 12 Jun 2015 05:54:40 +0000

bavier pushed a commit to branch master
in repository guix.

commit 48d21d6cd600cabc147cfec243518931bbc3169a
Author: Eric Bavier <address@hidden>
Date:   Thu Jun 11 17:51:47 2015 -0500

    gnu: ghc: Patch runtime references to /bin/sh.
    
    * gnu/packages/haskell.scm (ghc)[arguments]: Rename
      'unpack-and-fix-testsuite' phase to 'unpack-testsuite-and-fix-bins'.
      Patch source files that reference /bin/sh.
---
 gnu/packages/haskell.scm |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index ac87de5..75bbb24 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -144,7 +144,7 @@
               (ghc-bootstrap-prefix
                (string-append ghc-bootstrap-path "/usr" )))
          (alist-cons-after
-          'unpack-bin 'unpack-and-fix-testsuite
+          'unpack-bin 'unpack-testsuite-and-fix-bins
           (lambda* (#:key inputs outputs #:allow-other-keys)
             (with-directory-excursion ".."
               (copy-file (assoc-ref inputs "ghc-testsuite")
@@ -155,7 +155,9 @@
                       "testsuite/timeout/timeout.py"
                       "testsuite/timeout/timeout.hs"
                       "testsuite/tests/rename/prog006/Setup.lhs"
-                      "testsuite/tests/programs/life_space_leak/life.test")
+                      "testsuite/tests/programs/life_space_leak/life.test"
+                      "libraries/process/System/Process/Internals.hs"
+                      "libraries/unix/cbits/execvpe.c")
               (("/bin/sh") (which "sh"))
               (("/bin/rm") "rm"))
             #t)



reply via email to

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