From patchwork Thu Feb 22 20:10:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 60905 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 202A627BBEB; Thu, 22 Feb 2024 20:26:06 +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 3A76927BBE9 for ; Thu, 22 Feb 2024 20:26:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdFdX-0002L5-Jp; Thu, 22 Feb 2024 15:25:43 -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 1rdFdW-0002Kr-83 for guix-patches@gnu.org; Thu, 22 Feb 2024 15:25: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 1rdFdV-0007p7-NC for guix-patches@gnu.org; Thu, 22 Feb 2024 15:25:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdFdq-00051U-AV; Thu, 22 Feb 2024 15:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69313] [PATCH] gnu: tlpui: Fix broken package. 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 20:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Received: via spool by submit@debbugs.gnu.org id=B.170863351619222 (code B ref -1); Thu, 22 Feb 2024 20:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Feb 2024 20:25:16 +0000 Received: from localhost ([127.0.0.1]:56131 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdFd4-0004zw-UA for submit@debbugs.gnu.org; Thu, 22 Feb 2024 15:25:15 -0500 Received: from lists.gnu.org ([209.51.188.17]:33072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdFV8-0004du-DU for submit@debbugs.gnu.org; Thu, 22 Feb 2024 15:17:06 -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 1rdFUl-0000ZV-15 for guix-patches@gnu.org; Thu, 22 Feb 2024 15:16:39 -0500 Received: from relay2-d.mail.gandi.net ([217.70.183.194]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rdFUf-0005q4-8P for guix-patches@gnu.org; Thu, 22 Feb 2024 15:16:38 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id 01A2840009; Thu, 22 Feb 2024 20:16:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1708632988; 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; bh=dpUNItaMffgIXpjjA8cBlXilDnCFTkk7VAzG3yS8sl4=; b=Ec3LrR55Vx0Ku91mfx7gyf2zuyVk24pMiV9iPiOZegYmvNGccgeqImTFJYbSD/eOOVLf3I +VIvjruK3/1XmA9Fq7PXI1SX0c2WQq6KzCtNW5B2Ur9F4dAhz0kMjMzqT0FO5QFdVXQLMk A1+Zu5TLE/M3NvCNS48Rt06ylJcsk4F2+4Bgpl02fzFI0sr7s+VzL0+TjjuZxNh6EAH2QC K4pMYRFZlme8k/uDFidKSZQe9p8Z/GZA3GC6rspNxX6LUKL93Qu4jfLPdYOsM2MoDCHOcB I0y9fwokV8ODg/Mmh0uVzA4XW9Ok0L6xsyI79rA6ygMj5OklhvaODG83u7kcEw== From: Juliana Sims Date: Thu, 22 Feb 2024 15:10:42 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-GND-Sasl: juli@incana.org Received-SPF: pass client-ip=217.70.183.194; envelope-from=juli@incana.org; helo=relay2-d.mail.gandi.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: , 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, Before this patch, tlpui failed to launch with an error about failing to find defaults.conf. This is a relatively simple patch to fix that. Note that tlpui is also somewhat outdated. I started in on updating it, but several dependencies were updated beyond what we have in Guix and I didn't feel like navigating that and the changes in build and testing in the later releases. Thanks, Juli * gnu/packages/linux.scm (tlpui): Fix broken package. Change-Id: I451ba405fb6287b76e449dc6a63718dd36f623ff --- gnu/packages/linux.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) base-commit: c97de01740ad336efba5830def0907f3daa9c0b8 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8eb6d9b7d3..3aa02345b4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7868,18 +7868,17 @@ (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\"") (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 "'")))