diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-06-14 08:49:42 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-06-14 08:49:42 -0400 |
| commit | bcf2971f6ebc965aa94391b2a8d39e5005885806 (patch) | |
| tree | c12187a787b934fb79d159046a4a5516e5d39f97 /gnu/packages/haskell.scm | |
| parent | ec2990716005b4b41bab6b707ada0206c1655be8 (diff) | |
| parent | 7871724df7218428fac53133496c474bac8c5ea8 (diff) | |
| download | patches-bcf2971f6ebc965aa94391b2a8d39e5005885806.tar patches-bcf2971f6ebc965aa94391b2a8d39e5005885806.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/commencement.scm
gnu/packages/xml.scm
Diffstat (limited to 'gnu/packages/haskell.scm')
| -rw-r--r-- | 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 ac87de540e..75bbb24479 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) |