fromCabalLicense: don't return stringy licenses

jopejoe1 · jopejoe1 · commit 1a2e97ecc96e · 2025-10-19T02:07:43.000+02:00
diff --git a/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs b/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs
@@ -18,16 +18,16 @@ import Distribution.Version
 -- TODO: Programmatically strip trailing zeros from license version numbers.
 
 fromCabalLicense :: Distribution.License.License -> Distribution.Nixpkgs.License.License
-fromCabalLicense (GPL Nothing)                             = Unknown (Just "GPL")
+fromCabalLicense (GPL Nothing)                             = Known "lib.licenses.gpl2Plus"
 fromCabalLicense (GPL (Just (versionNumbers -> [2])))      = Known "lib.licenses.gpl2Only"
 fromCabalLicense (GPL (Just (versionNumbers -> [3])))      = Known "lib.licenses.gpl3Only"
 fromCabalLicense (GPL (Just (versionNumbers -> [3,0])))    = Known "lib.licenses.gpl3Only"
-fromCabalLicense (LGPL Nothing)                            = Unknown (Just "LGPL")
+fromCabalLicense (LGPL Nothing)                            = Known "lib.licenses.lgpl2Plus"
 fromCabalLicense (LGPL (Just (versionNumbers -> [2,1])))   = Known "lib.licenses.lgpl21Only"
 fromCabalLicense (LGPL (Just (versionNumbers -> [2])))     = Known "lib.licenses.lgpl2Only"
 fromCabalLicense (LGPL (Just (versionNumbers -> [3])))     = Known "lib.licenses.lgpl3Only"
 fromCabalLicense (LGPL (Just (versionNumbers -> [3,0])))   = Known "lib.licenses.lgpl3Only"
-fromCabalLicense (AGPL Nothing)                            = Unknown (Just "AGPL")
+fromCabalLicense (AGPL Nothing)                            = Known "lib.licenses.agpl3Plus"
 fromCabalLicense (AGPL (Just (versionNumbers -> [3])))     = Known "lib.licenses.agpl3Only"
 fromCabalLicense (AGPL (Just (versionNumbers -> [3,0])))   = Known "lib.licenses.agpl3Only"
 fromCabalLicense (MPL (versionNumbers ->  [2,0]))          = Known "lib.licenses.mpl20"
@@ -41,7 +41,7 @@ fromCabalLicense AllRightsReserved                         = Known "lib.licenses
 fromCabalLicense (Apache Nothing)                          = Known "lib.licenses.asl20"
 fromCabalLicense (Apache (Just (versionNumbers -> [2,0]))) = Known "lib.licenses.asl20"
 fromCabalLicense ISC                                       = Known "lib.licenses.isc"
-fromCabalLicense OtherLicense                              = Unknown Nothing
+fromCabalLicense OtherLicense                              = Known "lib.licenses.free"
 fromCabalLicense (UnknownLicense "CC0-1.0")                = Known "lib.licenses.cc0"
 fromCabalLicense (UnknownLicense "BSD3ClauseORApache20")   = Known "lib.licenses.bsd3"
 fromCabalLicense l                                         = error $ "Distribution.Nixpkgs.Haskell.FromCabal.License.fromCabalLicense: unknown license"
diff --git a/cabal2nix/test/golden-test-cases/HTF.nix.golden b/cabal2nix/test/golden-test-cases/HTF.nix.golden
@@ -27,6 +27,6 @@ mkDerivation {
   ];
   homepage = "https://github.com/skogsbaer/HTF/";
   description = "The Haskell Test Framework";
-  license = "LGPL";
+  license = lib.licenses.lgpl2Plus;
   mainProgram = "htfpp";
 }
diff --git a/cabal2nix/test/golden-test-cases/bioalign.nix.golden b/cabal2nix/test/golden-test-cases/bioalign.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base biocore bytestring ];
   homepage = "https://patch-tag.com/r/dfornika/biophd/home";
   description = "Data structures and helper functions for calculating alignments";
-  license = "GPL";
+  license = lib.licenses.gpl2Plus;
 }
