Merge remote-tracking branch 'origin/main'

.guix-channel

@@ -0,0 +1,3 @@
+(channel
+  (version 0)
+  (directory ".guix/modules"))

.guix/modules/termenv-package.scm

@@ -0,0 +1,50 @@
+(define-module (termenv-package)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages guile-xyz)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages texinfo)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (srfi srfi-1))
+
+(define-public guile-termenv
+  (package
+    (name "guile-termenv")
+    (version "0.1")
+    (source
+     (local-file
+      "../.." "guile-termenv-checkout"
+      #:recursive? #t
+      #:select? (lambda (file stat)
+		  (not (any (lambda (my-string)
+			      (string-contains file my-string))
+			    (list ".git" ".dir-locals.el" "guix.scm"))))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:make-flags
+      #~(list "GUILE_AUTO_COMPILE=0")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'bootstrap 'hall
+            (lambda _
+	      (system* "hall" "build" "-x")))
+	  (replace 'bootstrap
+            (lambda _
+	      (system* "autoreconf" "-vif"))))))
+    (native-inputs (list autoconf
+			 automake
+			 guile-hall
+			 pkg-config
+			 texinfo))
+    (inputs (list guile-3.0))
+    (synopsis "Guile port of termenv")
+    (description
+     "A library to provide easy control of terminals from Guile using terminal control codes.")
+    (home-page "https://git.solarpunk.moe/vv/guile-termenv")
+    (license license:gpl3+)))

guix.scm

@@ -1,49 +1,3 @@
-(use-modules (gnu packages)
+(load ".guix/modules/termenv-package.scm")
-             (gnu packages autotools)
+(use-modules (termenv-package))
-             (gnu packages guile)
+guile-termenv
-             (gnu packages guile-xyz)
-             (gnu packages pkg-config)
-             (gnu packages texinfo)
-             (guix build-system gnu)
-             (guix download)
-             (guix gexp)
-             ((guix licenses) #:prefix license:)
-             (guix packages)
-             (srfi srfi-1))
-
-(package
-  (name "guile-termenv")
-  (version "0.1")
-  (source
-   (local-file
-	(dirname (current-filename))
-	#:recursive? #t
-	#:select? (lambda (file stat)
-		        (not (any (lambda (my-string)
-			                (string-contains file my-string))
-			              (list ".git" ".dir-locals.el" "guix.scm"))))))
-  (build-system gnu-build-system)
-  (arguments
-   (list
-	#:make-flags
-	#~(list "GUILE_AUTO_COMPILE=0")
-	#:phases
-	#~(modify-phases %standard-phases
-        (add-before 'bootstrap 'hall
-          (lambda _
-	        (system* "hall" "build" "-x")))
-	    (replace 'bootstrap
-          (lambda _
-	        (system* "autoreconf" "-vif"))))))
-  (native-inputs (list autoconf
-		               automake
-		               guile-hall
-		               pkg-config
-		               texinfo))
-  (inputs (list guile-3.0))
-  (synopsis "Guile port of termenv")
-  (description
-   "A library to provide easy control of terminals from Guile using terminal control codes.")
-  (home-page "https://git.solarpunk.moe/vv/guile-termenv")
-  (license license:gpl3+))
-

hall.scm

@@ -8,37 +8,52 @@
  (synopsis "Guile port of termenv")
  (description
   "A library to provide easy control of terminals from Guile using terminal control codes.")
- (home-page "https://git.solarpunk.moe/vv/guile-termenv")
+ (home-page
+  "https://git.solarpunk.moe/vv/guile-termenv")
  (license gpl3+)
  (dependencies `())
+ (skip ())
  (features
   ((guix #t)
    (use-guix-specs-for-dependencies #f)
    (native-language-support #f)
    (licensing #f)))
  (files (libraries
-         ((directory "termenv"
+	 ((scheme-file "termenv")
-                     ((scheme-file "style")
+	  (directory
-                      (scheme-file "unix")
+	   "termenv"
-                      (scheme-file "hyperlink")
+	   ((scheme-file "screen")
-                      (scheme-file "screen")
+	    (scheme-file "style")
-                      (scheme-file "color")
+	    (scheme-file "hconfig")
-                      (scheme-file "hconfig")))
+	    (scheme-file "color")
-          (scheme-file "termenv")))
+	    (scheme-file "unix")
-        (tests ((directory "tests"
+	    (scheme-file "hyperlink")))))
-                           ((scheme-file "test-screen")
+	(tests ((directory
-                            (scheme-file "test-style")))))
+		 "tests"
-        (documentation
+		 ((scheme-file "utils")
-         ((org-file "README")
+		  (scheme-file "test-style")
-          (symlink "README" "README.org")
+		  (scheme-file "test-screen")))))
-          (text-file "HACKING")
+	(programs ())
-          (text-file "COPYING")
+	(documentation
-          (directory "doc"
+	 ((org-file "README")
-                     ((texi-file "guile-termenv")))))
+	  (symlink "README" "README.org")
-        (programs ())
+	  (text-file "HACKING")
-        (infrastructure
+	  (text-file "COPYING")
-         ((scheme-file "guix")
+	  (directory "doc" ((texi-file "guile-termenv")))))
-          (text-file ".gitignore")
+	(infrastructure
-          (scheme-file "hall")
+	 ((text-file ".guix-channel")
-          (directory "tests"
+	  (directory
-                     ((scheme-file "utils")))))))
+	   ".guix"
+	   ((directory
+	     "modules"
+	     ((scheme-file "guile-termenv")))))
+	  (symlink
+	   "guix.scm"
+	   ".guix/modules/guile-termenv.scm")
+	  (text-file ".gitignore")
+	  (scheme-file "hall")
+	  (directory
+	   "tests"
+	   ((scheme-file "utils")
+	    (scheme-file "test-style")
+	    (scheme-file "test-screen")))))))