diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-01-24 06:15:32 +0100 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-01-24 06:17:40 +0100 |
| commit | 3fe073a0dc5fc218e382c41dad14e3b8d4c5e306 (patch) | |
| tree | f7702d4fd874ddc6cc1338ea1a4a4926f1fa1ba4 | |
| parent | d9e3abd97ab6c9c7e791e4c8e4ee06578fbd9c5e (diff) | |
Yet Another Attempt to Instantiate the Channel
| -rw-r--r-- | systems/izumi/channels.scm | 51 | ||||
| -rw-r--r-- | systems/izumi/izumi.org | 3 | ||||
| -rw-r--r-- | systems/izumi/system-configuration.scm | 3 |
3 files changed, 28 insertions, 29 deletions
diff --git a/systems/izumi/channels.scm b/systems/izumi/channels.scm index 6b54c9c..2a45c75 100644 --- a/systems/izumi/channels.scm +++ b/systems/izumi/channels.scm @@ -1,27 +1,24 @@ -( 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 ) - ( url "https://gitlab.com/nonguix/nonguix" ) - ( introduction - ( make-channel-introduction - "897c1a470da759236cc11798f4e0a5f7d4d59fbc" - ( openpgp-fingerprint - "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5" ) ) ) ) ) +(append %default-channels + (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 ) + ( url "https://gitlab.com/nonguix/nonguix" ) + ( introduction + ( make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + ( openpgp-fingerprint + "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5" ) ) ) ) )) diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org index 2dcf1cd..0ff44cc 100644 --- a/systems/izumi/izumi.org +++ b/systems/izumi/izumi.org @@ -566,7 +566,8 @@ ( list ( git-http-nginx-location-configuration ( git-http-configuration - ( git-root "/var/lib/gitolite/repositories" ) ) ) + ( git-root "/var/lib/gitolite/repositories" ) + ( uri-path "/git" ) ) ) ( nginx-location-configuration ( body ( list diff --git a/systems/izumi/system-configuration.scm b/systems/izumi/system-configuration.scm index 60a2f6b..fba55bf 100644 --- a/systems/izumi/system-configuration.scm +++ b/systems/izumi/system-configuration.scm @@ -556,7 +556,8 @@ ( list ( git-http-nginx-location-configuration ( git-http-configuration - ( git-root "/var/lib/gitolite/repositories" ) ) ) + ( git-root "/var/lib/gitolite/repositories" ) + ( uri-path "/git" ) ) ) ( nginx-location-configuration ( body ( list |