Turn the channel list into a proper module

1 files changed, 43 insertions, 18 deletions

diff --git a/systems/izumi/channels.scm b/systems/izumi/channels.scm
index d412813..249c0c4 100644
--- a/systems/izumi/channels.scm
+++ b/systems/izumi/channels.scm
@@ -1,18 +1,43 @@
-(list (channel (name 'guix)
-	       (branch "master")
-	       (url "https://git.savannah.gnu.org/git/guix.git")
-	       (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad"
-							(openpgp-fingerprint "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
-      ;; (channel (name 'personal-channel)
-      ;; 	       (branch "wip-channel")
-      ;; 	       (introduction (make-channel-introduction "f8ccfe8f3e5c8bafe06665cbd4b0c9301e1a64b6"
-      ;; 							(openpgp-fingerprint "590E 500F E39D 26B3 E60B 743B 6D81 B120 7711 899F")))
-      ;; 	       (url "https://git.marekpasnikowski.pl/git/channel.git"))
-      ( channel
-	( name 'nonguix-test )
-	( url "https://gitlab.com/nonguix/nonguix" )
-	( introduction
-	  ( make-channel-introduction
-	    "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
-	    ( openpgp-fingerprint
-	      "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5" ) ) ) ) )
+(define-module (channel-list)
+  #:use-module (guix channels))
+
+(define guix-channel
+  (let ((commit "9edb3f66fd807b096b48283debdcddccfea34bad")
+	(key (openpgp-fingerprint
+	      "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))
+    (let ((branch "master")
+	  (introduction (make-channel-introduction commit key))
+	  (name 'guix)
+	  (url "https://git.savannah.gnu.org/git/guix.git"))
+      (channel (branch branch)
+	       (introduction introduction)
+	       (name name)
+	       (url url)))))
+
+(define nonguix-channel
+  (let ((commit "897c1a470da759236cc11798f4e0a5f7d4d59fbc")
+	(key (openpgp-fingerprint
+	      "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))
+    (let ((branch "master")
+	  (introduction (make-channel-introduction commit key))
+	  (name 'nonguix)
+	  (url "https://gitlab.com/nonguix/nonguix"))
+      (channel (branch branch)
+	       (introduction introduction)
+	       (name name)
+	       (url url)))))
+
+(define test-channel
+  (let ((commit "f8ccfe8f3e5c8bafe06665cbd4b0c9301e1a64b6")
+	(key (openpgp-fingerprint
+	      "590E 500F E39D 26B3 E60B 743B 6D81 B120 7711 899F")))
+    (let ((branch "wip-channel")
+	  (introduction (make-channel-introduction commit key))
+	  (name 'test)
+	  (url "https://git.marekpasnikowski.pl/git/channel.git"))
+      (channel (branch branch)
+	       (introduction )
+	       (name name)
+	       (url url)))))
+
+(list guix-channel nonguix-channel test-channel)