diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 16:17:20 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 16:27:15 +0200 |
| commit | 9ff87bb99614923fa3336ab4bbf22e3444709b48 (patch) | |
| tree | fa169a6cc0fdc8d92bb4c4a4f265afc2ba29a890 /gnu/packages/haskell-apps.scm | |
| parent | ae71bef532d6b1c9d1481a3ac65827f148b1e45b (diff) | |
| parent | 9e8e252026f558933bdd9cfc26a75d13954b3e8e (diff) | |
| download | guix-9ff87bb99614923fa3336ab4bbf22e3444709b48.tar guix-9ff87bb99614923fa3336ab4bbf22e3444709b48.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/haskell-apps.scm')
| -rw-r--r-- | gnu/packages/haskell-apps.scm | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 5cd6549c27..e09285d63a 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -245,7 +245,7 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. (define-public git-annex (package (name "git-annex") - (version "7.20190708") + (version "7.20190912") (source (origin (method url-fetch) @@ -253,7 +253,7 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. "git-annex/git-annex-" version ".tar.gz")) (sha256 (base32 - "18s563swrp8mx479995pdhhmn40y3xwlbm1z3w63qsnjqmj7zlij")))) + "1a3jvl5cx32v78s3015i10cx00jprm1391rpww4mzkk1vskzn9cv")))) (build-system haskell-build-system) (arguments `(#:configure-flags @@ -337,6 +337,7 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. ("ghc-http-conduit" ,ghc-http-conduit) ("ghc-http-types" ,ghc-http-types) ("ghc-ifelse" ,ghc-ifelse) + ("ghc-magic" ,ghc-magic) ("ghc-memory" ,ghc-memory) ("ghc-monad-control" ,ghc-monad-control) ("ghc-monad-logger" ,ghc-monad-logger) @@ -374,9 +375,16 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. checking the file contents into Git. It can store files in many places, such as local hard drives and cloud storage services. It can also be used to keep a folder in sync between computers.") - ;; The web app is released under the AGPLv3+. - (license (list license:gpl3+ - license:agpl3+)))) + ;; The main author has released all his changes under AGPLv3+ as of March + ;; 2019 (7.20190219-187-g40ecf58d4). These are also licensed under the + ;; original GPLv3+ license, but going forward new changes will be under + ;; only AGPLv3+. The other licenses below cover code written by others. + ;; See git-annex's COPYRIGHT file for details on each file. + (license (list license:agpl3+ + license:gpl3+ + license:bsd-2 + license:expat + license:gpl2)))) (define-public hlint (package |