From patchwork Sat Apr 13 23:33:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 62955 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D9CAE27BBEA; Sun, 14 Apr 2024 00:34:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4540827BBE9 for ; Sun, 14 Apr 2024 00:34:04 +0100 (BST) 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 Authentication-Results: garm.ovh; auth=pass (GARM-96R0013cb06466-2a29-4cd4-97b2-39cfb199b324, 82F3351341C811DE7EAC1B0F473E4B8A459F10AD) smtp.auth=ngraves@ngraves.fr 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 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 X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)))