From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 8JCxDthD42VmhwAAe85BDQ:P1 (envelope-from ) for ; Sat, 02 Mar 2024 16:20:56 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 8JCxDthD42VmhwAAe85BDQ (envelope-from ) for ; Sat, 02 Mar 2024 16:20:56 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=oHqFHqYP; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1709392856; h=from:from:sender:sender: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:dkim-signature; bh=Ue1ycDAjEO/B48fVHHxq9SQn1KOXO4tPJ7QSMslkkok=; b=d5wzW7CvNTv2eMZseFcLJ0O1VM8VOEnGv39nirBjOFud2OwawLb5VIpvbu8HFaZHppqZ0Z iqi1Zq9RyOjqLQeHb04CPqH0iOhrzXLwAy6euKISgvYrq2dyH53PBd4dW7n2OpB9Dl4Tsw CDJojOb8Y5zjvFzDobGIM0c4gbOgYNeECTFxdTMafWoyRF8CIGVc17806VJCJ5OavNH9sG gaZQ09v2PAmESv26swOWTVjwoY/HIAbn/Bn4yex2xQpSiOsdkHs2Ij8MMO1MO0jdSQyMph pLJQo3g6B9SIsSFzFAoeX6rw2QOhz7ilWzzVD6GwZCnPnAQ98k8sUWoZynbJsg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=oHqFHqYP; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1709392856; a=rsa-sha256; cv=none; b=DZ/V5VJ/skhwyZbtoNzy/kAmGDVbd2qmt/qowjdZhSIMSSsg4rtz/gk7kOjRhTqKPcAR4X KaKBSzFe3VxHBCvMTelRvDN/0xHGyxuAZoz4uqQ+gYOM5T/V39rSUzqus20q6IuE0ui35J tdIY+xWo/NhVA8PPYNp+FudUx/SPGYeO/rQ//HlynoTbWk1jIfXiQbz1G5VI9Ant9ZsxvE ZwcBV4CTm/pLcx7luHJ2QJqup0wSjI5ODdLjOZ1atn4SjYnHBP/GDNt02KFf3ncJGd3wm3 +I5zTBR1VX9n99TU/YvnEdeYlmeya9/BNFlfhLHmFxsTm+siV2oXpJK5Y9u7gg== 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 6955239D4D for ; Sat, 2 Mar 2024 16:20:55 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rgRAF-0002VH-20; Sat, 02 Mar 2024 10:20:39 -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 1rgRAB-0002Ut-8L for guix-patches@gnu.org; Sat, 02 Mar 2024 10:20:35 -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 1rgRAA-0002SS-DF for guix-patches@gnu.org; Sat, 02 Mar 2024 10:20:35 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rgRAc-0003pA-H7 for guix-patches@gnu.org; Sat, 02 Mar 2024 10:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69052] [PATCH v2] gnu: guix: Correct home-channels-service-type extension logic. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Mar 2024 15:21: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: Nicolas Graves Cc: 69052@debbugs.gnu.org Received: via spool by 69052-submit@debbugs.gnu.org id=B69052.170939283714660 (code B ref 69052); Sat, 02 Mar 2024 15:21:02 +0000 Received: (at 69052) by debbugs.gnu.org; 2 Mar 2024 15:20:37 +0000 Received: from localhost ([127.0.0.1]:39170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgRAC-0003oO-N4 for submit@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 ) id 1rgRA6-0003o2-U4 for 69052@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 ) 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <20240225060917.12152-1-ngraves@ngraves.fr> (Nicolas Graves's message of "Sun, 25 Feb 2024 07:09:14 +0100") References: <20240211124505.15924-1-ngraves@ngraves.fr> <20240225060917.12152-1-ngraves@ngraves.fr> Date: Sat, 02 Mar 2024 16:19:51 +0100 Message-ID: <87a5ngek4o.fsf@gnu.org> 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-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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -7.17 X-Spam-Score: -7.17 X-Migadu-Queue-Id: 6955239D4D X-Migadu-Scanner: mx11.migadu.com X-TUID: i04aoz+Z7wI2 Hi, Nicolas Graves 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.