summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-07-27 15:04:41 +0200
committerLudovic Courtès <ludo@gnu.org>2021-07-27 15:04:41 +0200
commita0f880afea3b29e817866de0170ed579738db2d1 (patch)
treedf2631a2c99135a7696a6295eb3eb963cbfb0dc9 /guix
parentc0cd8b7614fd720475097c3a0dd95efc39114092 (diff)
build-system/haskell: Fix regression in "cabal-revision" input handling.
Previously, (assoc-ref ...) would return a one-element list, leading to an evaluation error while building the package ("wrong type to apply"). Regression introduced in 7d873f194ca69d6096d28d7a224ab78e83e34fe1. Reported by Marius Bakke. * guix/build-system/haskell.scm (haskell-build)[builder]: Adjust argument to #:cabal-revision.
Diffstat (limited to 'guix')
-rw-r--r--guix/build-system/haskell.scm10
1 files changed, 9 insertions, 1 deletions
diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm
index bd5a6eed48..bd4a732ad6 100644
--- a/guix/build-system/haskell.scm
+++ b/guix/build-system/haskell.scm
@@ -147,7 +147,15 @@ provides a 'Setup.hs' file as its build system."
#$(with-build-variables inputs outputs
#~(haskell-build #:name #$name
#:source #+source
- #:cabal-revision #$(assoc-ref inputs "cabal-revision")
+
+ ;; XXX: INPUTS contains <gexp-input> records as
+ ;; opposed to raw lowerable objects, hence the
+ ;; use of ungexp-splicing.
+ #:cabal-revision
+ #$@(match (assoc-ref inputs "cabal-revision")
+ (#f '())
+ (lst lst))
+
#:configure-flags #$configure-flags
#:extra-directories #$extra-directories
#:extra-directories #$extra-directories