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.
This commit is contained in:
parent
c0cd8b7614
commit
a0f880afea
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user