From patchwork Sun Oct 10 10:20:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 33731 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 02DD727BBE3; Sun, 10 Oct 2021 11:21:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CD7E827BBE1 for ; Sun, 10 Oct 2021 11:21:57 +0100 (BST) Received: from localhost ([::1]:34308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZVxs-00043i-9Y for patchwork@mira.cbaines.net; Sun, 10 Oct 2021 06:21:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZVx2-0003al-0l for guix-patches@gnu.org; Sun, 10 Oct 2021 06:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42967) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mZVx1-00051C-M9 for guix-patches@gnu.org; Sun, 10 Oct 2021 06:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mZVx1-0003PO-Iz for guix-patches@gnu.org; Sun, 10 Oct 2021 06:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50873] [PATCH 5/7] guix home: import: Delete duplicate modules when importing. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Oct 2021 10:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50873@debbugs.gnu.org Cc: Oleg Pykhalov , Ludovic =?utf-8?q?Court=C3=A8s?= , Andrew Tropin Received: via spool by 50873-submit@debbugs.gnu.org id=B50873.163386124012993 (code B ref 50873); Sun, 10 Oct 2021 10:21:03 +0000 Received: (at 50873) by debbugs.gnu.org; 10 Oct 2021 10:20:40 +0000 Received: from localhost ([127.0.0.1]:54502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZVwe-0003NV-E3 for submit@debbugs.gnu.org; Sun, 10 Oct 2021 06:20:40 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:39824 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZVwd-0003N6-8P for 50873@debbugs.gnu.org; Sun, 10 Oct 2021 06:20:39 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1633861233; bh=MrpFKSnBOheEUP1Gsz6KdE+W7u6iL3Oyhb8moemgALU=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=azTt7zoAjbakto9VyYwiG/eimw2nh9nKO6yFnLEL6iLbRJ3gxnbdBt6kNe4z9iiPN SMdvToN0qXCKXXWjh/JHfMSw89AfKeRhZsyYAWUhxLdCio5gc4f3GASoGo/OGAPFSd vH46nGfv/hLPaMPvn7BgFQk8BPVFSEjv2Gf6weIo= In-Reply-To: References: Message-Id: <2814010aadd95c389a54922958d1f3ffedeec106.1633861021.git.public@yoctocell.xyz> Date: Sun, 10 Oct 2021 12:20:33 +0200 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Two different services might require the same module(s), so delete duplicates when generating the ‘use-modules’ form. * import.scm (manifest->code): Delete duplicate modules. --- guix/scripts/home/import.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/scripts/home/import.scm b/guix/scripts/home/import.scm index 21f762f239..b892ae3dfa 100644 --- a/guix/scripts/home/import.scm +++ b/guix/scripts/home/import.scm @@ -145,7 +145,8 @@ (define (qualified-name entry) `(begin (use-modules (gnu home) (gnu packages) - ,@(concatenate (map cdr configurations+modules))) + ,@((compose delete-duplicates concatenate) + (map cdr configurations+modules))) ,(home-environment-template #:specs specs #:services (map first configurations+modules)))) @@ -188,7 +189,8 @@ (define name (use-modules (guix transformations) (gnu home) (gnu packages) - ,@(concatenate (map cdr configurations+modules))) + ,@((compose delete-duplicates concatenate) + (map cdr configurations+modules))) ,@transformations