GNU bug report logs - #51914
[PATCH 0/2] Fix asdf-build-system on non-package inputs

Previous Next

Package: guix-patches;

Reported by: Pierre Neidhardt <mail <at> ambrevar.xyz>

Date: Wed, 17 Nov 2021 08:30:02 UTC

Severity: normal

Tags: patch

Done: Pierre Neidhardt <mail <at> ambrevar.xyz>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 51914 in the body.
You can then email your comments to 51914 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#51914; Package guix-patches. (Wed, 17 Nov 2021 08:30:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Pierre Neidhardt <mail <at> ambrevar.xyz>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Wed, 17 Nov 2021 08:30:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Pierre Neidhardt <mail <at> ambrevar.xyz>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] Fix asdf-build-system on non-package inputs
Date: Wed, 17 Nov 2021 09:29:05 +0100
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
-- 
2.32.0





Information forwarded to guix-patches <at> gnu.org:
bug#51914; Package guix-patches. (Wed, 17 Nov 2021 08:35:02 GMT) Full text and rfc822 format available.

Message #8 received at 51914 <at> debbugs.gnu.org (full text, mbox):

From: Pierre Neidhardt <mail <at> ambrevar.xyz>
To: 51914 <at> debbugs.gnu.org
Subject: [PATCH 1/2] build-system/asdf: Don't fail in
 sbcl-package->cl-source-package on non-package inputs.
Date: Wed, 17 Nov 2021 09:33:52 +0100
Inputs can be non-packages, for instance (origin ...).
sbcl-package->cl-source-package used to fail if such inputs were present in
the parent sbcl-* package.

* guix/build-system/asdf.scm (package-with-build-system): Fix
'has-from-build-system?' function.
---
 guix/build-system/asdf.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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))
-- 
2.32.0





Information forwarded to guix-patches <at> gnu.org:
bug#51914; Package guix-patches. (Wed, 17 Nov 2021 08:40:01 GMT) Full text and rfc822 format available.

Message #11 received at 51914 <at> debbugs.gnu.org (full text, mbox):

From: Pierre Neidhardt <mail <at> ambrevar.xyz>
To: 51914 <at> debbugs.gnu.org
Cc: Guillaume Le Vaillant <glv <at> posteo.net>
Subject: Re: bug#51914: Acknowledgement ([PATCH 0/2] Fix asdf-build-system
 on non-package inputs)
Date: Wed, 17 Nov 2021 09:38:58 +0100
[Message part 1 (text/plain, inline)]
Guillaume, what do you think?
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#51914; Package guix-patches. (Wed, 17 Nov 2021 09:02:02 GMT) Full text and rfc822 format available.

Message #14 received at 51914 <at> debbugs.gnu.org (full text, mbox):

From: Pierre Neidhardt <mail <at> ambrevar.xyz>
To: 51914 <at> debbugs.gnu.org
Subject: Re: bug#51914: Acknowledgement ([PATCH 0/2] Fix asdf-build-system
 on non-package inputs)
