diff mbox series

[bug#44630] channels: Expose the default channel in %default-channel

Message ID 86ft5cp2ex.fsf@163.com
State Accepted
Headers show
Series [bug#44630] channels: Expose the default channel in %default-channel | expand

Checks

Context Check Description
cbaines/submitting builds success
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job

Commit Message

Zhu Zihao Nov. 14, 2020, 12:07 p.m. UTC
This expose the inner channel of "%default-channels", this can help user
to override the original guix channel with any mirror more conveniently.

Before:

```
(channel
  (inherit (car %default-channels))
  (url "url/to/mirror"))
```

After:

```
(channel
  (inherit %default-channel)
  (url "https://mirror.guix.org.cn/git/guix"))
```

Comments

Ludovic Courtès Nov. 26, 2020, 10:38 p.m. UTC | #1
Hi,

Zhu Zihao <all_but_last@163.com> skribis:

> This expose the inner channel of "%default-channels", this can help user
> to override the original guix channel with any mirror more conveniently.
>
> Before:
>
> ```
> (channel
>   (inherit (car %default-channels))
>   (url "url/to/mirror"))
> ```
>
> After:
>
> ```
> (channel
>   (inherit %default-channel)
>   (url "https://mirror.guix.org.cn/git/guix"))
> ```

Hmm I understand the need here, but at the same time, the variable is
called ‘%default-channels’ (plural) to preserve the ability to turn
splut Guix into several channels.

What could work though is your patch, except with the name
‘%default-guix-channel’ instead of ‘%default-channel’, which makes it
clear that it’s just the ‘guix’ channel.

Works for you?

Thanks,
Ludo’.
diff mbox series

Patch

From 2441a555cf9dab16da8b040ebb8b3ff60ccd1f2c Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sat, 14 Nov 2020 20:02:47 +0800
Subject: [PATCH] channels: Expose the default channel in %default-channel
 variable.

* guix/channels(%default-channel): New variable taken from the inner of %default-channels.
(%default-channels): Refactored.
---
 guix/channels.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/guix/channels.scm b/guix/channels.scm
index 916d663e9f..f78712c895 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -72,6 +72,7 @@ 
             openpgp-fingerprint->bytevector
             openpgp-fingerprint
 
+            %default-channel
             %default-channels
             guix-channel?
 
@@ -170,13 +171,16 @@  to the corresponding bytevector."
   ;; URL of the default 'guix' channel.
   "https://git.savannah.gnu.org/git/guix.git")
 
+(define %default-channel
+  (channel
+   (name 'guix)
+   (branch "master")
+   (url %default-channel-url)
+   (introduction %guix-channel-introduction)))
+
 (define %default-channels
   ;; Default list of channels.
-  (list (channel
-         (name 'guix)
-         (branch "master")
-         (url %default-channel-url)
-         (introduction %guix-channel-introduction))))
+  (list %default-channel))
 
 (define (guix-channel? channel)
   "Return true if CHANNEL is the 'guix' channel."
-- 
2.29.2