[bug#32933] [PATCH] guix: add license prefix hackage imports

[bug#32933] [PATCH] guix: add license prefix hackage imports

[Joe Hillenbrand]

---
 guix/import/hackage.scm | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 766a0b53f..8f4a46534 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -35,6 +35,7 @@
   #:use-module (guix store)
   #:use-module (gcrypt hash)
   #:use-module (guix base32)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix memoization)
   #:use-module (guix upstream)
   #:use-module (guix packages)
@@ -135,20 +136,21 @@ version."
   ;; https://www.haskell.org
   ;; /cabal/release/cabal-latest/doc/API/Cabal/Distribution-License.html.
   (match-lambda
-   ("GPL-2" 'gpl2)
-   ("GPL-3" 'gpl3)
-   ("GPL" "'gpl??")
-   ("AGPL-3" 'agpl3)
-   ("AGPL" "'agpl??")
-   ("LGPL-2.1" 'lgpl2.1)
-   ("LGPL-3" 'lgpl3)
-   ("LGPL" "'lgpl??")
-   ("BSD2" 'bsd-2)
-   ("BSD3" 'bsd-3)
-   ("MIT" 'expat)
-   ("ISC" 'isc)
-   ("MPL" 'mpl2.0)
-   ("Apache-2.0" 'asl2.0)
+   ("GPL-2" 'license:gpl2)
+   ("GPL-3" 'license:gpl3)
+   ("GPL" 'license:gpl??)
+   ("AGPL-3" 'license:agpl3)
+   ("AGPL" 'license:agpl)
+   ("LGPL-2.0" 'license:lgpl2.0)
+   ("LGPL-2.1" 'license:lgpl2.1)
+   ("LGPL-3" 'license:lgpl3)
+   ("LGPL" 'license:lgpl??)
+   ("BSD2" 'license:bsd-2)
+   ("BSD3" 'license:bsd-3)
+   ("MIT" 'license:expat)
+   ("ISC" 'license:isc)
+   ("MPL" 'license:mpl2.0)
+   ("Apache-2.0" 'license:asl2.0)
    ((x) (string->license x))
    ((lst ...) `(list ,@(map string->license lst)))
    (_ #f)))
--
2.19.0

[bug#32933] [PATCH] guix: add license prefix hackage imports

[Ludovic Courtès]

Hi Joe,

Joe Hillenbrand <joehillen@gmail.com> skribis:

> ---
>  guix/import/hackage.scm | 30 ++++++++++++++++--------------
>  1 file changed, 16 insertions(+), 14 deletions(-)
>
> diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
> index 766a0b53f..8f4a46534 100644

[...]

> +   ("GPL-2" 'license:gpl2)

No strong opinion, but apparently none of the importers currently adds
the ‘license:’ prefix and I’d rather keep that consistent, one way or
another.

Ricardo, WDYT?

Thanks for the patch!

Ludo’.

[bug#32933] [PATCH] guix: add license prefix hackage imports

[Joe Hillenbrand]

Sorry, I meant to add justification in the commit message, but apparently I
forgot.

The motivation was to be consistent with the `gnu/packages/haskell.scm` which
uses the `license:` prefix. I noticed this when I imported a bunch of packages
and all of them were missing the prefix, which then had to be manually added.

On Fri, Oct 12, 2018 at 6:17 AM Ludovic Courtès <ludo@gnu.org> wrote:
>
> No strong opinion, but apparently none of the importers currently adds
> the ‘license:’ prefix and I’d rather keep that consistent, one way or
> another.

That's not entirely true. crate calls `spdx-string->license` which adds the
prefix, but it doesn't appear to actually work because it looks for the license
in the wrong part of the json output from crates.io.

I'd be happy to add it to the other importers as it looks like almost all of
`gnu/packages/*.scm` has the `license:` prefix. If so, should I do them all
in a new patch?

Thanks,
Joe

[bug#32933] [PATCH] guix: add license prefix hackage imports

[Ricardo Wurmus]

Hi Joe,

> The motivation was to be consistent with the `gnu/packages/haskell.scm` which
> uses the `license:` prefix. I noticed this when I imported a bunch of packages
> and all of them were missing the prefix, which then had to be manually added.
>
> On Fri, Oct 12, 2018 at 6:17 AM Ludovic Courtès <ludo@gnu.org> wrote:
>>
>> No strong opinion, but apparently none of the importers currently adds
>> the ‘license:’ prefix and I’d rather keep that consistent, one way or
>> another.
>
> That's not entirely true. crate calls `spdx-string->license` which adds the
> prefix, but it doesn't appear to actually work because it looks for the license
> in the wrong part of the json output from crates.io.

I have a slight preference to not adding the prefix.  It is true that
most modules do use this prefix, but I think the importers should be
agnostic of that.  Some modules don’t use this prefix (e.g. web.scm) or
no prefix at all (especially user modules that don’t exist yet).

I’d rather have the importers be more flexible and do the right thing
dependent on context, but I have no good idea how to accomplish this
considering that they are used outside of any context (unless they were
called as part of an updater).

--
Ricardo

[bug#32933] [PATCH] guix: add license prefix hackage imports

[Ludovic Courtès]

Hello,

Ricardo Wurmus <rekado@elephly.net> skribis:

>> The motivation was to be consistent with the `gnu/packages/haskell.scm` which
>> uses the `license:` prefix. I noticed this when I imported a bunch of packages
>> and all of them were missing the prefix, which then had to be manually added.
>>
>> On Fri, Oct 12, 2018 at 6:17 AM Ludovic Courtès <ludo@gnu.org> wrote:
>>>
>>> No strong opinion, but apparently none of the importers currently adds
>>> the ‘license:’ prefix and I’d rather keep that consistent, one way or
>>> another.
>>
>> That's not entirely true. crate calls `spdx-string->license` which adds the
>> prefix, but it doesn't appear to actually work because it looks for the license
>> in the wrong part of the json output from crates.io.
>
> I have a slight preference to not adding the prefix.  It is true that
> most modules do use this prefix, but I think the importers should be
> agnostic of that.  Some modules don’t use this prefix (e.g. web.scm) or
> no prefix at all (especially user modules that don’t exist yet).
>
> I’d rather have the importers be more flexible and do the right thing
> dependent on context, but I have no good idea how to accomplish this
> considering that they are used outside of any context (unless they were
> called as part of an updater).

Right, I sort of feel along the same lines.

OTOH, the goal of ‘guix import’ is to provide templates as close as
possible to working package definitions.  In that sense, if adding the
‘license:’ prefix lowers the barrier a little bit (and it certainly
does, as Joe wrote), the better.

For the sake of consistency though, it may be best to do it for all the
importers, if we were to take that route.

WDYT, Ricardo?

Thanks,
Ludo’.

[bug#32933] [PATCH] guix: add license prefix hackage imports

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

> OTOH, the goal of ‘guix import’ is to provide templates as close as
> possible to working package definitions.  In that sense, if adding the
> ‘license:’ prefix lowers the barrier a little bit (and it certainly
> does, as Joe wrote), the better.
>
> For the sake of consistency though, it may be best to do it for all the
> importers, if we were to take that route.

Adding the same prefix to all importers sounds good to me.

--
Ricardo

[bug#32933] [PATCH] guix: add license prefix hackage imports

[Joe Hillenbrand]

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]

On Mon, Oct 15, 2018, 02:49 Ricardo Wurmus <rekado@elephly.net> wrote:

>
> Ludovic Courtès <ludo@gnu.org> writes:
> >
> > For the sake of consistency though, it may be best to do it for all the
> > importers, if we were to take that route.
>
> Adding the same prefix to all importers sounds good to me.
>

Should I create a patch for each importer or do them all in one patch?

>

[-- Attachment #2: Type: text/html, Size: 946 bytes --]

[bug#32933] [PATCH] guix: add license prefix hackage imports

[Ricardo Wurmus]

Joe Hillenbrand <joehillen@gmail.com> writes:

> On Mon, Oct 15, 2018, 02:49 Ricardo Wurmus <rekado@elephly.net> wrote:
>
>>
>> Ludovic Courtès <ludo@gnu.org> writes:
>> >
>> > For the sake of consistency though, it may be best to do it for all the
>> > importers, if we were to take that route.
>>
>> Adding the same prefix to all importers sounds good to me.
>>
>
> Should I create a patch for each importer or do them all in one patch?

Either way is fine.  If you create one patch for all importers please
make sure to list all the changes to the different files explicitly in
the commit summary.

Thank you!

--
Ricardo

bug#32933: [PATCH] guix: add license prefix hackage imports

[Xinglu Chen]

[-- Attachment #1: Type: text/plain, Size: 76 bytes --]

This was done in commit cfec09a9928e171a724f630ba652ea0241d52e92.

Closing!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]