From patchwork Sun Feb 25 06:09:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 61092 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 D89A627BBE9; Sun, 25 Feb 2024 06:17:57 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 0A82727BBE2 for ; Sun, 25 Feb 2024 06:17:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1re7pU-0004fJ-DJ; Sun, 25 Feb 2024 01:17:40 -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 1re7pS-0004f8-H8 for guix-patches@gnu.org; Sun, 25 Feb 2024 01:17:38 -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 1re7pS-0006S6-8t for guix-patches@gnu.org; Sun, 25 Feb 2024 01:17:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1re7pq-0002Jf-N5 for guix-patches@gnu.org; Sun, 25 Feb 2024 01:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69052] [PATCH v2] 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: Sun, 25 Feb 2024 06:18: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: patch To: 69052@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 69052-submit@debbugs.gnu.org id=B69052.17088418568817 (code B ref 69052); Sun, 25 Feb 2024 06:18:02 +0000 Received: (at 69052) by debbugs.gnu.org; 25 Feb 2024 06:17:36 +0000 Received: from localhost ([127.0.0.1]:44724 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1re7pP-0002I6-EC for submit@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 ) id 1re7pI-0002He-JM for 69052@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@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 ); Sun, 25 Feb 2024 06:09:20 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G0034e965860-e0ec-47b6-8286-0aa33f5376a4, 4509C5E329872615F480F5A600A0A9244583909F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.131.100 Date: Sun, 25 Feb 2024 07:09:14 +0100 Message-ID: <20240225060917.12152-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 15677030305456644834 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrfeelgdeltdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepteevheffvedvgfdttdehvdfhgeeugfegffetteeuleeivdfhhfejgeduheelgeehnecukfhppeduvdejrddtrddtrddupddujeeirddujeelrddufedurddutddtpdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieeltdehvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht 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 | 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 +;;; Copyright © 2024 Nicolas Graves ;;; ;;; 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)))