From a3f3cc8ee8454aafaa5934236e1ab65a6c81c0db Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Thu, 25 Jan 2024 23:52:42 +0100 Subject: Fix channels.scm file --- systems/izumi/channels.scm | 61 +++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 41 deletions(-) diff --git a/systems/izumi/channels.scm b/systems/izumi/channels.scm index a660cc6..2fd0d38 100644 --- a/systems/izumi/channels.scm +++ b/systems/izumi/channels.scm @@ -1,44 +1,23 @@ (define-module (systems izumi channels) #: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 introduction) - (name name) - (url url))))) - -(list guix-channel ;;nonguix-channel - test-channel) +(append + %default-channels + (list + (channel + (introduction + (make-channel-introduction + "c24ce7cb11e74da13d491f9de3c4b7040a069f43" + (openpgp-fingerprint "590E 500F E39D 26B3 E60B 743B 6D81 B120 7711 899F"))) + (name 'channel) + (url "https://git.marekpasnikowski.pl/git/channel.git")) + (channel + (introduction + (make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + (openpgp-fingerprint "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5"))) + (name 'nonguix) + (url "https://gitlab.com/nonguix/nonguix")) + (channel + (name 'secrets) + (url "file:///home/marek/Dokumenty/secrets")))) -- cgit v1.2.3