diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-06-07 22:49:47 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-06-07 22:49:47 +0200 |
| commit | c0a4db66976dc63decbd612aafb934f44629e321 (patch) | |
| tree | ca31854b3a100c47ab50f9a9f0035ad651439038 /guix/import | |
| parent | d998902214df0a177591541db60e8f9f406a239b (diff) | |
| download | gnu-guix-c0a4db66976dc63decbd612aafb934f44629e321.tar gnu-guix-c0a4db66976dc63decbd612aafb934f44629e321.tar.gz | |
import: print: Honor the outputs of inputs (!).
Fixes <http://bugs.gnu.org/35893>.
Reported by Jesse Gibbons <jgibbons2357@gmail.com>.
* guix/import/print.scm (package->code)[package-lists->code]: Preserve
OUT in the result.
* tests/print.scm (define-with-source): New macro.
(pkg): Use it.
(pkg-source): New variable.
(pkg-with-inputs, pkg-with-inputs-source): New variables.
("simple package"): Refer to 'pkg-source'.
("package with inputs"): New test.
Diffstat (limited to 'guix/import')
| -rw-r--r-- | guix/import/print.scm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/guix/import/print.scm b/guix/import/print.scm index 0bec32c8dc..4c2a91fa4f 100644 --- a/guix/import/print.scm +++ b/guix/import/print.scm @@ -94,12 +94,13 @@ when evaluated." (map (match-lambda ((label pkg . out) (let ((mod (package-module-name pkg))) - (list label - ;; FIXME: using '@ certainly isn't pretty, but it - ;; avoids having to import the individual package - ;; modules. - (list 'unquote - (list '@ mod (variable-name pkg mod))))))) + (cons* label + ;; FIXME: using '@ certainly isn't pretty, but it + ;; avoids having to import the individual package + ;; modules. + (list 'unquote + (list '@ mod (variable-name pkg mod))) + out)))) lsts))) (let ((name (package-name package)) |