[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#45919] [PATCH 5/8] channels: Add the channel name to channel sexps.
From: |
Ludovic Courtès |
Subject: |
[bug#45919] [PATCH 5/8] channels: Add the channel name to channel sexps. |
Date: |
Sat, 16 Jan 2021 19:34:06 +0100 |
* guix/channels.scm (channel-instance->sexp): Add 'name'.
(sexp->channel): Extract the name from SEXP, using the optional argument
as a fallback.
---
guix/channels.scm | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/guix/channels.scm b/guix/channels.scm
index 65a0d849ec..6449221c3f 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -812,6 +812,7 @@ derivation."
(url ,(channel-url channel))
(branch ,(channel-branch channel))
(commit ,commit)
+ (name ,(channel-name channel))
,@(if intro
`((introduction
(channel-introduction
@@ -907,16 +908,22 @@ to 'latest-channel-instances'."
(channel-instances->derivation instances)))
(define* (sexp->channel sexp #:optional (name 'channel))
- "Read SEXP, a provenance sexp as created by 'channel-instance->sexp',
-and return a channel called NAME. Return #f if the sexp does not have the
-expected structure."
+ "Read SEXP, a provenance sexp as created by 'channel-instance->sexp'; use
+NAME as the channel name if SEXP does not specify it. Return #f if the sexp
+does not have the expected structure."
(match sexp
(('repository ('version 0)
('url url)
('branch branch)
('commit commit)
rest ...)
- (channel (name name)
+ ;; Historically channel sexps did not include the channel name. It's OK
+ ;; for channels created by 'channel-instances->manifest' because the
+ ;; entry name is the channel name, but it was missing for entries created
+ ;; by 'manifest-entry-with-provenance'.
+ (channel (name (match (assq 'name rest)
+ (#f name)
+ (('name name) name)))
(url url)
(commit commit)
(introduction
--
2.30.0
- [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile, Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code'., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 2/8] utils: Add 'version-unique-prefix'., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 3/8] guix package: Add '--export-manifest'., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 5/8] channels: Add the channel name to channel sexps.,
Ludovic Courtès <=
- [bug#45919] [PATCH 8/8] guix package: Add '--export-channels'., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 4/8] channels: Factorize 'manifest-entry-channel' and channel serialization., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 6/8] guix describe: Use 'manifest-entry-channel'., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 7/8] channels: Add 'channel->code'., Ludovic Courtès, 2021/01/16
- [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile, Ludovic Courtès, 2021/01/27
- [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile, Pierre Neidhardt, 2021/01/28