GNU bug report logs - #69052
[PATCH] gnu: guix: Correct home-channels-service-type extension logic.

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: guix-patches; Reported by: Nicolas Graves <ngraves@HIDDEN>; Keywords: moreinfo patch; dated Sun, 11 Feb 2024 13:42:02 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.
Added tag(s) moreinfo. Request was from Ludovic Courtès <ludo@HIDDEN> to control <at> debbugs.gnu.org. Full text available.

Message received at 69052 <at> debbugs.gnu.org:


Received: (at 69052) by debbugs.gnu.org; 2 Mar 2024 15:20:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 02 10:20:37 2024
Received: from localhost ([127.0.0.1]:39170 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rgRAC-0003oO-N4
	for submit <at> debbugs.gnu.org; Sat, 02 Mar 2024 10:20:37 -0500
Received: from eggs.gnu.org ([209.51.188.92]:32900)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ludo@HIDDEN>) id 1rgRA6-0003o2-U4
 for 69052 <at> debbugs.gnu.org; Sat, 02 Mar 2024 10:20:34 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
 id 1rgR9W-0000kg-Dp; Sat, 02 Mar 2024 10:19:54 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
 From; bh=Ue1ycDAjEO/B48fVHHxq9SQn1KOXO4tPJ7QSMslkkok=; b=oHqFHqYPyRAoj9f6TSOn
 MetXLAurUHVXfff82p19uJwhkNMVQWHShqArgFTm3eDTalmz6SJzZRY1pSosLdZslvIXR1rCG/c/o
 xoDQQKiAPC3F/iHkgF/frGbxqj7m+ryQcYF2mQGtRqO4IvZZ3LBu8Feuzww7bgEdufw4no+agDFoB
 NR0CNlD0kBpy4qGf3z9m7NoxxoZyEZFd3VZ6q5QedrAkom1Wl8pGAQ/Kp8kSWBQTm/6tU7FGviVZy
 c/ylNqES/G+jCNdFpvHWLGfgEyUAe+m6aFrpEOJHcaz9JW1nQjknCEOyfDewBvKdKdQHT8sOMhFUg
 G7cP0NvIPpFT1Q==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Nicolas Graves <ngraves@HIDDEN>
Subject: Re: [bug#69052] [PATCH v2] gnu: guix: Correct
 home-channels-service-type extension logic.
In-Reply-To: <20240225060917.12152-1-ngraves@HIDDEN> (Nicolas Graves's
 message of "Sun, 25 Feb 2024 07:09:14 +0100")
References: <20240211124505.15924-1-ngraves@HIDDEN>
 <20240225060917.12152-1-ngraves@HIDDEN>
Date: Sat, 02 Mar 2024 16:19:51 +0100
Message-ID: <87a5ngek4o.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 69052
Cc: 69052 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Hi,

Nicolas Graves <ngraves@HIDDEN> skribis:

> * gnu/home/services/guix.scm
> (extend-channel-list): Add function.
> (home-channels-service-type)[extend]: Use extend-channel-list.
>
> Change-Id: I587207b86216f075a54b6ed0b8fa998896bbed74

[...]

> +(define (channel-name-symbol channel)
> +  (match (channel-name channel)
> +    ((? symbol? name) name)
> +    ((? string? name) (string->symbol name))))

=E2=80=98channel-name=E2=80=99 always returns a symbol so this procedure ca=
n be removed.

> +(define (extend-channel-list default new)
> +  "Prepend the channels in NEW by the channels in DEFAULT if their
> +channel-name is not in NEW."
> +  (fold-right
> +   (lambda (channel acc)
> +     (if (member (channel-name channel) (map channel-name-symbol acc))
> +         acc
> +         (cons channel acc)))
> +   new default))

[...]

> +   (extend extend-channel-list)

I believe it=E2=80=99s equivalent to:

  (define (extend-channel-list initial new)
    (delete-duplicates
     (append initial new)
     (lambda (channel1 channel2)
       (eq? (channel-name channel1) (channel-name channel2)))))

=E2=80=A6 which is somewhat clearer IMO.

Could you send an updated patch?

Ludo=E2=80=99.
Information forwarded to guix-patches@HIDDEN:
bug#69052; Package guix-patches. Full text available.

Message received at 69052 <at> debbugs.gnu.org:


Received: (at 69052) by debbugs.gnu.org; 25 Feb 2024 06:17:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 25 01:17:36 2024
Received: from localhost ([127.0.0.1]:44724 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1re7pP-0002I6-EC
	for submit <at> debbugs.gnu.org; Sun, 25 Feb 2024 01:17:35 -0500
Received: from 1.mo576.mail-out.ovh.net ([178.33.251.173]:52341)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ngraves@HIDDEN>) id 1re7pI-0002He-JM
 for 69052 <at> debbugs.gnu.org; Sun, 25 Feb 2024 01:17:35 -0500
Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.2.23])
 by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4TjCxr3XDxz1bQM
 for <69052 <at> debbugs.gnu.org>; Sun, 25 Feb 2024 06:09:20 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-ktckq (unknown [10.110.168.217])
 by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 1A1191FE31;
 Sun, 25 Feb 2024 06:09:20 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.99])
 by ghost-submission-6684bf9d7b-ktckq with ESMTPSA
 id PkYmAZDZ2mVp3AMA7T8CUA
 (envelope-from <ngraves@HIDDEN>); Sun, 25 Feb 2024 06:09:20 +0000
