diff options
author | Joey Hess <joeyh@joeyh.name> | 2020-01-02 12:34:10 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2020-01-02 12:42:57 -0400 |
commit | 9df8a6eb9405dde4464d27133c04f5ee539a85de (patch) | |
tree | 8a7ac5f52be8679f8a2525515a0b2c1b715c99ad /git-repair.cabal | |
parent | 16022a8b98f4bc134542e78a42538364d2f97d92 (diff) | |
download | git-repair-9df8a6eb9405dde4464d27133c04f5ee539a85de.tar.gz |
merge from git-annex and relicense accordingly
Merge git library and utility from git-annex. The former is now relicensed
AGPL, so git-repair as a whole becomes AGPL.
For simplicity, I am relicensing the remainder of the code in git-repair
AGPL as well, per the header changes in this commit. While that code is
also technically available under the GPL license, as it's been released
under that license before, changes going forward will be only released by
me under the AGPL.
Diffstat (limited to 'git-repair.cabal')
-rw-r--r-- | git-repair.cabal | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/git-repair.cabal b/git-repair.cabal index cff316f..f273cb3 100644 --- a/git-repair.cabal +++ b/git-repair.cabal @@ -1,12 +1,12 @@ Name: git-repair -Version: 1.20170626 +Version: 1.20200102 Cabal-Version: >= 1.8 -License: GPL +License: AGPL-3 Maintainer: Joey Hess <joey@kitenet.net> Author: Joey Hess Stability: Stable Copyright: 2013 Joey Hess -License-File: GPL +License-File: COPYRIGHT Build-Type: Custom Homepage: http://git-repair.branchable.com/ Category: Utility @@ -25,13 +25,10 @@ Extra-Source-Files: TODO git-repair.1 -Flag network-uri - Description: Get Network.URI from the network-uri package - Default: True - custom-setup - Setup-Depends: base (>= 4.5), hslogger, split, unix-compat, process, - unix, filepath, exceptions, bytestring, directory, IfElse, data-default, + Setup-Depends: base (>= 4.11.1.0 && < 5.0), + hslogger, split, unix-compat, process, unix, filepath, + exceptions, bytestring, directory, IfElse, data-default, mtl, Cabal source-repository head @@ -41,21 +38,19 @@ source-repository head Executable git-repair Main-Is: git-repair.hs GHC-Options: -threaded -Wall -fno-warn-tabs + Extensions: LambdaCase Build-Depends: split, hslogger, directory, filepath, containers, mtl, - unix-compat, bytestring, exceptions (>= 0.6), transformers, - base >= 4.5, base < 5, IfElse, text, process, time, QuickCheck, - utf8-string, async, optparse-applicative (>= 0.10.0), - data-default - - if flag(network-uri) - Build-Depends: network-uri (>= 2.6), network (>= 2.6) - else - Build-Depends: network (< 2.6), network (>= 2.0) + unix-compat (>= 0.5), bytestring, exceptions (>= 0.6), transformers, + base (>= 4.11.1.0 && < 5.0), IfElse, text, process, time, QuickCheck, + utf8-string, async, optparse-applicative (>= 0.14.1), + data-default, deepseq, attoparsec, + network-uri (>= 2.6), network (>= 2.6), + filepath-bytestring (>= 1.4.2.1.0) if (os(windows)) Build-Depends: setenv else - Build-Depends: unix + Build-Depends: unix (>= 2.7.2) Other-Modules: BuildInfo @@ -76,6 +71,7 @@ Executable git-repair Git.FilePath Git.Filename Git.Fsck + Git.HashObject Git.Index Git.LsFiles Git.LsTree @@ -89,6 +85,7 @@ Executable git-repair Git.UpdateIndex Git.Url Git.Version + Utility.Attoparsec Utility.Applicative Utility.Batch Utility.CoProcess @@ -97,6 +94,8 @@ Executable git-repair Utility.Directory Utility.DottedVersion Utility.Env + Utility.Env.Basic + Utility.Env.Set Utility.Exception Utility.FileMode Utility.FileSize @@ -110,7 +109,6 @@ Executable git-repair Utility.PartialPrelude Utility.Path Utility.Percentage - Utility.PosixFiles Utility.Process Utility.Process.Shim Utility.QuickCheck @@ -120,5 +118,6 @@ Executable git-repair Utility.SystemDirectory Utility.ThreadScheduler Utility.Tmp + Utility.Tmp.Dir Utility.Tuple Utility.UserInfo |