From patchwork Thu Feb 22 22:56:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 60909 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 3D89027BBE9; Thu, 22 Feb 2024 23:10:45 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 3C61127BBE2 for ; Thu, 22 Feb 2024 23:10:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdIDA-00016U-Ry; Thu, 22 Feb 2024 18:10:40 -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 1rdID9-00016D-Ml for guix-patches@gnu.org; Thu, 22 Feb 2024 18:10:39 -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 1rdID9-0002bC-ES for guix-patches@gnu.org; Thu, 22 Feb 2024 18:10:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdIDW-0002JK-5z; Thu, 22 Feb 2024 18:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69313] [PATCH v2 1/2] gnu: tlpui: Fix location for "defaults.conf". Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 23:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69313 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69313@debbugs.gnu.org Cc: Juliana Sims , Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Received: via spool by 69313-submit@debbugs.gnu.org id=B69313.17086434208762 (code B ref 69313); Thu, 22 Feb 2024 23:11:02 +0000 Received: (at 69313) by debbugs.gnu.org; 22 Feb 2024 23:10:20 +0000 Received: from localhost ([127.0.0.1]:39249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdICm-0002H6-1x for submit@debbugs.gnu.org; Thu, 22 Feb 2024 18:10:19 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:55857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdIBz-0002Dh-OW for 69313@debbugs.gnu.org; Thu, 22 Feb 2024 18:09:28 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id 75B7320004; Thu, 22 Feb 2024 23:08:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1708643319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1TKMCEOYnYHbBd2eqYtZ9kBOdmebshmYyTIiFjX9TOU=; b=A46ZJiPojVYk7IC0MgacjitSBh6UkXp257ZpM1u/oQN1OEnVFLpJ02vQEaoDT1hzwSxWX0 r98OkJEK0ZUdhMfr2ucPAqpwTyGyYoEITqBStrE3+tdPaHoltVtoYMeawkxyj1oylpIhYo 4yywmK3c6GRiVQmcCyQfse+pAUDRlSeorP6KTGh5ZQ3FtV7+B5+I77FxstSNXNjfRbwfi9 kRkBUQGtf6uC+m2gW75eOE+2vMWyUsw2OSrLXVVW4mMnA1qmKQAnIiclRyk+3hDaFU9Bx9 nNjjn//4evpmgQnLHyf8ScpfllecBDMAwvBwLD0W0hyLOzH3ema9WkMbM1PmHw== From: Juliana Sims Date: Thu, 22 Feb 2024 17:56:58 -0500 Message-ID: <6d30d106283a0c75a963d97191b4d76678c0994c.1708642619.git.juli@incana.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87il2gcfvm.fsf@nicolasgoaziou.fr> References: <87il2gcfvm.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 X-GND-Sasl: juli@incana.org 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: , 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 * gnu/packages/linux.scm (tlpui)[arguments]: Fix location for "defaults.conf". Change-Id: I047375f875492aa5c6ef3f9ea673e366f00d89ad --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8eb6d9b7d3..ef225479ca 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7879,7 +7879,7 @@ (define-public tlpui (("\"tlp-stat\"") (string-append "'" tlp-stat "'")) (("/usr/share/tlp/defaults.conf") - (string-append "'" defaults.conf "'"))) + defaults.conf)) (substitute* "ui_config_objects/gtkusblist.py" (("\"lsusb\"") (string-append "'" lsusb "'"))) From patchwork Thu Feb 22 22:56:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 60908 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 796FA27BBEC; Thu, 22 Feb 2024 23:10:14 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 8D94C27BBE9 for ; Thu, 22 Feb 2024 23:10:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdICK-0000tW-5R; Thu, 22 Feb 2024 18:09:48 -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 1rdICE-0000sx-LA for guix-patches@gnu.org; Thu, 22 Feb 2024 18:09:42 -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 1rdICE-0002KZ-8s for guix-patches@gnu.org; Thu, 22 Feb 2024 18:09:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdICY-0002G5-4B; Thu, 22 Feb 2024 18:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69313] [PATCH v2 2/2] gnu: tlpui: Reference inputs directly during build. Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 23:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69313 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69313@debbugs.gnu.org Cc: Juliana Sims , Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Received: via spool by 69313-submit@debbugs.gnu.org id=B69313.17086433548515 (code B ref 69313); Thu, 22 Feb 2024 23:10:02 +0000 Received: (at 69313) by debbugs.gnu.org; 22 Feb 2024 23:09:14 +0000 Received: from localhost ([127.0.0.1]:39159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdIBl-0002DH-Tp for submit@debbugs.gnu.org; Thu, 22 Feb 2024 18:09:14 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:46825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdIBj-0002Ci-89 for 69313@debbugs.gnu.org; Thu, 22 Feb 2024 18:09:12 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id 31C5220008; Thu, 22 Feb 2024 23:08:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1708643320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rF7jlmZ5bRGU6Krtf241BoohRI3tH0q3OnrGlU5zHSg=; b=idRZ1zHLMq3+uoa8qv75tYhSNj3+h+L9FJZeyXy0yjY27Ng5xSGzAAjhF4Hpi+dhzXj5Xg 6eVORgPqotlx/5Gp5hNVpPw7uOhQgvM/KTriUCw+70NIngXiLe7IvIz9PbrOrjfGS+Q+WR T4uKUMBZpaxEqtpDHGCNzdwhWMPHVEbvjN055RuKV2WdpAuGPioqfPXRjoJxq2iJXJLYAn dFmh71P6HbK+0w1vkAPWujItwsB4FgyWWZA+r+wc6/Dw9ujQ0xxcg7FaT/sjn6yB/hHHLr 70/LbmMLIw5NUKliprRkqO2DbUADUqQZU6upx62CNT3NIv5ou5i9xNhAmwupvg== From: Juliana Sims Date: Thu, 22 Feb 2024 17:56:59 -0500 Message-ID: <760260ba9ec62a79c7a52795280f7f158f6d8612.1708642619.git.juli@incana.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87il2gcfvm.fsf@nicolasgoaziou.fr> References: <87il2gcfvm.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 X-GND-Sasl: juli@incana.org 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: , 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 * gnu/packages/linux.scm (tlpui)[arguments]: Reference inputs directly during build. Change-Id: I4c71edff805b700ab3f07ecf88ca633081d75c21 --- gnu/packages/linux.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ef225479ca..3aa02345b4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7868,12 +7868,11 @@ (define-public tlpui (substitute* "setup.py" (("/usr/") "")))) (add-after 'unpack 'set-absolute-locations - (lambda* (#:key inputs #:allow-other-keys) - (let ((defaults.conf - (search-input-file inputs "/share/tlp/defaults.conf")) - (lspci (search-input-file inputs "/bin/lspci")) - (lsusb (search-input-file inputs "/bin/lsusb")) - (tlp-stat (search-input-file inputs "/bin/tlp-stat"))) + (lambda _ + (let ((defaults.conf #$(file-append tlp "/share/tlp/defaults.conf")) + (lspci #$(file-append pciutils "/bin/lspci")) + (lsusb #$(file-append usbutils "/bin/lsusb")) + (tlp-stat #$(file-append tlp "/bin/tlp-stat"))) (with-directory-excursion "tlpui" (substitute* '("file.py" "settingshelper.py" "statui.py") (("\"tlp-stat\"")