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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 44630 in the body.
You can then email your comments to 44630 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] channels: Expose the default channel in %default-channel
Date: Sat, 14 Nov 2020 20:07:34 +0800

[Message part 1 (text/plain, inline)]

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

[signature.asc (application/pgp-signature, inline)]

[0001-channels-Expose-the-default-channel-in-default-chann.patch (text/x-patch, inline)]

From 2441a555cf9dab16da8b040ebb8b3ff60ccd1f2c Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last <at> 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

[Message part 4 (text/plain, inline)]

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

Zihao

Message #8 received at 44630 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Zhu Zihao <all_but_last <at> 163.com>
Cc: 44630 <at> debbugs.gnu.org
Subject: Re: [bug#44630] [PATCH] channels: Expose the default channel in
 %default-channel
Date: Thu, 26 Nov 2020 23:38:12 +0100

Hi,

Zhu Zihao <all_but_last <at> 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’.

Message #11 received at 44630 <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 44630 <at> debbugs.gnu.org
Subject: Re: [bug#44630] [PATCH] channels: Expose the default channel in
 %default-channel
Date: Fri, 27 Nov 2020 10:19:26 +0800

[Message part 1 (text/plain, inline)]

Sounds reasonable. Patch updated.

[signature.asc (application/pgp-signature, inline)]

[0001-channels-Expose-the-default-channel-in-default-chann.patch (text/x-patch, inline)]

From 1548439dbcfaa89b0c03b2d30e794a4374273507 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last <at> 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

[Message part 4 (text/plain, inline)]

Ludovic Courtès writes:

> Hi,
>
> Zhu Zihao <all_but_last <at> 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

Message #16 received at 44630-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Zhu Zihao <all_but_last <at> 163.com>
Cc: 44630-done <at> debbugs.gnu.org
Subject: Re: [bug#44630] [PATCH] channels: Expose the default channel in
 %default-channel
Date: Fri, 27 Nov 2020 10:58:50 +0100

Hi,

Zhu Zihao <all_but_last <at> 163.com> skribis:

> From 1548439dbcfaa89b0c03b2d30e794a4374273507 Mon Sep 17 00:00:00 2001
> From: Zhu Zihao <all_but_last <at> 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’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.