From patchwork Tue Jul 25 18:04:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Hallsby X-Patchwork-Id: 52185 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 EEF3927BBE9; Tue, 25 Jul 2023 19:06:25 +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 3734C27BBE2 for ; Tue, 25 Jul 2023 19:06:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOMQL-0007qi-QJ; Tue, 25 Jul 2023 14:06:17 -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 1qOMQD-0007id-Ub for guix-patches@gnu.org; Tue, 25 Jul 2023 14:06:11 -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 1qOMQC-0001jn-Sv; Tue, 25 Jul 2023 14:06:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qOMQ6-0008Jr-54; Tue, 25 Jul 2023 14:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64861] [PATCH] guix: Add lint check for guix as propagated-input Resent-From: Karl Hallsby Original-Sender: "Debbugs-submit" Resent-CC: mail@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: Tue, 25 Jul 2023 18:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64861 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64861@debbugs.gnu.org Cc: Karl Hallsby , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org 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 submit@debbugs.gnu.org id=B.169030834231949 (code B ref -1); Tue, 25 Jul 2023 18:06:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jul 2023 18:05:42 +0000 Received: from localhost ([127.0.0.1]:46920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOMPl-0008JF-IR for submit@debbugs.gnu.org; Tue, 25 Jul 2023 14:05:41 -0400 Received: from lists.gnu.org ([2001:470:142::17]:42178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOMPj-0008J2-Hm for submit@debbugs.gnu.org; Tue, 25 Jul 2023 14:05:40 -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 1qOMPc-00059a-BS for guix-patches@gnu.org; Tue, 25 Jul 2023 14:05:33 -0400 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qOMPa-0001aU-KJ for guix-patches@gnu.org; Tue, 25 Jul 2023 14:05:32 -0400 Received: by mail-qk1-x72e.google.com with SMTP id af79cd13be357-76c4890a220so166872885a.3 for ; Tue, 25 Jul 2023 11:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hallsby.com; s=google; t=1690308328; x=1690913128; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Us5bBGdVGqarFjcvlUCXkJvAX9reMuPbZJ8HYWet8+g=; b=RhXJvGQM2jRRwbybvbUf6qPOwoDi20FH5ARmvKHm8NSUrchs4twihStMptbjB6smwj Xr+s2Mf2wwVnhliJoadDER58tDBi7YBvaaqr/kJ+7s89J5eu4QJR1wPKjpwG5xZmaeYR O+vlHN6oWJtte+jkGuzijy1egJy6mxg+I9QDU3kY88wyTZd4Cuw1WwkGKOXb8kSz1/Kj XSflh8oW/lZE/k6xdkiRfQ6J5CevS783kLFehPbj+SF2MAnm3I2oJ84FEvMGdSBwkANe QOGSi49OnbzEqrS0CglgXacFYsh5xwFpYcT+ONsh0LItpdJx+HQp8pa35TogySKjAJNZ 6pZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690308328; x=1690913128; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Us5bBGdVGqarFjcvlUCXkJvAX9reMuPbZJ8HYWet8+g=; b=hIvUNP6UJ5+UEmPtr1CJH3ob2T41ZX2ngM7cVGbt2C/rIvp3uGGlz2aM9npgOu2xtt Eh2dn5ZWYR2T1muNiyc7UXNXBNHoVzivjcq1dgSsMcM5OVBj3H9XWhpaphfPIbR68pWf NnlGEiGL2+r+BXkWqO1SO3k3HYs4TqaCCoVrTSRGnEr2si9pzyHSAg/ERWk9FY7NCEyb SfuiOdjgsN19SBmTcy/8VBaRm3jStUi/Op9aTyVA4Are0v07yW4jrpd1Rxo6csdYPxkl i+qQg+ScZRnncsq7EqfHzIo8GFG40JRHZBhhKE/l7pXX/Oj16y1ztzi0JcpKrEWO47td vR+Q== X-Gm-Message-State: ABy/qLa/WKtXN3dVA9nCbBVpZv0YtwzSJKMWXjvq6HZCU7UjzJxNT+oo F7EzBpWi3hhJjqtnNA6NazlQGBYqYrOQdE3ipgnIpA== X-Google-Smtp-Source: APBJJlFPL65ipNtupeeOTbJrTtH7T2S+XrgBb7iNnCehS9wRuc2kCVPw9s+5sQHfeBfS8KsM7h08Hg== X-Received: by 2002:a05:620a:2a01:b0:765:5982:81da with SMTP id o1-20020a05620a2a0100b00765598281damr4662589qkp.47.1690308328387; Tue, 25 Jul 2023 11:05:28 -0700 (PDT) Received: from Karl-Desktop.raven (1459483-v115.1145-static.batvilaa.metronetinc.net. [192.69.181.148]) by smtp.gmail.com with ESMTPSA id g28-20020a05620a13dc00b0076730d0b0b9sm3832433qkl.14.2023.07.25.11.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 11:05:27 -0700 (PDT) Date: Tue, 25 Jul 2023 13:04:43 -0500 Message-Id: <388dc9bec6dabc97092eb2009fed304c3f84c6fc.1690308209.git.karl@hallsby.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::72e; envelope-from=karl@hallsby.com; helo=mail-qk1-x72e.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, 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: Karl Hallsby X-ACL-Warn: , Karl Hallsby via Guix-patches X-Patchwork-Original-From: Karl Hallsby via Guix-patches via From: Karl Hallsby 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/lint.scm (new check): Run lint check warning user if the provided package uses guix as a propagated-input. Passing guix as a propagated-input is problematic when users install a package into their profiles. This can cause the guix propagated by the package to be used in preference of the real one in $HOME/.config/. It was first noticed on IRC with https://logs.guix.gnu.org/guix/2023-07-22.log#044534, and reproduced with a different package https://logs.guix.gnu.org/guix/2023-07-25.log#054737. --- guix/lint.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) base-commit: 9ff1e7652a407b88a3eeeab6a67261f6fee40807 diff --git a/guix/lint.scm b/guix/lint.scm index d173563e51..5fae34ca22 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -575,6 +575,16 @@ (define (check-input-labels package) (inputs ,package-inputs) (propagated-inputs ,package-propagated-inputs)))) +(define (check-guix-propagated-inputs package) + (if (and (not (null? (package-propagated-inputs package))) + (not (memq (@ (gnu packages package-management) guix) + (package-propagated-inputs package)))) + (list + (make-warning package + (G_ "are you sure guix should be a propagated-input?") + #:field 'propagated-inputs)) + '())) + (define (report-wrap-program-error package wrapper-name) "Warn that \"bash-minimal\" is missing from 'inputs', while WRAPPER-NAME requires it." @@ -1884,6 +1894,10 @@ (define %local-checkers (name 'input-labels) (description "Identify input labels that do not match package names") (check check-input-labels)) + (lint-checker + (name 'warn-guix-propagated-inputs) + (description "Emit warning if guix package is propagated-input") + (check check-guix-propagated-inputs)) (lint-checker (name 'wrapper-inputs) (description "Make sure 'wrap-program' can finds its interpreter.")