diff --git a/cabal2nix/test/golden-test-cases/ede.nix.golden b/cabal2nix/test/golden-test-cases/ede.nix.golden
@@ -20,5 +20,5 @@ mkDerivation {
   ];
   homepage = "http://github.com/brendanhay/ede";
   description = "Templating language with similar syntax and features to Liquid or Jinja2";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-adexchange-buyer.nix.golden b/cabal2nix/test/golden-test-cases/gogol-adexchange-buyer.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google Ad Exchange Buyer SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-admin-emailmigration.nix.golden b/cabal2nix/test/golden-test-cases/gogol-admin-emailmigration.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google Email Migration API v2 SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-affiliates.nix.golden b/cabal2nix/test/golden-test-cases/gogol-affiliates.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google Affiliate Network SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-apps-tasks.nix.golden b/cabal2nix/test/golden-test-cases/gogol-apps-tasks.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google Tasks SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-appstate.nix.golden b/cabal2nix/test/golden-test-cases/gogol-appstate.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google App State SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-blogger.nix.golden b/cabal2nix/test/golden-test-cases/gogol-blogger.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google Blogger SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-datastore.nix.golden b/cabal2nix/test/golden-test-cases/gogol-datastore.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google Cloud Datastore SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-dfareporting.nix.golden b/cabal2nix/test/golden-test-cases/gogol-dfareporting.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google DCM/DFA Reporting And Trafficking SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-firebase-rules.nix.golden b/cabal2nix/test/golden-test-cases/gogol-firebase-rules.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google Firebase Rules SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-gmail.nix.golden b/cabal2nix/test/golden-test-cases/gogol-gmail.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google Gmail SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-kgsearch.nix.golden b/cabal2nix/test/golden-test-cases/gogol-kgsearch.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google Knowledge Graph Search SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-maps-engine.nix.golden b/cabal2nix/test/golden-test-cases/gogol-maps-engine.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google Maps Engine SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-plus.nix.golden b/cabal2nix/test/golden-test-cases/gogol-plus.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google + SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-resourceviews.nix.golden b/cabal2nix/test/golden-test-cases/gogol-resourceviews.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google Compute Engine Instance Groups SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-translate.nix.golden b/cabal2nix/test/golden-test-cases/gogol-translate.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google Translate SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-webmaster-tools.nix.golden b/cabal2nix/test/golden-test-cases/gogol-webmaster-tools.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google Search Console SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/gogol-youtube.nix.golden b/cabal2nix/test/golden-test-cases/gogol-youtube.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base gogol-core ];
   homepage = "https://github.com/brendanhay/gogol";
   description = "Google YouTube Data SDK";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/highlighting-kate.nix.golden b/cabal2nix/test/golden-test-cases/highlighting-kate.nix.golden
@@ -18,5 +18,5 @@ mkDerivation {
   ];
   homepage = "http://github.com/jgm/highlighting-kate";
   description = "Syntax highlighting";
-  license = "GPL";
+  license = lib.licenses.gpl2Plus;
 }
diff --git a/cabal2nix/test/golden-test-cases/hxt-expat.nix.golden b/cabal2nix/test/golden-test-cases/hxt-expat.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base bytestring hexpat hxt ];
   homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
   description = "Expat parser for HXT";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/hxt-tagsoup.nix.golden b/cabal2nix/test/golden-test-cases/hxt-tagsoup.nix.golden
@@ -10,5 +10,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/UweSchmidt/hxt";
   description = "TagSoup parser for HXT";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/incremental-parser.nix.golden b/cabal2nix/test/golden-test-cases/incremental-parser.nix.golden
@@ -14,5 +14,5 @@ mkDerivation {
   ];
   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;
 }
diff --git a/cabal2nix/test/golden-test-cases/lambdabot-social-plugins.nix.golden b/cabal2nix/test/golden-test-cases/lambdabot-social-plugins.nix.golden
@@ -10,5 +10,5 @@ mkDerivation {
   ];
   homepage = "https://wiki.haskell.org/Lambdabot";
   description = "Social plugins for Lambdabot";
