GNU bug report logs - #37402
[PATCH 0/4] Updates for git-annex

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 37402 in the body.
You can then email your comments to 37402 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: guix-patches <at> gnu.org
Cc: Kyle Meyer <kyle <at> kyleam.com>
Subject: [PATCH 0/4] Updates for git-annex
Date: Sat, 14 Sep 2019 02:08:40 -0400

This series makes the following updates to the git-annex package:

  * update the license field for upstream changes

  * build with MagicMime support (allows for using MIME-based conditions in
    .gitattributes expressions for annex.largefiles)

  * updates to the latest version

 gnu/packages/haskell-apps.scm | 18 +++++++++++++-----
 gnu/packages/haskell-xyz.scm  | 23 +++++++++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)

-- 
2.23.0

Message #8 received at 37402 <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: 37402 <at> debbugs.gnu.org
Cc: Kyle Meyer <kyle <at> kyleam.com>
Subject: [PATCH 1/4] gnu: git-annex: Update license.
Date: Sat, 14 Sep 2019 02:15:31 -0400

* gnu/packages/haskell-apps.scm (git-annex)[license]: Update main license to
AGPLv3+ and include other licenses mentioned in the package's COPYRIGHT file.
---
 gnu/packages/haskell-apps.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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 @@ (define-public git-annex
 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
-- 
2.23.0

Message #11 received at 37402 <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: 37402 <at> debbugs.gnu.org
Cc: Kyle Meyer <kyle <at> kyleam.com>
Subject: [PATCH 2/4] gnu: Add ghc-magic.
Date: Sat, 14 Sep 2019 02:15:32 -0400

* gnu/packages/haskell-xyz.scm (ghc-magic): New variable.
---
 gnu/packages/haskell-xyz.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index ee26c1a25a..4313b6059e 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2019 Robert Vollmert <rob <at> vllmrt.net>
 ;;; Copyright © 2019 Jacob MacDonald <jaccarmac <at> gmail.com>
 ;;; Copyright © 2019 John Soo <jsoo1 <at> asu.edu>
+;;; Copyright © 2019 Kyle Meyer <kyle <at> kyleam.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5954,6 +5955,28 @@ (define-public ghc-lzma-conduit
 compression algorithm used in the @code{.xz} file format.")
     (license license:bsd-3)))
 
+(define-public ghc-magic
+  (package
+    (name "ghc-magic")
+    (version "1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://hackage.haskell.org/package/magic/magic-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "10p0gjjjwr1dda7hahwrwn5njbfhl67arq3v3nf1jr3vymlkn75j"))))
+    (build-system haskell-build-system)
+    (home-page "http://hackage.haskell.org/package/magic")
+    (synopsis "Interface to C file/magic library")
+    (description
+     "This package provides a full-featured binding to the C libmagic library.
+With it, you can determine the type of a file by examining its contents rather
+than its name.")
+    (license license:bsd-3)))
+
 (define-public ghc-markdown-unlit
   (package
     (name "ghc-markdown-unlit")
-- 
2.23.0

Message #14 received at 37402 <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: 37402 <at> debbugs.gnu.org
Cc: Kyle Meyer <kyle <at> kyleam.com>
Subject: [PATCH 3/4] gnu: git-annex: Build with MagicMime support.
Date: Sat, 14 Sep 2019 02:15:33 -0400

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.
---
 gnu/packages/haskell-apps.scm | 1 +
 1 file changed, 1 insertion(+)

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 @@ (define-public git-annex
        ("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)
-- 
2.23.0

Message #17 received at 37402 <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: 37402 <at> debbugs.gnu.org
Cc: Kyle Meyer <kyle <at> kyleam.com>
Subject: [PATCH 4/4] gnu: git-annex: Update to 7.20190912.
Date: Sat, 14 Sep 2019 02:15:34 -0400

* gnu/packages/haskell-apps.scm (git-annex): Update 7.20190912.
---
 gnu/packages/haskell-apps.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 @@ (define-public darcs
 (define-public git-annex
   (package
     (name "git-annex")
-    (version "7.20190708")
+    (version "7.20190912")
     (source
      (origin
        (method url-fetch)
@@ -253,7 +253,7 @@ (define-public git-annex
                            "git-annex/git-annex-" version ".tar.gz"))
        (sha256
         (base32
-         "18s563swrp8mx479995pdhhmn40y3xwlbm1z3w63qsnjqmj7zlij"))))
+         "1a3jvl5cx32v78s3015i10cx00jprm1391rpww4mzkk1vskzn9cv"))))
     (build-system haskell-build-system)
     (arguments
      `(#:configure-flags
-- 
2.23.0

Message #22 received at 37402-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Kyle Meyer <kyle <at> kyleam.com>
Cc: 37402-done <at> debbugs.gnu.org
Subject: Re: [bug#37402] [PATCH 0/4] Updates for git-annex
Date: Mon, 16 Sep 2019 10:49:07 +0200

Hello Kyle,

Kyle Meyer <kyle <at> kyleam.com> skribis:

> This series makes the following updates to the git-annex package:
>
>   * update the license field for upstream changes
>
>   * build with MagicMime support (allows for using MIME-based conditions in
>     .gitattributes expressions for annex.largefiles)
>
>   * updates to the latest version
>
>  gnu/packages/haskell-apps.scm | 18 +++++++++++++-----
>  gnu/packages/haskell-xyz.scm  | 23 +++++++++++++++++++++++
>  2 files changed, 36 insertions(+), 5 deletions(-)

Applied, thanks!

Ludo’.

Message #25 received at 37402-done <at> debbugs.gnu.org (full text, mbox):

From: Kyle Meyer <kyle <at> kyleam.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 37402-done <at> debbugs.gnu.org
Subject: Re: [bug#37402] [PATCH 0/4] Updates for git-annex
Date: Mon, 16 Sep 2019 11:21:28 -0400

Ludovic Courtès <ludo <at> gnu.org> writes:

>>  gnu/packages/haskell-apps.scm | 18 +++++++++++++-----
>>  gnu/packages/haskell-xyz.scm  | 23 +++++++++++++++++++++++
>>  2 files changed, 36 insertions(+), 5 deletions(-)
>
> Applied, thanks!

Thank you!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.