From patchwork Sat Aug 26 13:53:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 53230 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 6CB0227BBEA; Sat, 26 Aug 2023 14:54:22 +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=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 E0AC727BBE2 for ; Sat, 26 Aug 2023 14:54:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZtjo-0002fO-0z; Sat, 26 Aug 2023 09:54:04 -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 1qZtjm-0002fA-86 for guix-patches@gnu.org; Sat, 26 Aug 2023 09:54:02 -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 1qZtjl-0001Bh-9J; Sat, 26 Aug 2023 09:54:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qZtjl-0007md-S7; Sat, 26 Aug 2023 09:54:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65550] [PATCH] profiles: Don't propagate inputs for non-development packages. References: <87ttsm828q.fsf@envs.net> In-Reply-To: <87ttsm828q.fsf@envs.net> Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 26 Aug 2023 13:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 65550@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 65550-submit@debbugs.gnu.org id=B65550.169305800329871 (code B ref 65550); Sat, 26 Aug 2023 13:54:01 +0000 Received: (at 65550) by debbugs.gnu.org; 26 Aug 2023 13:53:23 +0000 Received: from localhost ([127.0.0.1]:41885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZtj8-0007lj-Kg for submit@debbugs.gnu.org; Sat, 26 Aug 2023 09:53:22 -0400 Received: from mail.envs.net ([5.199.136.28]:50660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZtj4-0007lX-Ld for 65550@debbugs.gnu.org; Sat, 26 Aug 2023 09:53:21 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 7D4B938A0135; Sat, 26 Aug 2023 13:53:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693057991; bh=XwtRDTysApj3vpS2m97cpoNW3cF1epMbR4eHg4BfUgE=; h=From:To:Cc:Subject:Date:From; b=VGmQ+aL897S3pB4ZL7Ebqw6lhi+GEPZdremt55xzUOSdHLNwaYAiR4bADGmY0BP2r XEAfwoMqNdoRiz987NtbQEurRbUfC8+rs71AtPP9HHRNVP/vjC83FHtle4DgtEZkqG HPnq8aFiO9/n3ssXvmEf2u8Ty995UbX1TpX+l7HKQ9H/0/XcJH9pb/QlximXo+jD2j Cy/CnuCCGzwPB9gNUnCbrEWWwQslRR5kRVJuDU7Bh7nGFt1Bfnr02Vvb6rXgeZ1vPH /mO8HQtPFbED1di4RU4+Kn+0WG1GPIzCAWqTDrazLa0j8PH5r8tmAs8zcwgCNxFHuK rcyS2W5mpKAt/vzlrkfzV+RUgPJjrxYdZR+fEkoKmuO74vyh3LdCVEuTAtnwy74UJ+ /+EeV+4ZFCrSrvZT6FYGLOGqpjNyDQhuBwJdkJWHkarHwhbBfQxhvCSpOnTKcVA8E4 9e3V+N7kcCkelyazUZp3dr7trR2cVqLMuJBJdgs0lIbjQCgh6yhZHSvt/YMKiRb+6P D6sVJPVP5LjRjZLk5vJgWi84UEe8eLFv9XA6VOSpdxfhAKUW+ZAqzTBAyMAFfMyaCZ 8wdo797nub6TT8XFems+X7V2UHk5fKl7tUwVd1IaEVAQQVs7dEpLT22lHbVM3kdz3R sSMdIWhPmA7FpnwZehQoczHk= 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 KCuhsznlm3Mu; Sat, 26 Aug 2023 13:53:07 +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 13:53:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 864af4ec; Sat, 26 Aug 2023 13:53:25 +0000 (UTC) Date: Sat, 26 Aug 2023 21:53:09 +0800 Message-ID: <1f7f85189b17ebddb6d0e26afd7c5fad88c997e9.1693057951.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 From: 宋文武 * guix/profiles.scm (package->manifest-entry): 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/profiles.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) base-commit: 98a8666a0cbf33e24efff615243b98144a92c950 diff --git a/guix/profiles.scm b/guix/profiles.scm index fea766879d..9ed81dec4d 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -390,7 +390,14 @@ (define* (package->manifest-entry package #:optional (output "out") ((label package output) (package->manifest-entry package output #:parent (delay entry)))) - (package-propagated-inputs package))) + ;; 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)) + (equal? "dev" output) + (equal? "out" output)) + (package-propagated-inputs package) + '()))) (entry (manifest-entry (name (package-name package)) (version (package-version package))