-  license = "GPL";
+  license = lib.licenses.gpl2Plus;
 }
diff --git a/cabal2nix/test/golden-test-cases/openpgp-asciiarmor.nix.golden b/cabal2nix/test/golden-test-cases/openpgp-asciiarmor.nix.golden
@@ -14,5 +14,5 @@ mkDerivation {
   ];
   homepage = "http://floss.scru.org/openpgp-asciiarmor";
   description = "OpenPGP (RFC4880) ASCII Armor codec";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/polynomials-bernstein.nix.golden b/cabal2nix/test/golden-test-cases/polynomials-bernstein.nix.golden
@@ -5,5 +5,5 @@ mkDerivation {
   sha256 = "deadbeef";
   libraryHaskellDepends = [ base vector ];
   description = "A solver for systems of polynomial equations in bernstein form";
-  license = "GPL";
+  license = lib.licenses.gpl2Plus;
 }
diff --git a/cabal2nix/test/golden-test-cases/readline.nix.golden b/cabal2nix/test/golden-test-cases/readline.nix.golden
@@ -6,5 +6,5 @@ mkDerivation {
   libraryHaskellDepends = [ base process ];
   librarySystemDepends = [ ncurses readline ];
   description = "An interface to the GNU readline library";
-  license = "GPL";
+  license = lib.licenses.gpl2Plus;
 }
diff --git a/cabal2nix/test/golden-test-cases/swagger.nix.golden b/cabal2nix/test/golden-test-cases/swagger.nix.golden
@@ -10,5 +10,5 @@ mkDerivation {
   ];
   testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
   description = "Implementation of swagger data model";
-  license = "unknown";
+  license = lib.licenses.free;
 }
diff --git a/cabal2nix/test/golden-test-cases/texmath.nix.golden b/cabal2nix/test/golden-test-cases/texmath.nix.golden
@@ -17,5 +17,5 @@ mkDerivation {
   ];
   homepage = "http://github.com/jgm/texmath";
   description = "Conversion between formats used to represent mathematics";
-  license = "GPL";
+  license = lib.licenses.gpl2Plus;
 }
diff --git a/cabal2nix/test/golden-test-cases/vivid-supercollider.nix.golden b/cabal2nix/test/golden-test-cases/vivid-supercollider.nix.golden
@@ -13,5 +13,5 @@ mkDerivation {
     vivid-osc
   ];
   description = "Implementation of SuperCollider server specifications";
-  license = "GPL";
+  license = lib.licenses.gpl2Plus;
 }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ mkDerivation {`
`27`	`27`	`];`
`28`	`28`	`homepage = "https://github.com/skogsbaer/HTF/";`
`29`	`29`	`description = "The Haskell Test Framework";`
`30`		`- license = "LGPL";`
	`30`	`+ license = lib.licenses.lgpl2Plus;`
`31`	`31`	`mainProgram = "htfpp";`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ mkDerivation {`
`6`	`6`	`libraryHaskellDepends = [ base biocore bytestring ];`
`7`	`7`	`homepage = "https://patch-tag.com/r/dfornika/biophd/home";`
`8`	`8`	`description = "Data structures and helper functions for calculating alignments";`
`9`		`- license = "GPL";`
	`9`	`+ license = lib.licenses.gpl2Plus;`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@ mkDerivation {`
`20`	`20`	`];`
`21`	`21`	`homepage = "http://github.com/brendanhay/ede";`
`22`	`22`	`description = "Templating language with similar syntax and features to Liquid or Jinja2";`
`23`		`- license = "unknown";`
	`23`	`+ license = lib.licenses.free;`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ mkDerivation {`
`6`	`6`	`libraryHaskellDepends = [ base gogol-core ];`
`7`	`7`	`homepage = "https://github.com/brendanhay/gogol";`
`8`	`8`	`description = "Google Ad Exchange Buyer SDK";`
`9`		`- license = "unknown";`
	`9`	`+ license = lib.licenses.free;`
`10`	`10`	`}`