From 7e772cb66d050b86b6dde97bc97d09e708e01714 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 14 Sep 2019 02:15:31 -0400 Subject: gnu: git-annex: Update license. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell-apps.scm (git-annex)[license]: Update main license to AGPLv3+ and include other licenses mentioned in the package's COPYRIGHT file. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell-apps.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu/packages/haskell-apps.scm') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 5cd6549c27..8c4048aa66 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -374,9 +374,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 -- cgit v1.2.3 From f2a3ff859119a81c6d302c552d404bf0462b09e3 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 14 Sep 2019 02:15:33 -0400 Subject: gnu: git-annex: Build with MagicMime support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-annex has a mechanism for configuring whether a file is added to the annex or stored in git. Building with MagicMime support makes it possible to condition the behavior on a file's MIME type. * gnu/packages/haskell-apps.scm (git-annex)[inputs]: Add ghc-magic. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell-apps.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/haskell-apps.scm') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 8c4048aa66..1341994e60 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -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) -- cgit v1.2.3 From 1ece099d5cfdf344e239b28b58515545931a8a60 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 14 Sep 2019 02:15:34 -0400 Subject: gnu: git-annex: Update to 7.20190912. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell-apps.scm (git-annex): Update 7.20190912. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/haskell-apps.scm') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 1341994e60..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 -- cgit v1.2.3