Commit 774d76d8 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

Merge pull request #1739 from ianbollinger/init-licenses

Add missing Cabal init licenses
parents ba8b8a9f dca0d9ba
......@@ -67,7 +67,7 @@ import Language.Haskell.Extension ( Language(..) )
import Distribution.Client.Init.Types
( InitFlags(..), PackageType(..), Category(..) )
import Distribution.Client.Init.Licenses
( bsd2, bsd3, gplv2, gplv3, lgpl2, lgpl3, agplv3, apache20, mpl20 )
( bsd2, bsd3, gplv2, gplv3, lgpl21, lgpl3, agplv3, apache20, mit, mpl20 )
import Distribution.Client.Init.Heuristics
( guessPackageName, guessAuthorNameMail, SourceFileEntry(..),
scanForModules, neededBuildPrograms )
......@@ -550,8 +550,8 @@ writeLicense flags = do
Flag (GPL (Just (Version {versionBranch = [3]})))
-> Just gplv3
Flag (LGPL (Just (Version {versionBranch = [2]})))
-> Just lgpl2
Flag (LGPL (Just (Version {versionBranch = [2, 1]})))
-> Just lgpl21
Flag (LGPL (Just (Version {versionBranch = [3]})))
-> Just lgpl3
......@@ -562,6 +562,9 @@ writeLicense flags = do
Flag (Apache (Just (Version {versionBranch = [2, 0]})))
-> Just apache20
Flag MIT
-> Just $ mit authors year
Flag (MPL (Version {versionBranch = [2, 0]}))
-> Just mpl20
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment