From: "Ludovic Courtès" <ludo@gnu.org>
To: 45919@debbugs.gnu.org
Subject: [bug#45919] [PATCH 5/8] channels: Add the channel name to channel sexps.
Date: Sat, 16 Jan 2021 19:34:06 +0100 [thread overview]
Message-ID: <20210116183409.31229-5-ludo@gnu.org> (raw)
In-Reply-To: <20210116183409.31229-1-ludo@gnu.org>
* 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
next prev parent reply other threads:[~2021-01-16 18:35 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-16 18:29 [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 1/8] profiles: Add 'manifest->code' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 2/8] utils: Add 'version-unique-prefix' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 3/8] guix package: Add '--export-manifest' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 4/8] channels: Factorize 'manifest-entry-channel' and channel serialization Ludovic Courtès
2021-01-16 18:34 ` Ludovic Courtès [this message]
2021-01-16 18:34 ` [bug#45919] [PATCH 6/8] guix describe: Use 'manifest-entry-channel' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 7/8] channels: Add 'channel->code' Ludovic Courtès
2021-01-16 18:34 ` [bug#45919] [PATCH 8/8] guix package: Add '--export-channels' Ludovic Courtès
2021-01-27 13:14 ` bug#45919: [PATCH 0/8] Exporting a manifest and channels from a profile Ludovic Courtès
2021-01-27 21:02 ` [bug#45919] " zimoun
2021-01-28 15:54 ` Ludovic Courtès
2021-02-01 22:37 ` Unreproducible “guix pack -f docker” because config.scm-builder zimoun
2021-02-02 14:48 ` zimoun
2021-02-02 18:12 ` Ludovic Courtès
2021-02-02 20:11 ` zimoun
2021-02-05 10:09 ` Ludovic Courtès
2021-02-05 17:22 ` zimoun
2021-02-06 21:46 ` Ludovic Courtès
2021-02-08 18:44 ` [PATCH] Fix unreproducible “guix pack -f docker” (hard link) zimoun
[not found] ` <86lfbzad42.fsf@gmail.com>
2021-02-09 8:35 ` Unreproducible “guix pack -f docker” because config.scm-builder Ludovic Courtès
2021-02-09 8:51 ` zimoun
2021-01-28 17:57 ` [bug#45919] [PATCH 0/8] Exporting a manifest and channels from a profile Bengt Richter
2021-01-29 19:13 ` zimoun
2021-01-28 17:04 ` bug#45919: " Pierre Neidhardt
2021-01-29 17:57 ` [bug#45919] " Pierre Neidhardt
2021-01-29 18:57 ` zimoun
2021-01-29 21:51 ` Pierre Neidhardt
2021-01-30 14:31 ` zimoun
2021-01-30 21:23 ` bug#45919: " Ludovic Courtès
2021-01-31 5:08 ` Ryan Prior
2021-02-01 13:30 ` Ludovic Courtès
2021-01-30 13:55 ` Ludovic Courtès
2021-01-31 17:26 ` Pierre Neidhardt
2021-02-01 13:25 ` Ludovic Courtès
2021-02-01 15:32 ` Pierre Neidhardt
2021-02-01 17:04 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210116183409.31229-5-ludo@gnu.org \
--to=ludo@gnu.org \
--cc=45919@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.