Authentication-Results: garm.ovh; auth=pass
 (GARM-99G0034e965860-e0ec-47b6-8286-0aa33f5376a4,
 4509C5E329872615F480F5A600A0A9244583909F) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 176.179.131.100
From: Nicolas Graves <ngraves@HIDDEN>
To: 69052 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: guix: Correct home-channels-service-type extension
 logic.
Date: Sun, 25 Feb 2024 07:09:14 +0100
Message-ID: <20240225060917.12152-1-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 15677030305456644834
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrfeelgdeltdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepteevheffvedvgfdttdehvdfhgeeugfegffetteeuleeivdfhhfejgeduheelgeehnecukfhppeduvdejrddtrddtrddupddujeeirddujeelrddufedurddutddtpdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieeltdehvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 69052
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/home/services/guix.scm
(extend-channel-list): Add function.
(home-channels-service-type)[extend]: Use extend-channel-list.

Change-Id: I587207b86216f075a54b6ed0b8fa998896bbed74
---
 gnu/home/services/guix.scm | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/gnu/home/services/guix.scm b/gnu/home/services/guix.scm
index 819b20b6c9..1b33fc2865 100644
--- a/gnu/home/services/guix.scm
+++ b/gnu/home/services/guix.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2022 Reily Siegel <mail@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,8 +23,24 @@ (define-module (gnu home services guix)
   #:use-module (guix gexp)
   #:use-module (ice-9 pretty-print)
   #:use-module (srfi srfi-1)
+  #:use-module (ice-9 match)
   #:export (home-channels-service-type))
 
+(define (channel-name-symbol channel)
+  (match (channel-name channel)
+    ((? symbol? name) name)
+    ((? string? name) (string->symbol name))))
+
+(define (extend-channel-list default new)
+  "Prepend the channels in NEW by the channels in DEFAULT if their
+channel-name is not in NEW."
+  (fold-right
+   (lambda (channel acc)
+     (if (member (channel-name channel) (map channel-name-symbol acc))
+         acc
+         (cons channel acc)))
+   new default))
+
 (define (channels-xdg-files channels)
   `(("guix/channels.scm"
      ,(plain-file
@@ -37,7 +54,7 @@ (define home-channels-service-type
    (name 'home-channels)
    (default-value %default-channels)
    (compose concatenate)
-   (extend append)
+   (extend extend-channel-list)
    (extensions
     (list (service-extension home-xdg-configuration-files-service-type
                              channels-xdg-files)))
-- 
2.41.0
Information forwarded to guix-patches@HIDDEN:
bug#69052; Package guix-patches. Full text available.

Message received at 69052 <at> debbugs.gnu.org:


Received: (at 69052) by debbugs.gnu.org; 11 Feb 2024 17:28:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 11 12:28:19 2024
Received: from localhost ([127.0.0.1]:33688 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rZDcp-0000Y6-GF
	for submit <at> debbugs.gnu.org; Sun, 11 Feb 2024 12:28:19 -0500
Received: from 5.mo576.mail-out.ovh.net ([46.105.43.105]:39019)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ngraves@HIDDEN>) id 1rZDcn-0000Xs-0K
 for 69052 <at> debbugs.gnu.org; Sun, 11 Feb 2024 12:28:18 -0500
Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.25.134])
 by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4TXvVx5lHLz1SPD
 for <69052 <at> debbugs.gnu.org>; Sun, 11 Feb 2024 17:20:41 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-c95st (unknown [10.110.168.219])
 by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A6F891FD5C
 for <69052 <at> debbugs.gnu.org>; Sun, 11 Feb 2024 17:20:41 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.98])
 by ghost-submission-6684bf9d7b-c95st with ESMTPSA
 id OysnJukByWWy8gsACarBAA (envelope-from <ngraves@HIDDEN>)
 for <69052 <at> debbugs.gnu.org>; Sun, 11 Feb 2024 17:20:41 +0000
Authentication-Results: garm.ovh; auth=pass
 (GARM-98R0026ccedf8d-93e0-4803-973a-65c3ef42ee1b,
 3432A98B6F31DB2F38D9EC044687C2FFF3C1A3CB) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 90.110.172.34
From: Nicolas Graves <ngraves@HIDDEN>
To: 69052 <at> debbugs.gnu.org
Subject: Light rework needed
Date: Sun, 11 Feb 2024 18:20:41 +0100
Message-ID: <87a5o6hq8m.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Ovh-Tracer-Id: 137641266085290633
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledruddugddutddvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffufffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepueejleeileejfffhleetjedtleejheevudffleevgfdufeekhefgvddvveegveefnecukfhppeduvdejrddtrddtrddupdeltddruddutddrudejvddrfeegpdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieeltdehvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 69052
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)


If that's not straightforward: this patch allows the service to accept
an additional guix channel which replaces the default in this
case. Currently the default was to append, thus you could not use
another guix channel (a local guix for instance).

I've seen that a light rework is necessary. This is due to the fact that
a channel name can be both a symbol and a string, we thus need to ensure
that the (member ...) comparison is properly done if the user uses
strings instead of symbols in channel definition. 

-- 
Best regards,
Nicolas Graves
Information forwarded to guix-patches@HIDDEN:
bug#69052; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 11 Feb 2024 13:41:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 11 08:41:13 2024
Received: from localhost ([127.0.0.1]:47863 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rZA53-0007Qx-0B
	for submit <at> debbugs.gnu.org; Sun, 11 Feb 2024 08:41:13 -0500
Received: from lists.gnu.org ([2001:470:142::17]:47588)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <ngraves@HIDDEN>) id 1rZA50-0007Qb-Uh
 for submit <at> debbugs.gnu.org; Sun, 11 Feb 2024 08:41:11 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ngraves@HIDDEN>)
 id 1rZ9D0-00008q-5E
 for guix-patches@HIDDEN; Sun, 11 Feb 2024 07:45:27 -0500
Received: from 8.mo550.mail-out.ovh.net ([178.33.110.239])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ngraves@HIDDEN>)
 id 1rZ9Cx-0000gp-Fs
 for guix-patches@HIDDEN; Sun, 11 Feb 2024 07:45:20 -0500
Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.9.77])
 by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4TXnP02dyvz15hr
 for <guix-patches@HIDDEN>; Sun, 11 Feb 2024 12:45:08 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-8l2p2 (unknown [10.110.113.47])
 by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 070141FE64;
 Sun, 11 Feb 2024 12:45:07 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.105])
 by ghost-submission-6684bf9d7b-8l2p2 with ESMTPSA
 id TC11IlPByGUJYAUA/wLe2w
 (envelope-from <ngraves@HIDDEN>); Sun, 11 Feb 2024 12:45:07 +0000
Authentication-Results: garm.ovh; auth=pass
 (GARM-105G0060fc1616a-e5ab-4cc5-8b1b-9a5345f1f72e,
 3432A98B6F31DB2F38D9EC044687C2FFF3C1A3CB) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 90.110.172.34
From: Nicolas Graves <ngraves@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: guix: Correct home-channels-service-type extension logic.
Date: Sun, 11 Feb 2024 13:44:22 +0100
Message-ID: <20240211124505.15924-1-ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 13930759547481613026
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledruddugdeghecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepteevheffvedvgfdttdehvdfhgeeugfegffetteeuleeivdfhhfejgeduheelgeehnecukfhppeduvdejrddtrddtrddupdeltddruddutddrudejvddrfeegpdefjedrheelrddugedvrddutdehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht
Received-SPF: pass client-ip=178.33.110.239; envelope-from=ngraves@HIDDEN;
 helo=8.mo550.mail-out.ovh.net
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001,
 RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.7 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * gnu/home/services/guix.scm (extend-channel-list): Add
 function.
 (home-channels-service-type)[extend]: Use extend-channel-list. Change-Id:
 I587207b86216f075a54b6ed0b8fa998896bbed74 --- gnu/home/services/guix.scm
 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 
 Content analysis details:   (1.7 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL
 blocklist [URIs: reilysiegel.com]
 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL
 blocklist [URIs: reilysiegel.com]
 1.0 SPF_SOFTFAIL           SPF: sender does not match SPF record (softfail)
 -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
X-Debbugs-Envelope-To: submit
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.7 (/)

* gnu/home/services/guix.scm
(extend-channel-list): Add function.
(home-channels-service-type)[extend]: Use extend-channel-list.

Change-Id: I587207b86216f075a54b6ed0b8fa998896bbed74
---
 gnu/home/services/guix.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/home/services/guix.scm b/gnu/home/services/guix.scm
index 819b20b6c9..3702976496 100644
--- a/gnu/home/services/guix.scm
+++ b/gnu/home/services/guix.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2022 Reily Siegel <mail@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +25,16 @@ (define-module (gnu home services guix)
   #:use-module (srfi srfi-1)
   #:export (home-channels-service-type))
 
+(define (extend-channel-list default new)
+  "Prepend the channels in NEW by the channels in DEFAULT if their
+channel-name is not in NEW."
+  (fold-right
+   (lambda (channel acc)
+     (if (member (channel-name channel) (map channel-name acc))
+         acc
+         (cons channel acc)))
+   new default))
+
 (define (channels-xdg-files channels)
   `(("guix/channels.scm"
      ,(plain-file
@@ -37,7 +48,7 @@ (define home-channels-service-type
    (name 'home-channels)
    (default-value %default-channels)
    (compose concatenate)
-   (extend append)
+   (extend extend-channel-list)
    (extensions
     (list (service-extension home-xdg-configuration-files-service-type
                              channels-xdg-files)))
-- 
2.41.0
Acknowledgement sent to Nicolas Graves <ngraves@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#69052; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Fri, 29 Mar 2024 22:30:02 UTC

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