From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id AKukFM4myF8sLgAA0tVLHw (envelope-from ) for ; Wed, 02 Dec 2020 23:44:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +HpjEM4myF+8DQAAbx9fmQ (envelope-from ) for ; Wed, 02 Dec 2020 23:44:14 +0000 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 F08679402A7 for ; Wed, 2 Dec 2020 23:44:13 +0000 (UTC) Received: from localhost ([::1]:54794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkbnA-00032u-Sz for larch@yhetil.org; Wed, 02 Dec 2020 18:44:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkbm3-0002nU-80 for bug-guix@gnu.org; Wed, 02 Dec 2020 18:43:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54368) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kkbm2-00073z-Vd for bug-guix@gnu.org; Wed, 02 Dec 2020 18:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kkbm2-0007ls-TW for bug-guix@gnu.org; Wed, 02 Dec 2020 18:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#23874: [PATCH v2 2/2] profiles: Delete duplicate manifest entries in packages->manifest. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 02 Dec 2020 23:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23874 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 23874@debbugs.gnu.org Received: via spool by 23874-submit@debbugs.gnu.org id=B23874.160695255629836 (code B ref 23874); Wed, 02 Dec 2020 23:43:02 +0000 Received: (at 23874) by debbugs.gnu.org; 2 Dec 2020 23:42:36 +0000 Received: from localhost ([127.0.0.1]:37680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkblb-0007l9-Lq for submit@debbugs.gnu.org; Wed, 02 Dec 2020 18:42:35 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:17055) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkblW-0007kl-B4 for 23874@debbugs.gnu.org; Wed, 02 Dec 2020 18:42:34 -0500 Received: from localhost.localdomain (217-149-166-73.nat.highway.telekom.at [217.149.166.73]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4Cmb9c1rQWz1LBN4; Thu, 3 Dec 2020 00:42:28 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4Cmb9c1rQWz1LBN4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1606952548; bh=9J+UFuruH97MWTMGlTpefPXGgXNPOzKMAnDDkJ3z8qo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VEW5JpgUynxBVJIV5padIPyHqsfQ9HzC40qJgpESd1DYA3EBdiG+SIu4dI7Q+jx4X cEgZ9N++k83+h7m4EGg1UU5Qufb7t56yNksgEK+HAPHL7kgP9deOanbcr7pGxUQ5/C yEAqdLd1deZhVb+8ibiru27BmTTQ7DdUEKSK4m+M= From: Leo Prikler Date: Thu, 3 Dec 2020 00:39:03 +0100 Message-Id: <20201202233901.12902-2-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201202233901.12902-1-leo.prikler@student.tugraz.at> References: <20201202233901.12902-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 3.82 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=tugraz.at header.s=mailrelay header.b=VEW5JpgU; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: F08679402A7 X-Spam-Score: 3.82 X-Migadu-Scanner: ns3122888.ip-94-23-21.eu X-TUID: gtoH5waLclTH * gnu/profiles.scm (packages->manifest): Delete duplicate entries. --- guix/profiles.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index 034591eb79..59a313ea08 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -399,22 +399,24 @@ denoting a specific output of a package." 'inferior-package->manifest-entry)) (manifest - (map (match-lambda - (((? package? package) output) - (package->manifest-entry package output)) - ((? package? package) - (package->manifest-entry package)) - ((thing output) - (if inferiors-loaded? - ((inferior->entry) thing output) - (throw 'wrong-type-arg 'packages->manifest - "Wrong package object: ~S" (list thing) (list thing)))) - (thing - (if inferiors-loaded? - ((inferior->entry) thing) - (throw 'wrong-type-arg 'packages->manifest - "Wrong package object: ~S" (list thing) (list thing))))) - packages))) + (delete-duplicates + (map (match-lambda + (((? package? package) output) + (package->manifest-entry package output)) + ((? package? package) + (package->manifest-entry package)) + ((thing output) + (if inferiors-loaded? + ((inferior->entry) thing output) + (throw 'wrong-type-arg 'packages->manifest + "Wrong package object: ~S" (list thing) (list thing)))) + (thing + (if inferiors-loaded? + ((inferior->entry) thing) + (throw 'wrong-type-arg 'packages->manifest + "Wrong package object: ~S" (list thing) (list thing))))) + packages) + manifest-entry=?))) (define (manifest->gexp manifest) "Return a representation of MANIFEST as a gexp." -- 2.29.2