From patchwork Sun Feb 11 12:44:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 60080 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 7774227BBEA; Sun, 11 Feb 2024 13:42:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 40F9D27BBE9 for ; Sun, 11 Feb 2024 13:42:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZA5c-0008Iv-Md; Sun, 11 Feb 2024 08:41:48 -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 ) id 1rZA5a-0008Il-ST for guix-patches@gnu.org; Sun, 11 Feb 2024 08:41:46 -0500 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 1rZA5a-0002Ti-K3 for guix-patches@gnu.org; Sun, 11 Feb 2024 08:41:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZA5q-0007T3-PO for guix-patches@gnu.org; Sun, 11 Feb 2024 08:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69052] [PATCH] gnu: guix: Correct home-channels-service-type extension logic. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Feb 2024 13:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69052 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69052@debbugs.gnu.org Cc: ngraves@ngraves.fr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170765887328590 (code B ref -1); Sun, 11 Feb 2024 13:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Feb 2024 13:41:13 +0000 Received: from localhost ([127.0.0.1]:47863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZA53-0007Qx-0B for submit@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 ) id 1rZA50-0007Qb-Uh for submit@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 ) id 1rZ9D0-00008q-5E for guix-patches@gnu.org; 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 ) id 1rZ9Cx-0000gp-Fs for guix-patches@gnu.org; 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 ; 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 ); Sun, 11 Feb 2024 12:45:07 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G0060fc1616a-e5ab-4cc5-8b1b-9a5345f1f72e, 3432A98B6F31DB2F38D9EC044687C2FFF3C1A3CB) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.110.172.34 Date: Sun, 11 Feb 2024 13:44:22 +0100 Message-ID: <20240211124505.15924-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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@ngraves.fr; 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-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 | 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 +;;; Copyright © 2024 Nicolas Graves ;;; ;;; 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)))