From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 22 15:25:16 2024 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: tlpui: Fix broken package. Date: Thu, 22 Feb 2024 15:10:42 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Content-Transfer-Encoding: 8bit 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-Spam-Score: -3.4 (---) X-Debbugs-Envelope-To: submit Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) 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(-) 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 "'"))) base-commit: c97de01740ad336efba5830def0907f3daa9c0b8 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 22 17:08:14 2024 Received: (at 69313) by debbugs.gnu.org; 22 Feb 2024 22:08:14 +0000 Received: from localhost ([127.0.0.1]:34934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdHEk-0001xW-0u for submit@debbugs.gnu.org; Thu, 22 Feb 2024 17:08:14 -0500 Received: from msg-4.mailo.com ([213.182.54.15]:44704 helo=mailo.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdHEh-0001x2-2a for 69313@debbugs.gnu.org; Thu, 22 Feb 2024 17:08:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=nicolasgoaziou.fr; s=mailo; t=1708639661; bh=rzuBJWK2XDcfqr+kU9AJyVWT58U7w8sUuAKa5K73aqs=; h=X-EA-Auth:From:To:Cc:Subject:In-Reply-To:References:Date: Message-ID:MIME-Version:Content-Type; b=rCuS8eaHqxPvg0XJw+bSCBr1AV4xfKQJqVfRVX0hQG6ZoeZXikhU6iEYjahjlymfH q7se0q5yB9Y4qUn7FEU1CkY4fzwzH1LeItaFs2wJ4FbgX0AGTHoJRKxE5lL1I/T86W 99aezj7ofRTY1Gv3GovDntoV5rrPy7A5OV2X/m4E= Received: by b221-1.in.mailobj.net [192.168.90.21] with ESMTP via ip-20.mailobj.net [213.182.54.20] Thu, 22 Feb 2024 23:07:40 +0100 (CET) X-EA-Auth: sUSsrVMsRsIIqoqWzb8tt+sHPsXL+gh3brcFfvHMMMdXDVkAHdRCjCmJ6aBxkaLHKhZL6L05ifkSPOoaQQL17VNdw9wxN7UpgDvKFrkNquQ= From: Nicolas Goaziou To: Juliana Sims Subject: Re: [bug#69313] [PATCH] gnu: tlpui: Fix broken package. In-Reply-To: (Juliana Sims's message of "Thu, 22 Feb 2024 15:10:42 -0500") References: Date: Thu, 22 Feb 2024 23:07:25 +0100 Message-ID: <87il2gcfvm.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 69313 Cc: 69313@debbugs.gnu.org, Tobias Geerinckx-Rice , Wilko Meyer , Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.9 (--) Hello, Juliana Sims writes: > * gnu/packages/linux.scm (tlpui): Fix broken package. Thank you. I think the commit message could be expounded a bit, e.g., * gnu/packages/linux.scm (tlpui)[arguments]: Fix location for "defaults.conf". > (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"))) I'm a bit puzzled here: how does (search-input-file inputs "/share/tlp/defaults.conf") differ from #$(file-append tlp "/share/tlp/defaults.conf") ? And how does this relate to other changes in the patch (lsusb and lspci)? > (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)) OOC, would this single line suffice to fix the issue? On my side, this seems to be the case. Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 22 18:09:14 2024 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 To: 69313@debbugs.gnu.org Subject: [PATCH v2 2/2] gnu: tlpui: Reference inputs directly during build. 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-Debbugs-Cc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Content-Transfer-Encoding: 8bit X-GND-Sasl: juli@incana.org X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 69313 Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.6 (---) * 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\"") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 22 18:09:27 2024 Received: (at 69313) by debbugs.gnu.org; 22 Feb 2024 23:09:28 +0000 Received: from localhost ([127.0.0.1]:39178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdIBz-0002E1-D1 for submit@debbugs.gnu.org; Thu, 22 Feb 2024 18:09:27 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:60411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdIBx-0002Dc-IY for 69313@debbugs.gnu.org; Thu, 22 Feb 2024 18:09:26 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id DB4EF20003; Thu, 22 Feb 2024 23:08:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1708643316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E/wu8JkIleBqDy0jDp3gI0e9ZAnvlKcfTsaWUyjYJ7I=; b=exq+GxCJ+nqX47oruJ0vIBeqPVm4NePhAUjvE/j4DcAkRjGn6EF4qYjaCE3q652AXmRJmU tt8dXgKGd/fEXyEeiMnX0wKQFGmxr7LZr6eNh6OYOr7Jtpau3RGYN1hPF6kz571IiqRY8i dxxsXEQSrehM8BgyCNjug8hodE/wVZk9xnNhGUG+DrbkSKduyG0CO2O7r0JFHwLOMhMHdz Tn7vQaSOcyqlumyG7mk9QK3r3k589jaCc4KlzGEWZnBRKJ1kQ6m5EMj/oemZdH33EUa2Sr 2OQJKQBCI2F4324sY6efM1Gxbk2QI9k/R4PIMSZ9RVVsiqi6qSThPnxAjG+3Ug== From: Juliana Sims To: 69313@debbugs.gnu.org Subject: [PATCH v2 0/2] gnu: tlpui: Fix location for "defaults.conf". Date: Thu, 22 Feb 2024 17:56:57 -0500 Message-ID: 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-Debbugs-Cc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-GND-Sasl: juli@incana.org X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 69313 Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.6 (---) > how does this relate to other changes in the patch (lsusb and lspci)? It doesn't! I meant to split these into separate commits but was very tired. Don't code sleepy, kids! > I'm a bit puzzled here: how does > > (search-input-file inputs "/share/tlp/defaults.conf") > > differ from > > #$(file-append tlp "/share/tlp/defaults.conf") The latter directly accesses the input in question then joins its path with the provided string and inserts the result where the `file-append` form was in the code. The former searches each input's store directory at build time to find a matching file. In other words, since we know exactly where to find these files ahead of time, we simply tell the build dæmon where they are rather than making it look for them. Because this is a quite minor performance improvement and code modernization, rather than a requirement for the package to build, I've split it into a second patch to be applied at the discretion of a commiter. > I think the commit message could be expounded a bit, e.g., > > * gnu/packages/linux.scm (tlpui)[arguments]: Fix location for "defaults.conf". Good idea! I've modified the commit messages to be more precise :) Thanks, Juli Juliana Sims (2): gnu: tlpui: Fix location for "defaults.conf". gnu: tlpui: Reference inputs directly during build. gnu/packages/linux.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) base-commit: 34ce59bb0668e75d40f42b89e36dc9af6f548e4c -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 22 18:10:19 2024 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 To: 69313@debbugs.gnu.org Subject: [PATCH v2 1/2] gnu: tlpui: Fix location for "defaults.conf". 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-Debbugs-Cc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Content-Transfer-Encoding: 8bit X-GND-Sasl: juli@incana.org X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 69313 Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.6 (---) * 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 "'"))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 23 02:38:26 2024 Received: (at 69313) by debbugs.gnu.org; 23 Feb 2024 07:38:26 +0000 Received: from localhost ([127.0.0.1]:46597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdQ8Y-0001kJ-0N for submit@debbugs.gnu.org; Fri, 23 Feb 2024 02:38:26 -0500 Received: from msg-1.mailo.com ([213.182.54.11]:42830 helo=mailo.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdQ8W-0001js-Lf for 69313@debbugs.gnu.org; Fri, 23 Feb 2024 02:38:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=nicolasgoaziou.fr; s=mailo; t=1708673874; bh=59l1DK4GtCpsdO0ElQnTljHqIdAhe4MY+TaT67b7MbY=; h=X-EA-Auth:From:To:Cc:Subject:In-Reply-To:References:Date: Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; b=G2YSZcqiJiVVHv7yTSQvL6cXKddidWudiXqfpYXDyA18f4G6EBLhbuvRo04Y1ckHO LWadvR8LmnvtN6nw3s4gD+ApGjFD3dN+hsffTiMc0JJXxBZxNJ+FrM92v3bPR/9nZF A8V+XzI82h2q2c9RT6tZpUb49RqF5UlmQ8V2QLAQ= Received: by b221-4.in.mailobj.net [192.168.90.24] with ESMTP via ip-20.mailobj.net [213.182.54.20] Fri, 23 Feb 2024 08:37:54 +0100 (CET) X-EA-Auth: dg4Y6pNPrXzya6r7QGw3p69XaNCOx2Vq+LdCSGrUfr1LKoVIjEqcQoMWxteZ84oysWuBET7mn0E1/O/KjmkMwN8IbEE6cFc3of1SZAk1UjI= From: Nicolas Goaziou To: Juliana Sims Subject: Re: [bug#69313] [PATCH v2 0/2] gnu: tlpui: Fix location for "defaults.conf". In-Reply-To: (Juliana Sims's message of "Thu, 22 Feb 2024 17:56:57 -0500") References: <87il2gcfvm.fsf@nicolasgoaziou.fr> Date: Fri, 23 Feb 2024 08:37:38 +0100 Message-ID: <87edd3d41p.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69313 Cc: 69313@debbugs.gnu.org, Tobias Geerinckx-Rice , Wilko Meyer , Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Juliana Sims writes: >> how does this relate to other changes in the patch (lsusb and lspci)? > > It doesn't! I meant to split these into separate commits but was very tir= ed. > Don't code sleepy, kids! :) >> I'm a bit puzzled here: how does >> >> (search-input-file inputs "/share/tlp/defaults.conf") >> >> differ from >> >> #$(file-append tlp "/share/tlp/defaults.conf") > > The latter directly accesses the input in question then joins its path wi= th the > provided string and inserts the result where the `file-append` form was i= n the > code. The former searches each input's store directory at build time to f= ind a > matching file. In other words, since we know exactly where to find these = files > ahead of time, we simply tell the build d=C3=A6mon where they are rather = than making > it look for them. > > Because this is a quite minor performance improvement and code modernizat= ion, > rather than a requirement for the package to build, I've split it into a = second > patch to be applied at the discretion of a commiter. I understand the performance improvement, but I'm dubious about the "code modernization" part. I've been out of the loop for a while, but I think using `search-input-file' is still the way to go. IIUC, the `file-append' way makes it more difficult to use package transformations, since you basically bind the executables to a fixed package. I let the issue open for you and others to comment about this. Meanwhile, I applied the first patch. tlpui, even outdated, now builds again! Thanks! From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 27 12:11:36 2024 Received: (at 69313) by debbugs.gnu.org; 27 Feb 2024 17:11:36 +0000 Received: from localhost ([127.0.0.1]:39348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rf0zP-0000Q5-8d for submit@debbugs.gnu.org; Tue, 27 Feb 2024 12:11:35 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:55211) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rf0zN-0000PU-1h for 69313@debbugs.gnu.org; Tue, 27 Feb 2024 12:11:34 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id 4E6E1FF805; Tue, 27 Feb 2024 17:10:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1709053860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=i+Qa/w0jn5YsE7+CXFBhOkkgPjxBf2sbqNxHXhM+fOs=; b=IrMxsQHcuOg3ZguvGRG4HocMUzLiJFPKGuuN3NpIYFYI73jlKfIG4EL/7vjsnQSw2iz9Eo QqAx/mkBLx571IV+gXV2MYjSOKrdk1gemE5GkxOisu2p1mF4onzaA+LuTZ8fG/SKDFnHtD TTxuQDBxCQFqyJn/92B87D0co7kR1yU2p7peL0zAtyBhZoMrzXIjzTTkIwfTLsVuuuGu19 FHHqv3arf57zC4SqkjjD0hjxmaqISHF/7PDkVn/LyBxJvCEPx3/HiHadnlfZvHs4B2JNiJ HQauLam5fskaVIIy9rgLkOWvPawHC+KEz0QulCqpAILylmRZQe9KNh9eJKkBkg== Date: Tue, 27 Feb 2024 12:10:47 -0500 From: Juliana Sims Subject: Re: [bug#69313] [PATCH v2 0/2] gnu: tlpui: Fix location for "defaults.conf". To: Nicolas Goaziou Message-Id: In-Reply-To: <87edd3d41p.fsf@nicolasgoaziou.fr> References: <87il2gcfvm.fsf@nicolasgoaziou.fr> X-Mailer: geary/43.0 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed X-GND-Sasl: juli@incana.org X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69313 Cc: 69313@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) > I'm dubious about the "code modernization" part. ... IIUC, the > `file-append' way makes it more difficult to use package > transformations, since you basically bind the executables to a fixed > package. I used the phrase "modernization" just because `file-append` is a g-expression-related procedure, and my understanding is that gexprs are the new way to do things. I hadn't considered the fixing-to-specific-packages aspect. In theory one could bind a replacement package to the same name in the scope of g-expression expansion (package parameterization, for example, will enable this more simply if and when it's done), but that's kind of hacky atm and shouldn't be a burden on anyone inheriting from this package. I now understand why one might prefer `search-input-file` and, furthermore, think it should be preserved. If no one else has input on this in the next couple days, I'll try to remember to close this issue soon :) Thanks for helping me think about something in a new way! -Juli From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 07 15:50:37 2024 Received: (at control) by debbugs.gnu.org; 7 Mar 2024 20:50:37 +0000 Received: from localhost ([127.0.0.1]:55118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riKhJ-0005gJ-Cl for submit@debbugs.gnu.org; Thu, 07 Mar 2024 15:50:37 -0500 Received: from out-186.mta1.migadu.com ([95.215.58.186]:10657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riKhH-0005g3-1b for control@debbugs.gnu.org; Thu, 07 Mar 2024 15:50:36 -0500 Date: Thu, 07 Mar 2024 15:49:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=key1; t=1709844597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=W9LsGXGFWu7rCLUjpRfcrSMPuPRA++XsCRrvduUtI7E=; b=M3kGYjq+CXdlFFJxqYeQtqjnwmZRYFgtk3qxAXtiMm6zhKTWlvsP47uiBuvC+xNtBtT9Db f0urFWKmYStH7PV6LFeW8qMM8OQwMd+yD/5nUGBBNB34oeIrGLXt6mps7hk4gUbH6JcNtX RMQOpBoGy6YXNEClvTm3DkRg6h47a0hrMzzuUqkKKrk14fheH+AFlR4uaDBJbCkQWR1+Hv 6mbcudm34uVK55+fi0rMGNqPfZ9ami6InhM8DX9kJpBz2wRpySqmRLpIuX+g6tUtjHPGcq Azn1k1DgAxsMbnvwvopGQmioyOE1MiUtQmhCYhXZ+WUHJ9Biols0A9nrLpOikQ== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Juliana Sims Subject: close issue To: control@debbugs.gnu.org Message-Id: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed X-Migadu-Flow: FLOW_OUT X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) close 69313 From unknown Sun Jun 22 20:58:09 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 05 Apr 2024 11:24:17 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator