From a5de3052c084c84e7cf8ab6230dd63f855d371b9 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sat, 2 Nov 2019 12:31:24 -0400
Subject: git-annex: Drop custom definition

The upstream definition has S3 support as of ac1b080107.
---
 km-packages/git-annex.scm | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/km-packages/git-annex.scm b/km-packages/git-annex.scm
index 1122b50..09de9da 100644
--- a/km-packages/git-annex.scm
+++ b/km-packages/git-annex.scm
@@ -52,30 +52,10 @@ newspace."
 (define (current-commit)
   (git-output "rev-parse" "HEAD"))
 
-;; Upstream doesn't build with S3 support.
-(define-public km-git-annex
-  (package
-    (inherit git-annex)
-    (name "km-git-annex")
-    (arguments
-     `(,@(substitute-keyword-arguments (package-arguments git-annex)
-           ((#:tests? _ #f) #f)
-           ((#:configure-flags _)
-            ;; These are the same flags that upstream uses, dropping
-            ;; -S3.  If this change doesn't move upstream soon, I
-            ;; should future-proof this by slicing "-S3" from the
-            ;; upstream flags rather than doing a full replacement.
-            '(list "--flags=-Android -Assistant -Pairing -Webapp -WebDAV"))
-           ((#:phases phases)
-            `(modify-phases ,phases
-               (delete 'check))))))
-    (inputs `(("ghc-aws" ,ghc-aws)
-              ,@(package-inputs git-annex)))))
-
 (define-public git-annex-dev
   (let ((commit (current-commit)))
     (package
-      (inherit km-git-annex)
+      (inherit git-annex)
       (name "git-annex-dev")
       (version (string-append "000-" (string-take commit 7)))
       (source (local-file %source-dir
-- 
cgit v1.2.3