From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id aL0eAm0WG2Z0DwAAqHPOHw:P1 (envelope-from ) for ; Sun, 14 Apr 2024 01:34:05 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id aL0eAm0WG2Z0DwAAqHPOHw (envelope-from ) for ; Sun, 14 Apr 2024 01:34:05 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1713051244; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=/sAkY+jsO5cxFAwnIq/+S83h08fd76xIM77szl0RFNo=; b=b0i0pULpzcNcUYBrfeZHPDG77MMULgFMOf9rUSeAGXxxl04CbXMyui9RNrWw0Ko9wjHUzA dWbg4eJiWu7EM28uJjxB2nyRANzw1n3w4LFOYAnZ8WvT0v8aqqJcZW0VRMBMAmqNdSvmy8 AkxSQGD7LfYgDfur5aAQYGy1BL0xOQ5X+pw6e+RJbMcwSv7cD1MiTK2K7RcBS7eA0HeDYH LHeIfHEIAFsw0LxsqGmLV9DcW6QY//HfYt/sKqyEpbcFUQZwWzhEhH4YrW+q8eJixbmxZL CMmNX059U25Xc6Z3aF/IWKKQm3nUexOARXUKp1dJ2JKzt4qJnd8a+zLwA1HkGw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1713051244; a=rsa-sha256; cv=none; b=EBx8rRafdtvUFGXnZmL1FSUFldVcGndX3St+HacBsZdcNZZL/rw5ooEgfP6KZAmjQSbVVS DpQSY2m5YoDlgRuixky63gwDdW+9P5ZxyKJFdTwmDY2WRtVsLu49LceobxPQD0ctfd5CQR 2Gk83eYagCoDzufrDWpzDRgg4b7uOEkUyphRFRrfKkbNi0DF6OHTvvJlgN4Z8Hbb+CFN9A 3DMMmZNSKPdrjhac7htI20nODXATDyLsnjuthbfP3lcR5Z7WF+3fVpBEN6tRlWo1cNxZu7 9mQ9iZnks0QUapOeJlCOHsKsK0Qvo/MDzmv5h6hp9YtBmxhuG80LQ6r6EQgPBg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BD54F10CC for ; Sun, 14 Apr 2024 01:34:04 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvmsd-0005lp-2Q; Sat, 13 Apr 2024 19:33:55 -0400 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 ) id 1rvmsa-0005lR-Qy for guix-patches@gnu.org; Sat, 13 Apr 2024 19:33:52 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvmsa-0008D2-Ih for guix-patches@gnu.org; Sat, 13 Apr 2024 19:33:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rvmsk-0007xb-W4 for guix-patches@gnu.org; Sat, 13 Apr 2024 19:34:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69052] [PATCH v3] gnu: guix: Correct home-channels-service-type extension logic. References: <20240211124505.15924-1-ngraves@ngraves.fr> In-Reply-To: <20240211124505.15924-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Apr 2024 23:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69052 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: 69052@debbugs.gnu.org Cc: ludo@gnu.org, ngraves@ngraves.fr Received: via spool by 69052-submit@debbugs.gnu.org id=B69052.171305122130346 (code B ref 69052); Sat, 13 Apr 2024 23:34:02 +0000 Received: (at 69052) by debbugs.gnu.org; 13 Apr 2024 23:33:41 +0000 Received: from localhost ([127.0.0.1]:33972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvmsN-0007t5-9i for submit@debbugs.gnu.org; Sat, 13 Apr 2024 19:33:40 -0400 Received: from 3.mo576.mail-out.ovh.net ([188.165.52.203]:33759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvmsI-0007rp-TW for 69052@debbugs.gnu.org; Sat, 13 Apr 2024 19:33:37 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.17.203]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4VH8rL31TGz1g4T for <69052@debbugs.gnu.org>; Sat, 13 Apr 2024 23:33:22 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-v458s (unknown [10.111.174.124]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id CAEFD1FE33; Sat, 13 Apr 2024 23:33:21 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-6684bf9d7b-v458s with ESMTPSA id VmqaLEEWG2ZeRQAA2N7XFA (envelope-from ); Sat, 13 Apr 2024 23:33:21 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Sun, 14 Apr 2024 01:33:04 +0200 Message-ID: <20240413233315.14875-1-ngraves@ngraves.fr> 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: 1603844420596130525 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeijedguddtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffogggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeetveehffevvdfgtddthedvhfeguefggeffteetueeliedvhffhjeegudehleegheenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiledthedvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeipdhmohguvgepshhmthhpohhuth X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.88 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -6.88 X-Migadu-Queue-Id: BD54F10CC X-TUID: KvXbcAdu02yQ * 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 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/home/services/guix.scm b/gnu/home/services/guix.scm index 819b20b6c9..d31d3126bb 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 +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,12 @@ (define-module (gnu home services guix) #:use-module (srfi srfi-1) #:export (home-channels-service-type)) +(define (extend-channel-list initial new) + (delete-duplicates + (append initial new) + (lambda (channel1 channel2) + (eq? (channel-name channel1) (channel-name channel2))))) + (define (channels-xdg-files channels) `(("guix/channels.scm" ,(plain-file @@ -37,7 +44,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