Skip to content

Commit 7a5af01

Browse files
jopejoe1sternenseemann
jopejoe1
authored and
sternenseemann
committed
fromSPDXLicense: make use of lib.licensesSpdx 
1 parent e7520e7 commit 7a5af01

File tree

2 files changed

+2
-102
lines changed

2 files changed

+2
-102
lines changed

‎cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs‎

Lines changed: 1 addition & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -53,107 +53,7 @@ fromSPDXLicense (SPDX.License expr) =
5353
SPDX.ELicense simpl Nothing ->
5454
-- Not handled: license exceptions
5555
case simpl of
56-
SPDX.ELicenseId lid ->
57-
case lid of
58-
SPDX.AFL_2_1 -> Known "lib.licenses.afl21"
59-
SPDX.AFL_3_0 -> Known "lib.licenses.afl3"
60-
SPDX.AGPL_3_0_only -> Known "lib.licenses.agpl3Only"
61-
SPDX.AGPL_3_0_or_later -> Known "lib.licenses.agpl3Plus"
62-
SPDX.APSL_2_0 -> Known "lib.licenses.apsl20"
63-
SPDX.Artistic_1_0 -> Known "lib.licenses.artistic1"
64-
SPDX.Artistic_2_0 -> Known "lib.licenses.artistic2"
65-
SPDX.Apache_2_0 -> Known "lib.licenses.asl20"
66-
SPDX.BSL_1_0 -> Known "lib.licenses.boost"
67-
SPDX.Beerware -> Known "lib.licenses.beerware"
68-
SPDX.NullBSD -> Known "lib.licenses.bsd0"
69-
SPDX.BSD_2_Clause -> Known "lib.licenses.bsd2"
70-
SPDX.BSD_3_Clause -> Known "lib.licenses.bsd3"
71-
SPDX.BSD_4_Clause -> Known "lib.licenses.bsdOriginal"
72-
SPDX.ClArtistic -> Known "lib.licenses.clArtistic"
73-
SPDX.CC0_1_0 -> Known "lib.licenses.cc0"
74-
SPDX.CC_BY_NC_SA_2_0 -> Known "lib.licenses.cc-by-nc-sa-20"
75-
SPDX.CC_BY_NC_SA_2_5 -> Known "lib.licenses.cc-by-nc-sa-25"
76-
SPDX.CC_BY_NC_SA_3_0 -> Known "lib.licenses.cc-by-nc-sa-30"
77-
SPDX.CC_BY_NC_SA_4_0 -> Known "lib.licenses.cc-by-nc-sa-40"
78-
SPDX.CC_BY_NC_4_0 -> Known "lib.licenses.cc-by-nc-40"
79-
SPDX.CC_BY_ND_3_0 -> Known "lib.licenses.cc-by-nd-30"
80-
SPDX.CC_BY_SA_2_5 -> Known "lib.licenses.cc-by-sa-25"
81-
SPDX.CC_BY_3_0 -> Known "lib.licenses.cc-by-30"
82-
SPDX.CC_BY_SA_3_0 -> Known "lib.licenses.cc-by-sa-30"
83-
SPDX.CC_BY_4_0 -> Known "lib.licenses.cc-by-40"
84-
SPDX.CC_BY_SA_4_0 -> Known "lib.licenses.cc-by-sa-40"
85-
SPDX.CDDL_1_0 -> Known "lib.licenses.cddl"
86-
SPDX.CECILL_2_0 -> Known "lib.licenses.cecill20"
87-
SPDX.CECILL_B -> Known "lib.licenses.cecill-b"
88-
SPDX.CECILL_C -> Known "lib.licenses.cecill-c"
89-
SPDX.CPAL_1_0 -> Known "lib.licenses.cpal10"
90-
SPDX.CPL_1_0 -> Known "lib.licenses.cpl10"
91-
SPDX.Curl -> Known "lib.licenses.curl"
92-
SPDX.DOC -> Known "lib.licenses.doc"
93-
SPDX.EFL_1_0 -> Known "lib.licenses.efl10"
94-
SPDX.EFL_2_0 -> Known "lib.licenses.efl20"
95-
SPDX.EPL_1_0 -> Known "lib.licenses.epl10"
96-
SPDX.EPL_2_0 -> Known "lib.licenses.epl20"
97-
SPDX.EUPL_1_1 -> Known "lib.licenses.eupl11"
98-
SPDX.GFDL_1_2_only -> Known "lib.licenses.fdl12Only"
99-
SPDX.GFDL_1_3_only -> Known "lib.licenses.fdl13Only"
100-
SPDX.GPL_1_0_only -> Known "lib.licenses.gpl1Only"
101-
SPDX.GPL_1_0_or_later -> Known "lib.licenses.gpl1Plus"
102-
SPDX.GPL_2_0_only -> Known "lib.licenses.gpl2Only"
103-
SPDX.GPL_2_0_or_later -> Known "lib.licenses.gpl2Plus"
104-
SPDX.GPL_3_0_only -> Known "lib.licenses.gpl3Only"
105-
SPDX.GPL_3_0_or_later -> Known "lib.licenses.gpl3Plus"
106-
SPDX.HPND -> Known "lib.licenses.hpnd"
107-
SPDX.IJG -> Known "lib.licenses.ijg"
108-
SPDX.ImageMagick -> Known "lib.licenses.imagemagick"
109-
SPDX.IPA -> Known "lib.licenses.ipa"
110-
SPDX.IPL_1_0 -> Known "lib.licenses.ipl10"
111-
SPDX.ISC -> Known "lib.licenses.isc"
112-
SPDX.LGPL_2_0_only -> Known "lib.licenses.lgpl2Only"
113-
SPDX.LGPL_2_0_or_later -> Known "lib.licenses.lgpl2Plus"
114-
SPDX.LGPL_2_1_only -> Known "lib.licenses.lgpl21Only"
115-
SPDX.LGPL_2_1_or_later -> Known "lib.licenses.lgpl21Plus"
116-
SPDX.LGPL_3_0_only -> Known "lib.licenses.lgpl3Only"
117-
SPDX.LGPL_3_0_or_later -> Known "lib.licenses.lgpl3Plus"
118-
SPDX.Libpng -> Known "lib.licenses.libpng"
119-
SPDX.Libtiff -> Known "lib.licenses.libtiff"
120-
SPDX.LPPL_1_2 -> Known "lib.licenses.lppl12"
121-
SPDX.LPPL_1_3c -> Known "lib.licenses.lppl13c"
122-
SPDX.LPL_1_02 -> Known "lib.licenses.lpl-102"
123-
SPDX.MIT -> Known "lib.licenses.mit"
124-
SPDX.MPL_1_0 -> Known "lib.licenses.mpl10"
125-
SPDX.MPL_1_1 -> Known "lib.licenses.mpl11"
126-
SPDX.MPL_2_0 -> Known "lib.licenses.mpl20"
127-
SPDX.MS_PL -> Known "lib.licenses.mspl"
128-
SPDX.NCSA -> Known "lib.licenses.ncsa"
129-
SPDX.NPOSL_3_0 -> Known "lib.licenses.nposl3"
130-
SPDX.OFL_1_1 -> Known "lib.licenses.ofl"
131-
SPDX.OLDAP_2_8 -> Known "lib.licenses.openldap"
132-
SPDX.OpenSSL -> Known "lib.licenses.openssl"
133-
SPDX.OSL_2_1 -> Known "lib.licenses.osl21"
134-
SPDX.OSL_3_0 -> Known "lib.licenses.osl3"
135-
SPDX.PHP_3_01 -> Known "lib.licenses.php201"
136-
SPDX.PostgreSQL -> Known "lib.licenses.postgresql"
137-
SPDX.Python_2_0 -> Known "lib.licenses.psfl"
138-
SPDX.QPL_1_0 -> Known "lib.licenses.qpl"
139-
SPDX.Ruby -> Known "lib.licenses.ruby"
140-
SPDX.Sendmail -> Known "lib.licenses.sendmail"
141-
SPDX.SGI_B_2_0 -> Known "lib.licenses.sgi-b-0"
142-
SPDX.Sleepycat -> Known "lib.licenses.sleepycat"
143-
SPDX.TCL -> Known "lib.licenses.tcltx"
144-
SPDX.Unlicense -> Known "lib.licenses.unlicense"
145-
SPDX.Vim -> Known "lib.licenses.vim"
146-
SPDX.VSL_1_0 -> Known "lib.licenses.vsl10"
147-
SPDX.Watcom_1_0 -> Known "lib.licenses.watcom"
148-
SPDX.W3C -> Known "lib.licenses.w3c"
149-
SPDX.WTFPL -> Known "lib.licenses.wtfpl"
150-
SPDX.Zlib -> Known "lib.licenses.zlib"
151-
SPDX.ZPL_2_0 -> Known "lib.licenses.zpl20"
152-
SPDX.ZPL_2_1 -> Known "lib.licenses.zpl21"
153-
_ ->
154-
-- Licence is not in Nixpkgs.
155-
-- Use the SPDX expression as a free-form license string.
156-
Unknown (Just $ prettyShow expr)
56+
SPDX.ELicenseId lid -> Known ("lib.licensesSpdx.\"" ++ prettyShow lid ++ "\"")
15757
_ ->
15858
-- Not handed: the '+' suffix and user-defined licences references.
15959
-- Use the SPDX expression as a free-form license string.

‎cabal2nix/test/golden-test-cases/pandoc.nix.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ mkDerivation {
4949
];
5050
homepage = "https://pandoc.org";
5151
description = "Conversion between markup formats";
52-
license = lib.licenses.gpl2Plus;
52+
license = lib.licensesSpdx."GPL-2.0-or-later";
5353
mainProgram = "pandoc";
5454
}

0 commit comments

Comments
 (0)