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

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

[Zhu Zihao]

[-- Attachment #1.1: Type: text/plain, Size: 338 bytes --]


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"))
```


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 515 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-channels-Expose-the-default-channel-in-default-chann.patch --]
[-- Type: text/x-patch, Size: 1425 bytes --]

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


[-- Attachment #3: Type: text/plain, Size: 71 bytes --]


-- 
Retrieve my PGP public key: https://meta.sr.ht/~citreu.pgp

Zihao

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

[Ludovic Courtès]

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’.

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

[Zhu Zihao]

[-- Attachment #1.1: Type: text/plain, Size: 36 bytes --]


Sounds reasonable. Patch updated.


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 515 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-channels-Expose-the-default-channel-in-default-chann.patch --]
[-- Type: text/x-patch, Size: 1436 bytes --]

From 1548439dbcfaa89b0c03b2d30e794a4374273507 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Fri, 27 Nov 2020 10:16:29 +0800
Subject: [PATCH] channels: Expose the default channel in %default-channel.

* guix/channels(%default-guix-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..0c84eed477 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -72,6 +72,7 @@
             openpgp-fingerprint->bytevector
             openpgp-fingerprint
 
+            %default-guix-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-guix-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-guix-channel))
 
 (define (guix-channel? channel)
   "Return true if CHANNEL is the 'guix' channel."
-- 
2.29.2


[-- Attachment #3: Type: text/plain, Size: 1003 bytes --]



Ludovic Courtès writes:

> 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’.


-- 
Retrieve my PGP public key: https://meta.sr.ht/~citreu.pgp

Zihao

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

[Ludovic Courtès]

Hi,

Zhu Zihao <all_but_last@163.com> skribis:

> From 1548439dbcfaa89b0c03b2d30e794a4374273507 Mon Sep 17 00:00:00 2001
> From: Zhu Zihao <all_but_last@163.com>
> Date: Fri, 27 Nov 2020 10:16:29 +0800
> Subject: [PATCH] channels: Expose the default channel in %default-channel.
>
> * guix/channels(%default-guix-channel): New variable taken from the inner of
> %default-channels.
>
> (%default-channels): Refactored.

Applied, thanks!

Ludo’.