Stuff

guix.scm

@@ -2,6 +2,7 @@
   (guix packages)
   ((guix licenses) #:prefix license:)
   (guix download)
+  (guix git-download)
   (guix build-system gnu)
   (gnu packages)
   (gnu packages autotools)
@@ -10,75 +11,85 @@
   (gnu packages pkg-config)
   (gnu packages texinfo))
 
-(package
-  (name "bible-tools")
-  (version "1.0")
-  (source "./bible-tools-1.0.tar.gz")
-  (build-system gnu-build-system)
-  (arguments
-    `(#:modules
-      ((ice-9 match)
-       (ice-9 ftw)
-       ,@%gnu-build-system-modules)
-      #:phases
-      (modify-phases
-        %standard-phases
-        (add-after
-          'install
-          'hall-wrap-binaries
-          (lambda* (#:key inputs outputs #:allow-other-keys)
-            (let* ((compiled-dir
-                     (lambda (out version)
-                       (string-append
-                         out
-                         "/lib/guile/"
-                         version
-                         "/site-ccache")))
-                   (uncompiled-dir
-                     (lambda (out version)
-                       (string-append
-                         out
-                         "/share/guile/site"
-                         (if (string-null? version) "" "/")
-                         version)))
-                   (dep-path
-                     (lambda (env modules path)
-                       (list env
-                             ":"
-                             'prefix
-                             (cons modules
-                                   (map (lambda (input)
-                                          (string-append
-                                            (assoc-ref inputs input)
-                                            path))
-                                        ,''())))))
-                   (out (assoc-ref outputs "out"))
-                   (bin (string-append out "/bin/"))
-                   (site (uncompiled-dir out "")))
-              (match (scandir site)
-                     (("." ".." version)
-                      (for-each
-                        (lambda (file)
-                          (wrap-program
-                            (string-append bin file)
-                            (dep-path
-                              "GUILE_LOAD_PATH"
-                              (uncompiled-dir out version)
-                              (uncompiled-dir "" version))
-                            (dep-path
-                              "GUILE_LOAD_COMPILED_PATH"
-                              (compiled-dir out version)
-                              (compiled-dir "" version))))
-                        ,''("bible2latex" "count-words"))
-                      #t))))))))
-  (native-inputs
-    `(("autoconf" ,autoconf)
-      ("automake" ,automake)
-      ("pkg-config" ,pkg-config)
-      ("texinfo" ,texinfo)))
-  (inputs `(("guile" ,guile-3.0)))
-  (propagated-inputs `())
-  (synopsis "")
-  (description "")
-  (home-page "")
-  (license license:gpl3+))
+(define-public bible-tools
+  (package
+    (name "bible-tools")
+    (version "1.0")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://git.silasvedder.xyz/silasfox/bible-tools.git")
+               (commit "8b23959fed8d15ba074a354b85c42cc587d9c0a2")))
+        (file-name "bible-tools-1.0-checkout")
+        (sha256 (base32 "119l6fbj7x0rs0jnczjhkyqmiiwbx2b944985qykgmdb557p5bhf"))))
+    (build-system gnu-build-system)
+    (arguments
+      `(#:modules
+        ((ice-9 match)
+         (ice-9 ftw)
+         ,@%gnu-build-system-modules)
+        #:phases
+        (modify-phases
+          %standard-phases
+          (add-after
+            'install
+            'hall-wrap-binaries
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let* ((compiled-dir
+                       (lambda (out version)
+                         (string-append
+                           out
+                           "/lib/guile/"
+                           version
+                           "/site-ccache")))
+                     (uncompiled-dir
+                       (lambda (out version)
+                         (string-append
+                           out
+                           "/share/guile/site"
+                           (if (string-null? version) "" "/")
+                           version)))
+                     (dep-path
+                       (lambda (env modules path)
+                         (list env
+                               ":"
+                               'prefix
+                               (cons modules
+                                     (map (lambda (input)
+                                            (string-append
+                                              (assoc-ref inputs input)
+                                              path))
+                                          ,''())))))
+                     (out (assoc-ref outputs "out"))
+                     (bin (string-append out "/bin/"))
+                     (site (uncompiled-dir out "")))
+                (match (scandir site)
+                       (("." ".." version)
+                        (for-each
+                          (lambda (file)
+                            (wrap-program
+                              (string-append bin file)
+                              (dep-path
+                                "GUILE_LOAD_PATH"
+                                (uncompiled-dir out version)
+                                (uncompiled-dir "" version))
+                              (dep-path
+                                "GUILE_LOAD_COMPILED_PATH"
+                                (compiled-dir out version)
+                                (compiled-dir "" version))))
+                          ,''("bible2latex" "count-words"))
+                        #t))))))))
+    (native-inputs
+      `(("autoconf" ,autoconf)
+        ("automake" ,automake)
+        ("pkg-config" ,pkg-config)
+        ("texinfo" ,texinfo)))
+    (inputs `(("guile" ,guile-3.0)))
+    (propagated-inputs `())
+    (synopsis "")
+    (description "")
+    (home-page "")
+    (license license:gpl3+)))
+
+bible-tools