From 3f42842792a85214fa7dcd5376e59a772b5aa7fd Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Mon, 2 Sep 2019 17:28:31 -0400
Subject: git-annex-latest: Rework for upstream fixes

The patch issue has been fixed as of 3d45d8f14b (gnu: git-annex: Don't
patch shebang used in hooks., 2019-07-21).  I'll keep a custom package
here at least until I get around to adding ghc-magic to the upstream
package.
---
 km-packages/git-annex.scm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/km-packages/git-annex.scm b/km-packages/git-annex.scm
index 89031ae..e961994 100644
--- a/km-packages/git-annex.scm
+++ b/km-packages/git-annex.scm
@@ -101,12 +101,11 @@ full-featured binding.")
                 ("ghc-magic" ,ghc-magic)
                 ,@(package-inputs git-annex))))))
 
-;; The package in Guix has an outstanding issue with shebangs in
-;; hooks.
-(define-public git-annex-latest
+;; Upstream doesn't use ghc-magic yet.
+(define-public km-git-annex
   (package
     (inherit git-annex)
-    (name "git-annex-latest")
+    (name "km-git-annex")
     (version "7.20190730")
     (source
      (origin
@@ -121,10 +120,8 @@ full-featured binding.")
        ,@(substitute-keyword-arguments (package-arguments git-annex)
            ((#:phases phases)
             `(modify-phases ,phases
-               (delete 'check)
-               (delete 'patch-shell))))))
-    (inputs `(("ghc-concurrent-output" ,ghc-concurrent-output)
-              ("ghc-magic" ,ghc-magic)
+               (delete 'check))))))
+    (inputs `(("ghc-magic" ,ghc-magic)
               ,@(package-inputs git-annex)))))
 
 (define-public git-annex-remote-ipfs
-- 
cgit v1.2.3