diff options
author | Mark H Weaver <mhw@netris.org> | 2015-04-17 22:06:05 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-04-17 22:06:05 -0400 |
commit | 334345d9db53326fa062298e2372d6c33123949a (patch) | |
tree | 50774c171f1a348bd7de8e9a447bad2a14a9dffb /gnu/packages/haskell.scm | |
parent | 8d7dc5d9dbf009009d33e21598f92c4685965cd5 (diff) | |
parent | 09dd019490e4a269b0a2d9512a07688f8ee657d3 (diff) | |
download | guix-334345d9db53326fa062298e2372d6c33123949a.tar guix-334345d9db53326fa062298e2372d6c33123949a.tar.gz |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/haskell.scm')
-rw-r--r-- | gnu/packages/haskell.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 254301e6c8..3bb5e3074a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -111,13 +111,17 @@ ;; We get a smaller number of test failures by disabling parallel test ;; execution. #:parallel-tests? #f + + ;; The DSOs use $ORIGIN to refer to each other, but (guix build + ;; gremlin) doesn't support it yet, so skip this phase. + #:validate-runpath? #f + #:modules ((guix build gnu-build-system) (guix build utils) (guix build rpath) (srfi srfi-26) (srfi srfi-1)) - #:imported-modules ((guix build gnu-build-system) - (guix build utils) + #:imported-modules (,@%gnu-build-system-modules (guix build rpath)) #:configure-flags (list @@ -799,7 +803,7 @@ mutable and immutable), with a powerful loop optimisation framework.") `(#:tests? #f ; FIXME: currently missing libraries used for tests. #:phases (modify-phases %standard-phases - (add-before configure set-sh + (add-before 'configure 'set-sh (lambda _ (setenv "CONFIG_SHELL" "sh")))))) (home-page "https://github.com/haskell/network") (synopsis "Low-level networking interface") |