tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-27 19:41:50 +02:00
Code Activity

gexp: Correctly handle #$output in 'gexp->approximate-sexp'.

Browse Source 
This addresses the following backtrace from
"guix lint -c wrapper-inputs hostapd":

Backtrace:ostapd@2.10 [wrapper-inputs]...
[...]
    174:9  3 (gexp->approximate-sexp #<gexp (modify-phases %standard?>)
In srfi/srfi-1.scm:
   586:17  2 (map1 (#<gexp-output out> #<gexp-input "pkg-config":o?>))
In guix/gexp.scm:
   175:16  1 (_ _)
In ice-9/boot-9.scm:
  1685:16  0 (raise-exception _ #:continuable? _)

ice-9/boot-9.scm:1685:16: In procedure raise-exception:
Throw to key `match-error' with args `("match" "no matching pattern" #<gexp-output out>)'.

* guix/gexp.scm (gexp->approximate-sexp): Handle the case where 'reference' is
  a <gexp-output>,, by returning (*approximate*).
* tests/gexp.scm ("gexp->approximate-sexp, outputs"): Test it.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Maxime Devos
2022-03-03 14:14:22 +00:00
committed by Ludovic Courtès
parent 5aec62ee0f
commit 2e5c3d91fe
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/gexp.scm
+5
View File
@@ -148,6 +148,11 @@
(null? (gexp-inputs exp))
(gexp->sexp* exp))))
(test-equal "gexp->approximate-sexp, outputs"
'(list 'out:foo (*approximate*) 'out:bar (*approximate*))
(gexp->approximate-sexp
#~(list 'out:foo #$output:foo 'out:bar #$output:bar)))
(test-equal "unquote"
'(display `(foo ,(+ 2 3)))
(let ((exp (gexp (display `(foo ,(+ 2 3))))))