From patchwork Sat Aug 26 11:36:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?5a6L5paH5q2m?= X-Patchwork-Id: 53229 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 5771F27BBEA; Sat, 26 Aug 2023 12:37:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 17F4127BBE2 for ; Sat, 26 Aug 2023 12:37:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZrb9-00023j-Au; Sat, 26 Aug 2023 07:36:59 -0400 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 1qZrb7-000233-Eh for guix-patches@gnu.org; Sat, 26 Aug 2023 07:36:57 -0400 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 1qZrb7-0008EX-69 for guix-patches@gnu.org; Sat, 26 Aug 2023 07:36:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qZrbC-0007Sx-6I for guix-patches@gnu.org; Sat, 26 Aug 2023 07:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65550] Don't add propagated-inputs for all outputs Resent-From: =?utf-8?b?5a6L5paH5q2m?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Aug 2023 11:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 65550@debbugs.gnu.org Cc: guix-devel@gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169304979328657 (code B ref -1); Sat, 26 Aug 2023 11:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Aug 2023 11:36:33 +0000 Received: from localhost ([127.0.0.1]:41808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZrai-0007S9-NN for submit@debbugs.gnu.org; Sat, 26 Aug 2023 07:36:33 -0400 Received: from lists.gnu.org ([2001:470:142::17]:33252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZrae-0007Ru-Co for submit@debbugs.gnu.org; Sat, 26 Aug 2023 07:36:31 -0400 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 1qZraT-0001sG-E4; Sat, 26 Aug 2023 07:36:17 -0400 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZraQ-0008AK-5S; Sat, 26 Aug 2023 07:36:17 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 7AAC038A0135; Sat, 26 Aug 2023 11:36:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693049762; bh=dWqCtB6ude7otmAza3mZgG2YQdQSabxBvnFsBys4TQI=; h=From:To:Cc:Subject:Date:From; b=gCL7PXy6YS4TaqNPvDuXylH2DX/NfG0BSuQbtp3BembyLYFGbHiDmCcEomXwLgQBa aRAEsHPuOTOExu/EsSRbyuEdS14boTOUXaGRnVtkr/YVFpPIlaDBR0Vq8tmlkZO/Yq +eOlj7nNBlgsRIsDLukG3UeZtfUMsIj9++flgaZc0B1iGXTOwq2nxq4E34MTkXJ9U+ rOs+ighZm014K67Qr3jGbYd027t9kmx1n8Tebws2Vv4A9q0GRKjY2rFobtiFVObxt2 gcQ+LDz6j+P3pkhSpVjVLzT9PSqywFlhZ6LZKtK6YE6spdst51CdsvoYzCC6bUP1Jm I8gcVLoXTl/gSoQ7aGUPW9jJmnnzvAHZhE04jECfOZV1rG547LQMWVxm7F4WrTaby+ fM6A4biB6oqv0EM//LBOjkif4BHRGdfg/N7JRE7EHg9Smlvpf5+yc3aeHB3+WNrLHr 386hfZYT43PRIjHZRFgTTwF2MCWoQVFvUfsUdB/Inl38Y4p24q6ZvjJsJuLt9Idyzr slBXQz/JduTkZaYTK3FCCaUy4PtapPjZtPBp49gWZJLx8U3fyxmehaNAesEGc1WETM Ljt0+S0qCA+hFEpUhNDSCX7S8uKxzpyJBuQ0AAvfX7+140/cl7YSJCuo79saSTc+4K K3eKMh38clzTY+xwcLwJQZSI= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id zXFci15z9Pa6; Sat, 26 Aug 2023 11:35:59 +0000 (UTC) Received: from localhost (unknown [36.170.44.50]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sat, 26 Aug 2023 11:35:58 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 4f4efede; Sat, 26 Aug 2023 11:36:05 +0000 (UTC) Date: Sat, 26 Aug 2023 19:36:05 +0800 Message-ID: <87ttsm828q.fsf@envs.net> MIME-Version: 1.0 Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 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: =?utf-8?b?5a6L5paH5q2m?= X-ACL-Warn: , =?utf-8?b?5a6L5paH5q2mIHZpYSBHdWl4LXBhdGNoZXM=?= X-Patchwork-Original-From: =?utf-8?b?5a6L5paH5q2mIHZpYSBHdWl4LXBhdGNoZXM=?= via From: =?utf-8?b?5a6L5paH5q2m?= 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 Hello, we have a TODO for "extend `propagated-inputs` with support for multiple outputs". I try to do it for a while, but unable to find a clear way, since add a new syntax for specify output in propagated-inputs require changes in too many places.. Think about the intention, what we want is to avoid unwanted propagated-inputs for building a package or user profiles, and propagated-inputs is mostly used for development packages which requiring headers/libraries from its inputs. It seems I can hardcode the choice here to the "dev" output (if a package have both "dev" and "out", its "out" should considered be an application) or the "out" output (a library/development package). Then the change is straight: Not much benifits now, but i think it will helps when we have more mulitple outputs packages. Also how about add a slimming team aiming to reduce the closure size of packages and system, anyone interested? Thanks. 🥳 From 98a8666a0cbf33e24efff615243b98144a92c950 Mon Sep 17 00:00:00 2001 Message-ID: <98a8666a0cbf33e24efff615243b98144a92c950.1693047369.git.iyzsong@member.fsf.org> From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 26 Aug 2023 18:27:09 +0800 Subject: [PATCH] packages: Don't propagate inputs for non-development package outputs. * guix/packages.scm (transitive-inputs): Only include propagated inputs from a package for its "dev" output, or its "out" output if the package doesn't have a "dev" one. --- guix/packages.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guix/packages.scm b/guix/packages.scm index ba98bb0fb4..435d55de71 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1143,7 +1143,13 @@ (define (transitive-inputs inputs) (loop rest result propagated first? seen) (loop rest (cons input result) - (cons (package-propagated-inputs package) propagated) + ;; Only add propagated inputs for PACKAGE:dev, or PACKAGE:out + ;; when PACKAGE doesn't have a "dev" output. + (if (if (member "dev" (package-outputs package)) + (member "dev" outputs) + (or (null? outputs) (member "out" outputs))) + (cons (package-propagated-inputs package) propagated) + propagated) first? (vhash-consq package outputs seen)))) ((input rest ...) base-commit: eeb71d778f149834015858467fbeeb1276d96d1d -- 2.41.0