git.iko.soy/typeable/cabal2nix
on master help sign in
Recognize the unknown "BSD3ClauseORApache20" license.
commite9ffc2beaa7337abdef03cfe4c5e001a84fcff86 authorPeter Simons <simons@cryp.to> dateSun 12 Aug 2018, 11:44 (8 years ago) parent5e5293d
1 file changed+1
src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs+1
src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs+1
@@ -36,5 +36,6 @@ fromCabalLicense (Apache (Just (versionNumbers -> [2,0]))) = Known "stdenv.lib.l
3636fromCabalLicense ISC = Known "stdenv.lib.licenses.isc"
3737fromCabalLicense OtherLicense = Unknown Nothing
3838fromCabalLicense (UnknownLicense "CC0-1.0") = Known "stdenv.lib.licenses.cc0"
39+fromCabalLicense (UnknownLicense "BSD3ClauseORApache20") = Known "stdenv.lib.licenses.bsd3"
3940fromCabalLicense l = error $ "Distribution.Nixpkgs.Haskell.FromCabal.License.fromCabalLicense: unknown license"
4041 ++ show l ++"\nChoose one of: " ++ intercalate ", " (map display knownLicenses)