GNU bug report logs - #76220
[PATCH] import/npm-binary: Handle vector of licenses.

Previous Next

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

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

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

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: guix-patches <at> gnu.org
Subject: [PATCH] import/npm-binary: Handle vector of licenses.
Date: Wed, 12 Feb 2025 01:03:10 +0100

I stumbled on this with the import of stream-spec.  I don't know
however if that only happens for very old packages because they
weren't aligned with current practises.

* guix/import/npm-binary.scm (<package-revision>)[license]: Handle the
case where a vector of licenses is used.
---
 guix/import/npm-binary.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/guix/import/npm-binary.scm b/guix/import/npm-binary.scm
index 92ac7d338e..bc5fd2d5d6 100644
--- a/guix/import/npm-binary.scm
+++ b/guix/import/npm-binary.scm
@@ -103,7 +103,17 @@ (define-json-mapping <package-revision> make-package-revision package-revision?
               (match (assoc "type" alist)
                 ((_ . (? string? type))
                  (spdx-string->license type))
-                (_ #f)))))
+                (_ #f)))
+             ((? vector? vector)
+              (match (filter-map
+                      (match-lambda
+                        ((? string? str) (spdx-string->license str))
+                        (_ #f))
+                      (vector->list vector))
+                ((license rest ...)
+                 (cons* license rest))
+                ((license)
+                 license)))))
   (description package-revision-description             ;string
                "description" empty-or-string)
   (dist package-revision-dist "dist" json->dist))       ;dist
-- 
2.48.1



-- 
Best regards,
Nicolas Graves

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 76220 <at> debbugs.gnu.org
Subject: Re: [bug#76220] [PATCH] import/npm-binary: Handle vector of licenses.
Date: Tue, 18 Feb 2025 18:09:28 +0100

Hello,

Nicolas Graves <ngraves <at> ngraves.fr> skribis:

> I stumbled on this with the import of stream-spec.  I don't know
> however if that only happens for very old packages because they
> weren't aligned with current practises.
>
> * guix/import/npm-binary.scm (<package-revision>)[license]: Handle the
> case where a vector of licenses is used.

Could you add a test case so it doesn’t come back to haunt us?

Thanks,
Ludo’.

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 76220 <at> debbugs.gnu.org
Subject: Re: [bug#76220] [PATCH] import/npm-binary: Handle vector of licenses.
Date: Sat, 08 Mar 2025 17:43:58 +0100

Ludovic Courtès <ludo <at> gnu.org> skribis:

> Nicolas Graves <ngraves <at> ngraves.fr> skribis:
>
>> I stumbled on this with the import of stream-spec.  I don't know
>> however if that only happens for very old packages because they
>> weren't aligned with current practises.
>>
>> * guix/import/npm-binary.scm (<package-revision>)[license]: Handle the
>> case where a vector of licenses is used.
>
> Could you add a test case so it doesn’t come back to haunt us?

Kind reminder.  :-)

Ludo'.

Previous Next

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