From 1d17bf4d33048edd7b727bd2451521624b7c99ae Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Tue, 30 Jan 2024 21:10:05 +0100 Subject: Rename "channel" to "deployment" This is the best name I could come up with to describe the actual purpose of the channel. Note that git optimized my reorder of the channel definitions due to the rename. It is all fine, there are no actual changes inside the code. --- systems/izumi/channels.scm | 32 +++++++++++++++----------------- systems/izumi/home-configuration.scm | 2 +- systems/izumi/izumi.org | 2 +- 3 files changed, 17 insertions(+), 19 deletions(-) (limited to 'systems') diff --git a/systems/izumi/channels.scm b/systems/izumi/channels.scm index d4b6c92..69d4b89 100644 --- a/systems/izumi/channels.scm +++ b/systems/izumi/channels.scm @@ -3,37 +3,35 @@ #:use-module ( gnu services ) #:use-module ( guix channels ) ) -( define guix +( define deployment ( let - ( ( introduction + ( ( branch "channel" ) + ( introduction ( make-channel-introduction - "9edb3f66fd807b096b48283debdcddccfea34bad" + "c24ce7cb11e74da13d491f9de3c4b7040a069f43" ( openpgp-fingerprint - "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA" ) ) ) - ( name 'guix ) - ( url "https://git.savannah.gnu.org/git/guix.git" ) ) + "590E 500F E39D 26B3 E60B 743B 6D81 B120 7711 899F" ) ) ) + ( name 'deployment ) + ( url "https://git.marekpasnikowski.pl/git/deployment.git" ) ) ( channel + ( branch branch ) ( introduction introduction ) ( name name ) ( url url ) ) ) ) -( define marekpasnikowski +( define guix ( let - ( ( branch "channel" ) - ( introduction + ( ( introduction ( make-channel-introduction - "c24ce7cb11e74da13d491f9de3c4b7040a069f43" + "9edb3f66fd807b096b48283debdcddccfea34bad" ( openpgp-fingerprint - "590E 500F E39D 26B3 E60B 743B 6D81 B120 7711 899F" ) ) ) - ( name 'channel ) - ( url "https://git.marekpasnikowski.pl/git/channel.git" ) ) + "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA" ) ) ) + ( name 'guix ) + ( url "https://git.savannah.gnu.org/git/guix.git" ) ) ( channel - ( branch branch ) ( introduction introduction ) ( name name ) ( url url ) ) ) ) ( define-public izumi-channels-service-type - ( service home-channels-service-type ( list guix marekpasnikowski ) ) ) - -( list guix marekpasnikowski ) + ( service home-channels-service-type ( list deployment guix ) ) ) diff --git a/systems/izumi/home-configuration.scm b/systems/izumi/home-configuration.scm index 0bc74ca..d0441d2 100644 --- a/systems/izumi/home-configuration.scm +++ b/systems/izumi/home-configuration.scm @@ -160,7 +160,7 @@ (let* ((and "&& ") (collect-garbage "sudo guix gc -d 7d ") - (configuration-prefix "/home/marek/src/channel/systems/izumi/") + (configuration-prefix "/home/marek/src/deployment/systems/izumi/") (pull-guix "guix pull ") (reconfigure-home (string-append diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org index dfeb28e..5a2684b 100644 --- a/systems/izumi/izumi.org +++ b/systems/izumi/izumi.org @@ -838,7 +838,7 @@ (let* ((and "&& ") (collect-garbage "sudo guix gc -d 7d ") - (configuration-prefix "/home/marek/src/channel/systems/izumi/") + (configuration-prefix "/home/marek/src/deployment/systems/izumi/") (pull-guix "guix pull ") (reconfigure-home (string-append -- cgit v1.2.3