git.iko.soy/typeable/cabal2nix
on master help sign in
Recognize gpl-3.0 license version as well as gpl-3.
commitd82133a6b4b78d0891c8625e64453624f19ded1a authorPeter Simons <simons@cryp.to> dateThu 9 Feb 2017, 11:20 (10 years ago) parent05c4803
1 file changed+4
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs+4
src/Distribution/Nixpkgs/Haskell/FromCabal/License.hs+4
@@ -4,14 +4,18 @@ import Distribution.Nixpkgs.License
44import Distribution.License ( License(..) )
55import Data.Version
66
7+-- TODO: Programatically strip trailing zeros from license version numbers.
8+
79fromCabalLicense :: Distribution.License.License -> Distribution.Nixpkgs.License.License
810fromCabalLicense (GPL Nothing) = Unknown (Just "GPL")
911fromCabalLicense (GPL (Just (Version [2] []))) = Known "stdenv.lib.licenses.gpl2"
1012fromCabalLicense (GPL (Just (Version [3] []))) = Known "stdenv.lib.licenses.gpl3"
13+fromCabalLicense (GPL (Just (Version [3,0] []))) = Known "stdenv.lib.licenses.gpl3"
1114fromCabalLicense (LGPL Nothing) = Unknown (Just "LGPL")
1215fromCabalLicense (LGPL (Just (Version [2,1] []))) = Known "stdenv.lib.licenses.lgpl21"
1316fromCabalLicense (LGPL (Just (Version [2] []))) = Known "stdenv.lib.licenses.lgpl2"
1417fromCabalLicense (LGPL (Just (Version [3] []))) = Known "stdenv.lib.licenses.lgpl3"
18+fromCabalLicense (LGPL (Just (Version [3,0] []))) = Known "stdenv.lib.licenses.lgpl3"
1519fromCabalLicense (AGPL Nothing) = Unknown (Just "AGPL")
1620fromCabalLicense (AGPL (Just (Version [3] []))) = Known "stdenv.lib.licenses.agpl3"
1721fromCabalLicense (AGPL (Just (Version [3,0] []))) = Known "stdenv.lib.licenses.agpl3"