Update, reindent infrastructure files

* guix.scm: Define guile-ts-next to use newer commit "correctly"
* manifest.scm: Define guile-hall-next to use newer commit "correctly"

guix.scm

@@ -8,15 +8,26 @@
 	     (guix build-system gnu)
 	     (guix download)
 	     (guix gexp)
+             (guix git-download)
 	     (guix transformations)
 	     ((guix licenses)
 	      #:prefix license:)
 	     (guix packages)
 	     (srfi srfi-1))
 
-(define guile-ts-transform
-  (options->transformation
-   '((with-commit . "guile-ts=266453a"))))
+(define guile-ts-next
+  (let ((commit "266453a"))
+    (package
+      (inherit guile-ts)
+      (source (origin
+		(method git-fetch)
+		(uri (git-reference
+		      (url "https://github.com/Z572/guile-ts")
+		      (commit commit)))
+		(file-name (git-file-name (package-name guile-ts) commit))
+		(sha256
+		 (base32
+		  "1s65kpwhsphbjlggpc6gy1wbap85yjzdb69xfvs8j204w24smjps")))))))
 
 (package
   (name "sloth")
@@ -63,7 +74,7 @@
 			       ;; with inputs because DRY
 			       (list #$guile-config
 				     #$guile-ncurses
-							  #$(guile-ts-transform guile-ts))))))
+				     #$guile-ts-next)))))
 	    (define bin (string-append #$output "/bin/"))
 	    (define site (guile-uncompiled-dir #$output ""))
 	    (define version (caddr (scandir site)))
@@ -125,7 +136,7 @@
   (inputs (list guile-3.0
 		guile-config
 		guile-ncurses
-	       (guile-ts-transform guile-ts)
+		guile-ts-next
 		tree-sitter-bash
 		tree-sitter-bibtex
 		tree-sitter-c
@@ -167,4 +178,3 @@
    "TODO")
   (home-page "https://git.solarpunk.moe/Sloth/sloth")
   (license license:gpl3+))
-

manifest.scm

@@ -19,68 +19,18 @@
 	     (guix packages))
 
 (define guile-hall-next
+  (let ((commit "9ca0c3e"))
     (package
-   (name "guile-hall")
-   (version "0.4.1-next")
+      (inherit guile-hall)
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                (url "https://gitlab.com/a-sassmannshausen/guile-hall")
-           (commit "9ca0c3e")))
-     (file-name (git-file-name name version))
+               (commit commit)))
+         (file-name (git-file-name (package-name guile-hall) commit))
          (sha256
-      (base32 "0fi7isi5wq6awssk08zj4scifrb9g1g1027id5j87awb29q22jlj"))))
-   (build-system gnu-build-system)
-   (arguments
-    (list #:phases
-          #~(modify-phases %standard-phases
-              (add-after 'install 'hall-wrap-binaries
-                (lambda _
-				  (use-modules (ice-9 ftw))
-				  (define (compiled-dir out version)
-					(string-append out "/lib/guile/"
-								   version
-								   "/site-ccache"))
-				  (define (uncompiled-dir out version)
-					(string-append out
-								   "/share/guile/site"
-								   (if (string-null? version) ""
-									   "/")
-								   version))
-				  (define (dep-path env modules path)
-					(list env ":"
-						  'prefix
-						  (cons modules
-								(map (lambda (input)
-									   (string-append input path))
-									 (list #$guile-config)))))
-				  (define bin (string-append #$output "/bin/"))
-				  (define site (uncompiled-dir #$output ""))
-				  (define version (caddr (scandir site)))
-				  (wrap-program (string-append bin "hall")
-								(dep-path
-								 "GUILE_LOAD_PATH"
-								 (uncompiled-dir #$output version)
-								 (uncompiled-dir "" version))
-								(dep-path
-								 "GUILE_LOAD_COMPILED_PATH"
-								 (compiled-dir #$output version)
-								 (compiled-dir "" version))))))))
-   (native-inputs (list autoconf
-						automake
-						pkg-config
-						texinfo))
-   (inputs (list guile-3.0))
-   (propagated-inputs (list guile-config))
-   (synopsis "Guile project tooling")
-   (description
-    "Hall is a command-line application and a set of Guile libraries that
-allow you to quickly create and publish Guile projects.  It allows you to
-transparently support the GNU build system, manage a project hierarchy &
-provides tight coupling to Guix.")
-   (home-page "https://gitlab.com/a-sassmannshausen/guile-hall")
-   (license license:gpl3+)))
+          (base32 "0fi7isi5wq6awssk08zj4scifrb9g1g1027id5j87awb29q22jlj")))))))
 
 (packages->manifest
  (list coreutils