Date: Wed, 17 Nov 2021 10:01:12 +0100
[Message part 1 (text/plain, inline)]
`git send-email` failed to send the second patch, here it is.
[signature.asc (application/pgp-signature, inline)]
[0002-gnu-Add-cl-https-everywhere.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#51914; Package guix-patches. (Wed, 17 Nov 2021 10:42:01 GMT) Full text and rfc822 format available.

Message #17 received at 51914 <at> debbugs.gnu.org (full text, mbox):

From: zimoun <zimon.toutoune <at> gmail.com>
To: Pierre Neidhardt <mail <at> ambrevar.xyz>
Cc: 51914 <at> debbugs.gnu.org
Subject: Re: [bug#51914] Acknowledgement ([PATCH 0/2] Fix asdf-build-system
 on non-package inputs)
Date: Wed, 17 Nov 2021 11:36:02 +0100
Hi Pierre,

On Wed, 17 Nov 2021 at 10:01, Pierre Neidhardt <mail <at> ambrevar.xyz> wrote:

> +         ("https-everywhere"
> +          ,(let ((commit "78d3425aef62d79da2c63c0fcd89ae9837af9a09"))
> +             (origin
> +               (method git-fetch)
> +               (uri (git-reference
> +                     (url "https://github.com/EFForg/https-everywhere")
> +                     (commit commit)))
> +               (file-name (git-file-name "https-everywhere"
> +                                         (git-version "2021.7.13" "1" commit)))

Commit 78d3425aef62d79da2c63c0fcd89ae9837af9a09 the most recent on
master.  Is tag 2021.7.13 (commit 79252541) not enough?  Which is the
last release if I understand correctly?

Cheers,
simon




Information forwarded to guix-patches <at> gnu.org:
bug#51914; Package guix-patches. (Wed, 17 Nov 2021 11:10:01 GMT) Full text and rfc822 format available.

Message #20 received at 51914 <at> debbugs.gnu.org (full text, mbox):

From: Guillaume Le Vaillant <glv <at> posteo.net>
To: Pierre Neidhardt <mail <at> ambrevar.xyz>
Cc: 51914 <at> debbugs.gnu.org
Subject: Re: bug#51914: Acknowledgement ([PATCH 0/2] Fix asdf-build-system
 on non-package inputs)
Date: Wed, 17 Nov 2021 10:56:35 +0000
[Message part 1 (text/plain, inline)]
Pierre Neidhardt <mail <at> 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.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#51914; Package guix-patches. (Wed, 17 Nov 2021 12:41:02 GMT) Full text and rfc822 format available.

Message #23 received at 51914 <at> debbugs.gnu.org (full text, mbox):

From: Pierre Neidhardt <mail <at> ambrevar.xyz>
To: Guillaume Le Vaillant <glv <at> posteo.net>
Cc: 51914 <at> debbugs.gnu.org
Subject: Re: bug#51914: Acknowledgement ([PATCH 0/2] Fix asdf-build-system
 on non-package inputs)
Date: Wed, 17 Nov 2021 13:40:40 +0100
[Message part 1 (text/plain, inline)]
Thank you both for the feedback.
See v2 attached.
[signature.asc (application/pgp-signature, inline)]
[0001-build-system-asdf-Don-t-fail-in-sbcl-package-cl-sour.patch (text/x-patch, attachment)]
[0002-gnu-Add-cl-https-everywhere.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#51914; Package guix-patches. (Thu, 18 Nov 2021 07:58:01 GMT) Full text and rfc822 format available.

Message #26 received at 51914 <at> debbugs.gnu.org (full text, mbox):

From: Pierre Neidhardt <mail <at> ambrevar.xyz>
To: Guillaume Le Vaillant <glv <at> posteo.net>
Cc: 51914 <at> debbugs.gnu.org
Subject: Re: bug#51914: Acknowledgement ([PATCH 0/2] Fix asdf-build-system
 on non-package inputs)
Date: Thu, 18 Nov 2021 08:57:15 +0100
[Message part 1 (text/plain, inline)]
OK to merge then?
On master or staging?
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#51914; Package guix-patches. (Thu, 18 Nov 2021 10:08:01 GMT) Full text and rfc822 format available.

Message #29 received at 51914 <at> debbugs.gnu.org (full text, mbox):

From: Guillaume Le Vaillant <glv <at> posteo.net>
To: Pierre Neidhardt <mail <at> ambrevar.xyz>
Cc: 51914 <at> debbugs.gnu.org
Subject: Re: bug#51914: Acknowledgement ([PATCH 0/2] Fix asdf-build-system
 on non-package inputs)
Date: Thu, 18 Nov 2021 10:06:02 +0000
[Message part 1 (text/plain, inline)]
Pierre Neidhardt <mail <at> ambrevar.xyz> skribis:

> OK to merge then?
> On master or staging?

It think it should be OK on master.
[signature.asc (application/pgp-signature, inline)]

bug closed, send any further explanations to 51914 <at> debbugs.gnu.org and Pierre Neidhardt <mail <at> ambrevar.xyz> Request was from Pierre Neidhardt <mail <at> ambrevar.xyz> to control <at> debbugs.gnu.org. (Fri, 19 Nov 2021 10:11:02 GMT) Full text and rfc822 format available.

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 17 Dec 2021 12:24:08 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 92 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.