Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
774d76d8
Commit
774d76d8
authored
Mar 30, 2014
by
Mikhail Glushenkov
Browse files
Merge pull request #1739 from ianbollinger/init-licenses
Add missing Cabal init licenses
parents
ba8b8a9f
dca0d9ba
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/Init.hs
View file @
774d76d8
...
...
@@ -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
,
lgpl2
1
,
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
lgpl2
1
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
...
...
cabal-install/Distribution/Client/Init/Licenses.hs
View file @
774d76d8
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment