From 7d70d3cc77af4e0e275ec7f2d7a89f78a5b789ba Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Tue, 3 Sep 2019 18:35:04 -0400
Subject: git-annex: Move definition of km-git-annex

---
 km-packages/git-annex.scm | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/km-packages/git-annex.scm b/km-packages/git-annex.scm
index 416e7e9..d8efb18 100644
--- a/km-packages/git-annex.scm
+++ b/km-packages/git-annex.scm
@@ -77,6 +77,29 @@ full-featured binding.")
     ;; TODO: check
     (license license:bsd-2)))
 
+;; Upstream doesn't use ghc-magic yet.
+(define-public km-git-annex
+  (package
+    (inherit git-annex)
+    (name "km-git-annex")
+    (version "7.20190730")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://hackage.haskell.org/package/"
+                           "git-annex/git-annex-" version ".tar.gz"))
+       (sha256
+        (base32
+         "16mya2dm7q9ggdmwyszri85qnnxf0l71xnn8khnxl5fqrh2zvsjg"))))
+    (arguments
+     `(#:tests? #f
+       ,@(substitute-keyword-arguments (package-arguments git-annex)
+           ((#:phases phases)
+            `(modify-phases ,phases
+               (delete 'check))))))
+    (inputs `(("ghc-magic" ,ghc-magic)
+              ,@(package-inputs git-annex)))))
+
 (define-public git-annex-dev
   (let ((commit (current-commit)))
     (package
@@ -105,29 +128,6 @@ full-featured binding.")
       (inputs `(("ghc-magic" ,ghc-magic)
                 ,@(package-inputs git-annex))))))
 
-;; Upstream doesn't use ghc-magic yet.
-(define-public km-git-annex
-  (package
-    (inherit git-annex)
-    (name "km-git-annex")
-    (version "7.20190730")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://hackage.haskell.org/package/"
-                           "git-annex/git-annex-" version ".tar.gz"))
-       (sha256
-        (base32
-         "16mya2dm7q9ggdmwyszri85qnnxf0l71xnn8khnxl5fqrh2zvsjg"))))
-    (arguments
-     `(#:tests? #f
-       ,@(substitute-keyword-arguments (package-arguments git-annex)
-           ((#:phases phases)
-            `(modify-phases ,phases
-               (delete 'check))))))
-    (inputs `(("ghc-magic" ,ghc-magic)
-              ,@(package-inputs git-annex)))))
-
 (define-public git-annex-remote-ipfs
   (package
     (name "git-annex-remote-ipfs")
-- 
cgit v1.2.3