[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#22883: [PATCH 7/9] channels: Automatically add introduction for the
From: |
Ludovic Courtès |
Subject: |
bug#22883: [PATCH 7/9] channels: Automatically add introduction for the official 'guix' channel. |
Date: |
Mon, 8 Jun 2020 23:54:13 +0200 |
This is useful when people run "guix time-machine -C channels.scm",
where 'channels.scm' misses channel introductions.
* guix/channels.scm (%default-channel-url): New variable.
(%default-channels): Use it.
(ensure-default-introduction): New procedure.
(latest-channel-instance): Call it.
---
guix/channels.scm | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/guix/channels.scm b/guix/channels.scm
index 6047b51010..43ddff6f7c 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -148,18 +148,32 @@
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))
#f)) ;TODO: Add an intro signature so it can be exported.
+(define %default-channel-url
+ ;; URL of the default 'guix' channel.
+ "https://git.savannah.gnu.org/git/guix.git")
+
(define %default-channels
;; Default list of channels.
(list (channel
(name 'guix)
(branch "master")
- (url "https://git.savannah.gnu.org/git/guix.git")
+ (url %default-channel-url)
(introduction %guix-channel-introduction))))
(define (guix-channel? channel)
"Return true if CHANNEL is the 'guix' channel."
(eq? 'guix (channel-name channel)))
+(define (ensure-default-introduction chan)
+ "If CHAN represents the \"official\" 'guix' channel and lacks an
+introduction, add it."
+ (if (and (guix-channel? chan)
+ (not (channel-introduction chan))
+ (string=? (channel-url chan) %default-channel-url))
+ (channel (inherit chan)
+ (introduction %guix-channel-introduction))
+ chan))
+
(define-record-type <channel-instance>
(channel-instance channel commit checkout)
channel-instance?
@@ -386,7 +400,9 @@ their relation."
(and (string=? (basename file) ".git")
(eq? 'directory (stat:type stat))))
- (let-values (((checkout commit relation)
+ (let-values (((channel)
+ (ensure-default-introduction channel))
+ ((checkout commit relation)
(update-cached-checkout (channel-url channel)
#:ref (channel-reference channel)
#:starting-commit starting-commit)))
--
2.26.2
- bug#22883: [PATCH 1/9] git-authenticate: Cache takes a key parameter., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 6/9] .guix-channel: Add 'keyring-reference'., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 4/9] channels: 'latest-channel-instance' authenticates Git checkouts., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 2/9] git-authenticate: 'authenticate-commits' takes a #:keyring parameter., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 5/9] channels: Make 'validate-pull' call right after clone/pull., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 7/9] channels: Automatically add introduction for the official 'guix' channel.,
Ludovic Courtès <=
- bug#22883: [PATCH 8/9] pull: Add '--disable-authentication'., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 3/9] tests: Move OpenPGP helpers to (guix tests gnupg)., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 9/9] DROP? channels: Add prehistorical authorizations to <channel-introduction>., Ludovic Courtès, 2020/06/08
- bug#22883: [PATCH 1/9] git-authenticate: Cache takes a key parameter., Ludovic Courtès, 2020/06/08