From patchwork Tue Dec 19 09:08:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 57706 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 B6B2027BBEA; Tue, 19 Dec 2023 09:10:18 +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=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 EEA6B27BBE2 for ; Tue, 19 Dec 2023 09:10:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFW6z-0004Dw-QG; Tue, 19 Dec 2023 04:10:01 -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 1rFW6y-0004Bd-2M for guix-patches@gnu.org; Tue, 19 Dec 2023 04:10:00 -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 1rFW6x-0006Ts-Q7 for guix-patches@gnu.org; Tue, 19 Dec 2023 04:09:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFW6z-00054K-Uj for guix-patches@gnu.org; Tue, 19 Dec 2023 04:10:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67895] [PATCH] build-system/composer: Do not try to delete-duplicates. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Dec 2023 09:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67895 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67895@debbugs.gnu.org Cc: ludo@gnu.org, ngraves@ngraves.fr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170297695019304 (code B ref -1); Tue, 19 Dec 2023 09:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Dec 2023 09:09:10 +0000 Received: from localhost ([127.0.0.1]:34399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFW6A-00051H-4r for submit@debbugs.gnu.org; Tue, 19 Dec 2023 04:09:10 -0500 Received: from lists.gnu.org ([2001:470:142::17]:55296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFW67-00050j-NK for submit@debbugs.gnu.org; Tue, 19 Dec 2023 04:09:08 -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 1rFW5z-0003mj-MM for guix-patches@gnu.org; Tue, 19 Dec 2023 04:08:59 -0500 Received: from 7.mo560.mail-out.ovh.net ([188.165.48.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFW5y-0006Pd-2Y for guix-patches@gnu.org; Tue, 19 Dec 2023 04:08:59 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.17.154]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 2CCF52C233 for ; Tue, 19 Dec 2023 09:08:54 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-zpf47 (unknown [10.110.178.126]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id DBF301FE64; Tue, 19 Dec 2023 09:08:53 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-6684bf9d7b-zpf47 with ESMTPSA id yvz2MqVdgWXtMgAAom12ow (envelope-from ); Tue, 19 Dec 2023 09:08:53 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R006b74640e5-b7ef-4115-acf3-9b2997a8e00c, 0A183DEDD9F7D7733B4F13041BD52F66DC821FED) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Tue, 19 Dec 2023 10:08:47 +0100 Message-ID: <20231219090848.13042-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 6748081093695824605 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvddutddgtdduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutdeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht Received-SPF: pass client-ip=188.165.48.182; envelope-from=ngraves@ngraves.fr; helo=7.mo560.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.001, RCVD_IN_MSPIKE_WL=0.001, 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 * guix/build-system/composer.scm (create-autoload): Do not use the delete-duplicates function, stale code that should have been removed in an earlier cleanup. Change-Id: I778c1cfba7ef8de16a1ba297b583595b391b7e00 --- guix/build/composer-build-system.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/guix/build/composer-build-system.scm b/guix/build/composer-build-system.scm index 8896384e0a..8d7d43236e 100644 --- a/guix/build/composer-build-system.scm +++ b/guix/build/composer-build-system.scm @@ -191,13 +191,11 @@ (define* (create-autoload vendor composer-file inputs #:key dev-dependencies?) (cons* (string-join (string-split key #\\) "\\\\") (append-map (lambda (v) (list vendor v)) vals))))) (_ (format #t ""))) - (delete-duplicates - (append - (composer-autoload-psr-4 autoload) - (if (and dev-dependencies? (not (null? autoload-dev))) - (composer-autoload-psr-4 autoload-dev) - '())) - '())) + (append + (composer-autoload-psr-4 autoload) + (if (and dev-dependencies? (not (null? autoload-dev))) + (composer-autoload-psr-4 autoload-dev) + '()))) (for-each (lambda (psr0) (match psr0