mbox series

[bug#51914,0/2] Fix asdf-build-system on non-package inputs

Message ID 20211117082905.29499-1-mail@ambrevar.xyz
Headers show
Series Fix asdf-build-system on non-package inputs | expand

Message

Pierre Neidhardt Nov. 17, 2021, 8:29 a.m. UTC
cl-https-everywhere failed to build because sbcl-cl-https-everywhere had a
non-package input.

This should now be fixed.  This patchset adds the cl-https-everywhere package
as well as a proof-of-work.

Pierre Neidhardt (2):
  build-system/asdf: Don't fail in sbcl-package->cl-source-package on
    non-package inputs.
  gnu: Add cl-https-everywhere.

 gnu/packages/lisp-xyz.scm  | 82 ++++++++++++++++++++++++++++++++++++++
 guix/build-system/asdf.scm |  3 +-
 2 files changed, 84 insertions(+), 1 deletion(-)


base-commit: eb4edd7fde2e596bc2ec36ee773873722df46234

Comments

Pierre Neidhardt Nov. 17, 2021, 8:38 a.m. UTC | #1
Guillaume, what do you think?
Guillaume Le Vaillant Nov. 17, 2021, 10:56 a.m. UTC | #2
Pierre Neidhardt <mail@ambrevar.xyz> skribis:

> diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm
> index b4e40ee8c2..538812d620 100644
> --- a/guix/build-system/asdf.scm
> +++ b/guix/build-system/asdf.scm
> @@ -162,7 +162,8 @@ (define (transform-package-name name)
>          name))
>  
>    (define (has-from-build-system? pkg)
> -    (eq? from-build-system (package-build-system pkg)))
> +    (when (package? pkg)
> +      (eq? from-build-system (package-build-system pkg))))
>  
>    (define (find-input-package pkg)
>      (let* ((name (package-name pkg))

Maybe use "(and (package? pkg) (eq? ...))" instead of "(when ...)" so
that the function returns #f instead of returning nothing when pkg is
not a package.
Otherwise LGTM.