make parsed license to be less like tobe a stringy license #677
Conversation
cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs
Outdated
Show resolved
Hide resolved
|
|
||
| fromCabalLicense :: Distribution.License.License -> Distribution.Nixpkgs.License.License | ||
| fromCabalLicense (GPL Nothing) = Unknown (Just "GPL") | ||
| fromCabalLicense (GPL Nothing) = Known "lib.licenses.gpl2Plus" |
There was a problem hiding this comment.
These cases are intentional as there is not enough information to conclude what variant of the license in question is used.
There was a problem hiding this comment.
I do realize they were intentional, but they can't stay in their current form. I'm currently working towards disallowing stringy licenses in nixpkgs, and those are pretty much the only ones left. Other options would be to make it even less informational with lib.licenses.free or to add a new custom license (not really a fan of this).
There was a problem hiding this comment.
I looked at a few packages in more detail and I think we can reasonably do two things:
- interpret
GPLasgpl2Plusas done here. That's because they could have usedGPL-2orGPL-3if they wanted to be more specific. - just use
freeas fallback for this.
For me, both are fine.
cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs
Outdated
Show resolved
Hide resolved
cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs
Outdated
Show resolved
Hide resolved
Hackage requires open source licenses so this should always be a free license
| -- Not handed: the '+' suffix and user-defined licences references. | ||
| -- Use the SPDX expression as a free-form license string. | ||
| Unknown (Just $ DPretty.prettyShow simpl) | ||
| fromSPDXLicenseExpression (SPDX.ELicense simpl (Just excep)) = | ||
| case simpl of | ||
| SPDX.ELicenseId lid -> Known ("lib.licensesSpdx.\"" ++ DPretty.prettyShow lid ++ "\" lib.licensesSpdx.\"" ++ DPretty.prettyShow excep ++ "\"") | ||
| _ -> | ||
| -- Not handed: the '+' suffix and user-defined licences references. |
There was a problem hiding this comment.
| -- Not handed: the '+' suffix and user-defined licences references. | |
| -- Use the SPDX expression as a free-form license string. | |
| Unknown (Just $ DPretty.prettyShow simpl) | |
| fromSPDXLicenseExpression (SPDX.ELicense simpl (Just excep)) = | |
| case simpl of | |
| SPDX.ELicenseId lid -> Known ("lib.licensesSpdx.\"" ++ DPretty.prettyShow lid ++ "\" lib.licensesSpdx.\"" ++ DPretty.prettyShow excep ++ "\"") | |
| _ -> | |
| -- Not handed: the '+' suffix and user-defined licences references. | |
| -- Not handled: the '+' suffix and user-defined licences references. | |
| -- Use the SPDX expression as a free-form license string. | |
| Unknown (Just $ DPretty.prettyShow simpl) | |
| fromSPDXLicenseExpression (SPDX.ELicense simpl (Just excep)) = | |
| case simpl of | |
| SPDX.ELicenseId lid -> Known ("lib.licensesSpdx.\"" ++ DPretty.prettyShow lid ++ "\" lib.licensesSpdx.\"" ++ DPretty.prettyShow excep ++ "\"") | |
| _ -> | |
| -- Not handled: the '+' suffix and user-defined licences references. |
| homepage = "https://github.com/blamario/incremental-parser"; | ||
| description = "Generic parser library capable of providing partial results from partial input"; | ||
| license = "GPL"; | ||
| license = lib.licenses.gpl2Plus; |
There was a problem hiding this comment.
Upstream has changed to GPL-3 by now.
| homepage = "http://github.com/jgm/highlighting-kate"; | ||
| description = "Syntax highlighting"; | ||
| license = "GPL"; | ||
| license = lib.licenses.gpl2Plus; |
There was a problem hiding this comment.
Upstream still uses GPL, and has gpl2Only, I think: https://github.com/jgm/highlighting-kate/blob/master/LICENSE
| homepage = "https://github.com/skogsbaer/HTF/"; | ||
| description = "The Haskell Test Framework"; | ||
| license = "LGPL"; | ||
| license = lib.licenses.lgpl2Plus; |
There was a problem hiding this comment.
Upstream has now LGPL-2.1, which renders as LGPL-2.1-only on hackage.
| homepage = "https://wiki.haskell.org/Lambdabot"; | ||
| description = "Social plugins for Lambdabot"; | ||
| license = "GPL"; | ||
| license = lib.licenses.gpl2Plus; |
There was a problem hiding this comment.
lambdabot-social-plugins has GPL, but.. the license looks like BSD/MIT: https://github.com/lambdabot/lambdabot/blob/master/lambdabot-social-plugins/LICENSE
| homepage = "http://github.com/jgm/texmath"; | ||
| description = "Conversion between formats used to represent mathematics"; | ||
| license = "GPL"; | ||
| license = lib.licenses.gpl2Plus; |
There was a problem hiding this comment.
texmath has updated to GPL-2, which renders as GPL-2.0-only on hackage.
|
|
||
| fromCabalLicense :: Distribution.License.License -> Distribution.Nixpkgs.License.License | ||
| fromCabalLicense (GPL Nothing) = Unknown (Just "GPL") | ||
| fromCabalLicense (GPL Nothing) = Known "lib.licenses.gpl2Plus" |
There was a problem hiding this comment.
I looked at a few packages in more detail and I think we can reasonably do two things:
- interpret
GPLasgpl2Plusas done here. That's because they could have usedGPL-2orGPL-3if they wanted to be more specific. - just use
freeas fallback for this.
For me, both are fine.
3 participants
I'm working on removing all stringy licenses in nixpkgs, and currently the only ones left are the ones in haskellPackages and node2nix packages. This change fixes the ones for Haskell packages.