From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Feb 2022 09:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.164535084629117 (code B ref -1); Sun, 20 Feb 2022 09:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Feb 2022 09:54:06 +0000 Received: from localhost ([127.0.0.1]:59379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLiur-0007ZZ-MW for submit@debbugs.gnu.org; Sun, 20 Feb 2022 04:54:05 -0500 Received: from lists.gnu.org ([209.51.188.17]:45144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLiuq-0007ZS-TU for submit@debbugs.gnu.org; Sun, 20 Feb 2022 04:54:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nLiuq-0001HD-7t for guix-patches@gnu.org; Sun, 20 Feb 2022 04:54:04 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:43798) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1nLiun-0002d7-UK for guix-patches@gnu.org; Sun, 20 Feb 2022 04:54:03 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4K1gkD3j5jz9sR8 for ; Sun, 20 Feb 2022 10:53:56 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645350834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RMHpbqQIJYUNVOYxOLv6a1jqZ832PvYRyy2X4ZnlUdc=; b=XLSxVpJ+fBKdMhgG0bxCRs6Xv4jmj7GvU4f4oT0ZcQWhqq1mx23udZ9p1Q42Jjy4eIPyTT YXIj+nywK8N1qX1qoG32I5P4QsJTDOOtOSWB3GKocvSlvXVqrFNaJ1mr460RK+in+aqINN CSKJp5vRyQNdmbrCoJIMoUH4GmrOkTGmSxcwJuAKlkGK/6s51XP3nnRIP7F3Ow2ZZCHdqE +dh+XEC5CiP8YhjakOQI3U1oMc9b0ZEeyKyd6px3F6uoPvYo80hRrNN0v39f4o5tYxLDuD wRJRgrjTk1a86SnppCH0gIeBVqq9ZoMBOcyC/J90RpzQnjz3Ss6loHWk8+YziA== Date: Sun, 20 Feb 2022 10:53:51 +0100 (CET) From: Brendan Tildesley Message-ID: <635599986.289572.1645350831631@office.mailbox.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal Received-SPF: pass client-ip=80.241.56.151; envelope-from=mail@brendan.scot; helo=mout-p-101.mailbox.org 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_H2=-0.001, 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-Spam-Score: -1.7 (-) 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.7 (--) Completely untested but I needed pci.ids for something and discovered pciutils bundles an old version so I made this patch as something of a suggestion. Looks like it would be a core-updates change. From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 2/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Feb 2022 09:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164535097929362 (code B ref 54069); Sun, 20 Feb 2022 09:57:02 +0000 Received: (at 54069) by debbugs.gnu.org; 20 Feb 2022 09:56:19 +0000 Received: from localhost ([127.0.0.1]:59385 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLix1-0007dV-2D for submit@debbugs.gnu.org; Sun, 20 Feb 2022 04:56:19 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:58114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLiwz-0007dC-Qm for 54069@debbugs.gnu.org; Sun, 20 Feb 2022 04:56:18 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4K1gmq4nVjz9sSr for <54069@debbugs.gnu.org>; Sun, 20 Feb 2022 10:56:11 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645350969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n7RREqgNBunpACYWST0PVQKaVxkVlgeVt4sHx+lX+DI=; b=Spl8sLGONaVOgDcptsgdfmLpI64Oi+1LYMaIbPyFODUX/y5b+pxfNl1QjzSc932SlsHCUB bqJxwnP2LWx1ulDu3OTXFcZ95xY/mp2w8lIORQxbVOF+i6dP7yPcUdwhyxSGs8rOjJ17by qHSEL0/HSh5tHGobnoYy0GsSfNImeGOLR/+2vHUJuCr/cxCbnmZtlNXNkkSUWam9iiq4aM jiq9VQyf08lLXkjS9pO9ZfNQgsDSw/wP+R70ro74y4Bd6ic6xZp3XWhyn3boblFnurBf3Q PbxnFTtCOBJDSXcHrvlhOe9U66XG77PWkZLb0KJ9pcV/NRavLnSk9wl1MQKPHw== From: Brendan Tildesley Date: Sun, 20 Feb 2022 20:55:57 +1100 Message-Id: <20220220095557.1497-2-mail@brendan.scot> In-Reply-To: <20220220095557.1497-1-mail@brendan.scot> References: <20220220095557.1497-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/pciutils.scm (pciutils): [inputs]: Remove zlib. Add hwdata. pci.ids was never gzip'd anyway. [arguments]: Don't install update-pciids script or it's man page. Don't install bundled old pci.ids file. Copy pci.ids file from latest hwdata package. --- gnu/packages/pciutils.scm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 416328bda2..3975854f84 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -110,17 +110,28 @@ (define-public pciutils (("^SHARED=.*$") ;; Build libpciutils.so. "SHARED := yes\n") - (("^ZLIB=.*$") - ;; Ask for zlib support, for 'pci.ids.gz' decompression. - "ZLIB := yes\n") (("^IDSDIR=.*$") ;; Installation directory of 'pci.ids.gz'. - "IDSDIR = $(SHAREDIR)/hwdata\n")))) + "IDSDIR = $(SHAREDIR)/hwdata\n") + ;; Don't install update script, its man page, and empty man8 dir. + (("update-pciids update-pciids.8 ") + "") + ((".*update-pciids( |.8).*") + "") + (("[^ ]*/man8 ") + "") + ;; Down't install bundled pci.ids file. + ((".*INSTALL.*PCI_IDS.*") + "")))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; Install the commands, library, and .pc files. - (invoke "make" "install" "install-lib"))) + (invoke "make" "install" "install-lib") + ;; Install newer pci.ids file. + (copy-file + (string-append (assoc-ref inputs "hwdata") "/share/hwdata/pci.ids") + (string-append (assoc-ref outputs "out") "/share/hwdata/pci.ids")))) ,@(if (hurd-target?) '((add-after 'unpack 'apply-hurd-patch @@ -145,7 +156,7 @@ (define-public pciutils ,@(if (hurd-target?) `(("hurd-patch" ,(search-patch "pciutils-hurd-fix.patch"))) '()) - ("zlib" ,zlib))) + ("hwdata" ,hwdata))) (home-page "https://mj.ucw.cz/sw/pciutils/") (synopsis "Programs for inspecting and manipulating PCI devices") (description -- 2.34.0 From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 1/2] gnu: Add hwdata. References: <635599986.289572.1645350831631@office.mailbox.org> In-Reply-To: <635599986.289572.1645350831631@office.mailbox.org> Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Feb 2022 09:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164535097929368 (code B ref 54069); Sun, 20 Feb 2022 09:57:02 +0000 Received: (at 54069) by debbugs.gnu.org; 20 Feb 2022 09:56:19 +0000 Received: from localhost ([127.0.0.1]:59387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLix1-0007dX-Aa for submit@debbugs.gnu.org; Sun, 20 Feb 2022 04:56:19 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:58112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLiwz-0007dA-Ql for 54069@debbugs.gnu.org; Sun, 20 Feb 2022 04:56:18 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4K1gmq2mBPz9sSm for <54069@debbugs.gnu.org>; Sun, 20 Feb 2022 10:56:11 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645350969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M7uBLQ69BIyQl4IBFzDukMj+Wg11P5Qbm/PtHXlV5cA=; b=ZJlKfZoUQjmYTBnzfP7Cr2Zar7PFOBqxYIMGRBdnzbZBzVo2ry6tGkAXdJTYjozPQ7vtxL woSWslgpuvBCxeCY3AZfiDiRwarPVKvDCoVv8swtCTKtGDLnWWraqhFmtKNblzYJHJZUQy 31p+hbJsv3ZdUHzDMTjKXiTl8vsT4orec11/411UYIl+fvxpFrPHGYvr5eD+y8Iyb0zfL3 GXJUWYPgHM7Ut7jA+nBmkB/0EWIafe7z+IXeRM3pCoGripo9pSK9ao48E7WdpsliU+MbsY ctMi4b48WZ672AKvUrkkHoqvyDh+buY2g86lNWkX3EjASJbMkMA4WRU52snpTw== From: Brendan Tildesley Date: Sun, 20 Feb 2022 20:55:56 +1100 Message-Id: <20220220095557.1497-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/pciutils.scm (hwdata): New variable. --- gnu/packages/pciutils.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index b6b1e3ad85..416328bda2 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,7 +26,9 @@ (define-module (gnu packages pciutils) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) + #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system copy) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages pkg-config) @@ -33,6 +36,32 @@ (define-module (gnu packages pciutils) #:use-module (gnu packages linux) #:use-module (gnu packages base)) +(define-public hwdata + (package + (name "hwdata") + (version "0.356") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vcrhonek/hwdata") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0m04d93dwiplwp9v74nhnc0hyi2n007mylkg8f0frb46z5qjrpl3")))) + (build-system copy-build-system) + (arguments + `(#:install-plan '(("pci.ids" "share/hwdata/pci.ids") + ("pnp.ids" "share/hwdata/pnp.ids") + ("usb.ids" "share/hwdata/usb.ids")))) + (home-page "https://pci-ids.ucw.cz") + (synopsis "Hardware identification databases") + (description "Hardware databases pci.ids, pnp.ids, and usb.ids including +all known ID's used in PCI devices: ID's of vendors, devices, subsystems and +device classes.") + (license (list license:gpl2+ + license:expat)))) ;; XFree86 1.0 +;; (define-public pciutils (package (name "pciutils") -- 2.34.0 From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. References: <635599986.289572.1645350831631@office.mailbox.org> In-Reply-To: <635599986.289572.1645350831631@office.mailbox.org> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Feb 2022 16:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "54069@debbugs.gnu.org" <54069@debbugs.gnu.org> Reply-To: John Kehayias Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164546040923875 (code B ref 54069); Mon, 21 Feb 2022 16:21:01 +0000 Received: (at 54069) by debbugs.gnu.org; 21 Feb 2022 16:20:09 +0000 Received: from localhost ([127.0.0.1]:38756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMBQ0-0006Cz-K3 for submit@debbugs.gnu.org; Mon, 21 Feb 2022 11:20:09 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:10707) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMBPy-0006CN-55 for 54069@debbugs.gnu.org; Mon, 21 Feb 2022 11:20:07 -0500 Date: Mon, 21 Feb 2022 16:19:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1645460399; bh=gYDvSeGDSDr4Whb6R+t/HF8kfjHgJLx/BOuTMRPt9Ik=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID; b=ADXLySjjyTufdKUsteMqPZ37WxoAMFHSDwYWFE+LX5P966tado4pPHoUKMcR7JSae eKt2V8Pedh3KvkdHfcDfwwvhx8ADD5Tv4GM/BeKtvmnWlRiHLZuzVOwVYdIYl3Vea/ CKCRjOmwNvWYi+yTZbTkjBYT9wslF9wxm/9yaZRkpdhrd2MP9OLZ7Bsss1n6DSnzop eTEaR4URPYNIjwZLPQs73cXNEtD02TI9zahhv57z3DAdmXggbrk33gpVFhPm6sXyeQ FfjbSme/hhtidk9D/fw/q4xt1MsS4BGH4SLRKUPpxKidtaVEHAnBva42G+lSo3cDts pdrl0D6Cll9fQ== From: John Kehayias Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) 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 (-) Hi Brendan, > Completely untested but I needed pci.ids for something and discovered pci= utils bundles an old version so I made this patch as something of a suggest= ion. Looks like it would be a core-updates change. Thanks for this possibility, I've actually had to address something similar= in https://issues.guix.gnu.org/53015 where I made a pciutils variant for t= his purpose. The patch is unmerged currently though. I think that would work short term for our packaging needs and, as you say,= make this bigger change for core updates (or wherever it will best fit). I= haven't reviewed this patch, but in this way I think any updates to hwdata= will cause pciutils to rebuild, which has many dependents. I'm not sure wh= at is best, maybe: have pciutils use a frozen version of the hwdata with th= e separate package being a standalone more up to date data? By the way, I do see in pciutils that share/hwdata/pci.ids.gz though admitt= edly I never checked to see if that really is gziped. Packages that want a = plain pci.ids did not like it though (maybe just from file name?). Would be great to have others chime in on what the longer term fix would be= , in the short term a pciutils variant and/or hwdata standalone package wou= ld be helpful. John From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Feb 2022 19:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brendan Tildesley Cc: 54069@debbugs.gnu.org Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164547244915380 (code B ref 54069); Mon, 21 Feb 2022 19:41:01 +0000 Received: (at 54069) by debbugs.gnu.org; 21 Feb 2022 19:40:49 +0000 Received: from localhost ([127.0.0.1]:39216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMEYC-0003zz-En for submit@debbugs.gnu.org; Mon, 21 Feb 2022 14:40:48 -0500 Received: from mail-qv1-f47.google.com ([209.85.219.47]:41815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMEYA-0003zl-Au for 54069@debbugs.gnu.org; Mon, 21 Feb 2022 14:40:46 -0500 Received: by mail-qv1-f47.google.com with SMTP id x3so34577297qvd.8 for <54069@debbugs.gnu.org>; Mon, 21 Feb 2022 11:40:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=7W4Seb7EZqKZhN2AGFouzZOMDG9QJDwVNJ2JOoO/dHA=; b=hiFeZY4JuzvB8afZKx8RNxLij/JzjJA2V0F5wqz/ugGGfOdacJP+nGfZqmn147p6u/ rGYtUwui+/o3GqUMGLYw+3y0blJNPqVWs4J802/hU+gxUyQll81mdZFidzF5XVLRyuDH /FE98VESf0iFOuHVIomHkGE+06fPN1/r6Tg9a9aCq4lzD3+Zyc1rBtOOK8+PH3uxRRvj JUiuzJXOfwKz5cbklshUnFhKHANvO72hkD7Ck88fD8LMo+/L0rtxIMeTcfBeC/pzs1vH vfRurO8tf2BDWMccZiTA0ThX7SnCtVGs+tSD+u8HraYoI3bEkRabVlAWS9Cl3oR04Vkb skqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=7W4Seb7EZqKZhN2AGFouzZOMDG9QJDwVNJ2JOoO/dHA=; b=1u8F0YOxXCmjV1afteUHQegzwtyKchFUC6oAXt+sO4GGQFqmuPARvwOW0hzDSnzDw+ k42AYYjX5i5WIlUIZP2ChgSS3WVJ7n+ZhmBy+0uMHpEdyvTHJZbzDO8vps/vt3LisoZ3 6zvuM7sTXdwNGeZLed01cBKq5+Rsq8rmT8gwGdktvqJOy4vRHMapShRbVnn5lOPHDIFY qWORSE/513EAIxIPDHiXc6UJkefd2ZzVG7RAFBKh/LIyAzdjNBZFarolODGMgX8W7pIe ILsnj0rbYZ76i8KKDSh8X8bTP7vyAxp37+RTOPtoJSCGreFrfkuaOa9IABjkjgaKheZo Ojvg== X-Gm-Message-State: AOAM530hD5QxmSZEhjT7K8JjQ2GcgT99DJl28Mkhflvc81F4XEubrkYO 9Rzlq0Ad0lBKemHvKJw5DdjVp5q98I4= X-Google-Smtp-Source: ABdhPJy8rfKk8TO9T6yyz2dfsQBd6RDSXxtJ25BBlLpZF5t4qpVYpR7BVEUwRIgxVkfKwTplV3hTMw== X-Received: by 2002:ad4:5cad:0:b0:42c:308:2b3 with SMTP id q13-20020ad45cad000000b0042c030802b3mr16256544qvh.59.1645472440268; Mon, 21 Feb 2022 11:40:40 -0800 (PST) Received: from hurd (dsl-10-149-208.b2b2c.ca. [72.10.149.208]) by smtp.gmail.com with ESMTPSA id d11sm31861499qte.10.2022.02.21.11.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 11:40:39 -0800 (PST) From: Maxim Cournoyer References: <20220220095557.1497-1-mail@brendan.scot> <20220220095557.1497-2-mail@brendan.scot> Date: Mon, 21 Feb 2022 14:40:38 -0500 In-Reply-To: <20220220095557.1497-2-mail@brendan.scot> (Brendan Tildesley's message of "Sun, 20 Feb 2022 20:55:57 +1100") Message-ID: <87r17wnh3d.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) 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 (-) Hi, Brendan Tildesley writes: > * gnu/packages/pciutils.scm (pciutils): > [inputs]: Remove zlib. Add hwdata. pci.ids was never gzip'd anyway. > [arguments]: Don't install update-pciids script or it's man page. Don't > install bundled old pci.ids file. Copy pci.ids file from latest hwdata package. > --- > gnu/packages/pciutils.scm | 25 ++++++++++++++++++------- > 1 file changed, 18 insertions(+), 7 deletions(-) > > diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm > index 416328bda2..3975854f84 100644 > --- a/gnu/packages/pciutils.scm > +++ b/gnu/packages/pciutils.scm > @@ -110,17 +110,28 @@ (define-public pciutils > (("^SHARED=.*$") > ;; Build libpciutils.so. > "SHARED := yes\n") > - (("^ZLIB=.*$") > - ;; Ask for zlib support, for 'pci.ids.gz' decompression. > - "ZLIB := yes\n") It seems to me perhaps a more proper fix would be to have hwdata used as an input, replacing the bundled copy of the pci.ids file file, and then letting pciutils proceed as usual? Disabling compression makes the database about 4.3 times larger (1.2 MiB instead of 0.273 MiB). I feel like applications parsing pci.ids themselves should probably rely on the pciutils library API instead (libpci.so) to retrieve or filter PCI identifiers without being concerned with the actual format of the database. What do others think? Maxim From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Feb 2022 08:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: 54069@debbugs.gnu.org Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16455192405377 (code B ref 54069); Tue, 22 Feb 2022 08:41:01 +0000 Received: (at 54069) by debbugs.gnu.org; 22 Feb 2022 08:40:40 +0000 Received: from localhost ([127.0.0.1]:39968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMQiu-0001Of-9I for submit@debbugs.gnu.org; Tue, 22 Feb 2022 03:40:40 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:46260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMQis-0001OC-8m for 54069@debbugs.gnu.org; Tue, 22 Feb 2022 03:40:39 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4K2t0Y6lrDz9sR7; Tue, 22 Feb 2022 09:40:29 +0100 (CET) Date: Tue, 22 Feb 2022 09:40:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645519228; 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=aiqs6Mw/t7SCtgjuECTujh/DOL0/9VaYRmIJUYriJXk=; b=qcx8lViZmICUGTrIVw2jVJgDHBii3YEfU9Iox1F0sQJD97HIfB1U+HKg1/ab9F43esr8Rh c+DpzgQwz/w9Ww1u8AITsQA+iLG3k+7TtvwmQFFGTVU0HtzedXxmzCZhNIRDduXAHN/Qb2 n1o1su8QSjgbaBHLwCVjClLT/s+75wMUgodWTx5qn9XsCmXYU7KUWhH92ZhBJbP3fE0Lpf uJjGKDe3NIwaIhYTJpPmoI9w/Oio9K8cOoqeBgeNS+ddS8a/2KwgiHJZlpv8oQit9o0YPT hkMEslQXSzXUxixdBrtZ2z46L80ey14waY9SK6IhYqp/mGYLTbKL6vwmcyMh6A== From: Brendan Tildesley Message-ID: <1283228187.20109.1645519225656@office.mailbox.org> In-Reply-To: <87r17wnh3d.fsf_-_@gmail.com> References: <20220220095557.1497-1-mail@brendan.scot> <20220220095557.1497-2-mail@brendan.scot> <87r17wnh3d.fsf_-_@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Spam-Score: -0.7 (/) 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 (-) > On 02/21/2022 8:40 PM Maxim Cournoyer wrote: > > > Hi, > > Brendan Tildesley writes: ... > It seems to me perhaps a more proper fix would be to have hwdata used as > an input, replacing the bundled copy of the pci.ids file file, and then > letting pciutils proceed as usual? Disabling compression makes the > database about 4.3 times larger (1.2 MiB instead of 0.273 MiB). > I mistakenly thought they were not gzip'd in the first place. Should we have a separate output/package for each of the 3 files, and then embed their paths as needed? > I feel like applications parsing pci.ids themselves should probably rely > on the pciutils library API instead (libpci.so) to retrieve or filter > PCI identifiers without being concerned with the actual format of the > database. > libosinfo also pulls in its own pci.ids. I searched nix and found there are several more programs that refer to the files directly. > What do others think? > > Maxim From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Feb 2022 19:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "54069@debbugs.gnu.org" <54069@debbugs.gnu.org> Cc: Maxim Cournoyer Reply-To: John Kehayias Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164555849113052 (code B ref 54069); Tue, 22 Feb 2022 19:35:02 +0000 Received: (at 54069) by debbugs.gnu.org; 22 Feb 2022 19:34:51 +0000 Received: from localhost ([127.0.0.1]:42692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMavz-0003OS-A9 for submit@debbugs.gnu.org; Tue, 22 Feb 2022 14:34:51 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:53467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMavx-0003OD-JC for 54069@debbugs.gnu.org; Tue, 22 Feb 2022 14:34:50 -0500 Date: Tue, 22 Feb 2022 19:34:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1645558483; bh=p6WH3Puh2K/78jjEfoABRdIZoV1HNy71pwlxsZQ5uII=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=aBoFgxCs15Q4zaQp87wZFnqbSYwxSESz0i/7PVES6GjLtsbVmdOJXraK+v/wpUdrj D50ERSOjVJ+hI5UVg7ptJP8tN03ZSnIog5qP4dXfI0vrp/3MCttIDZDxVIqpXKTusk 96dt5dEvTNVp7hEteuXaT6lvm/lafwNBO5TYNgcjrG1Qtxfxkp6IRLhzUvsq5z1Q/Q IvhmdTMU3/Kel5yQGhml8/c4X48GHZX8Oku4amm8Jt6cG3lZzYSFz1NAk2F2D7XNTW O4OqAaqp4lDQ/JJeIvqBn14O+v16eDPH5O2KXLUOvNvR1A25huEjCa+5OLyqUpeqsf LPNECjHBa09rw== From: John Kehayias Message-ID: <8uXKUPs7X8nEsyxB7xZHJMEG1553-m9uZKlIht98yyMaoaKhVeQs5dJCWKtsvvLdUKVYFVay6GYodkE9WmKxlG7Es9_fRhdS0aOwdqJIOVs=@protonmail.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) 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 (-) Hi Brendan and Maxim, I'm aware of a couple of programs that want to use the plain pci.ids. True,= they could use pciutils for that, but pci.ids is very simple, just a list = of hardware ids paired with manufacturer/device names. While we can see if = upstream for these programs will move to using pciutils, I could see reason= s for not wanting the dependency or wanting more current info (especially i= n Guix where we would only update pciutils on core-updates). So I would find the separate hwdata package useful for a few packages I hav= e, like mangohud (pending review) and corectrl (not submitted yet). I have = to check, but they might only want pci.ids and not anything in pciutils any= way. Also, hwdata provides more data than just pci.ids, which we don't have= packaged for Guix as far as I know. As for pciutils itself, I don't have any strong feelings on its pci.ids. Un= bundling the included (old) info and using a hwdata package as input makes = sense to me and is more flexible. On core-updates we can make that change f= or pciutils, where at some point we'd want to freeze what hwdata version it= uses. Meanwhile, hwdata can be updated regularly (looks like monthly relea= ses) for up-to-date data. I think this would keep pciutils small (zipped pci.ids), unbundled/more up = to date, and give us the hwdata as a useful package to use. WDYT? From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Feb 2022 21:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: John Kehayias Cc: "54069@debbugs.gnu.org" <54069@debbugs.gnu.org> Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164556361422050 (code B ref 54069); Tue, 22 Feb 2022 21:01:01 +0000 Received: (at 54069) by debbugs.gnu.org; 22 Feb 2022 21:00:14 +0000 Received: from localhost ([127.0.0.1]:42758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMcGb-0005ja-Jb for submit@debbugs.gnu.org; Tue, 22 Feb 2022 16:00:13 -0500 Received: from mail-qv1-f54.google.com ([209.85.219.54]:39896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMcGZ-0005iG-62 for 54069@debbugs.gnu.org; Tue, 22 Feb 2022 16:00:11 -0500 Received: by mail-qv1-f54.google.com with SMTP id a1so2788743qvl.6 for <54069@debbugs.gnu.org>; Tue, 22 Feb 2022 13:00:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=cHTCjd6VHvR+zleLdDe2Y29zcWpmUeoY8q7ITWu5Bys=; b=q3AFr3ck0vm4Hp8sC0oO1zxyn1EaEfzA4ZFjAYMio7B/wjV9dRJmUepUya5A7VQOAT IwDNo2A4ZPkuLwu/QvWdU3/btuFBtETih67jX1GXz5ZDiRD7kMhULtptR/QhbmYrsmrr L9Z+VMNFEUcpkChRn9wzt9po96V4sHQb2yaJk/9Tf3r4F1bVnvvQ/0ribqCpLX3OoCT4 CmE1e4wDdY6IrezKq2RQJFgFA97Rt567g9hD2Zv4732NntlEhG3QPHWlrkycEdVU0IgE fx0Png9weTqGkSGrNsIbF0RGLZC6Msnl2N9eKrcKF/LVlnwhVIi2wYPOVaJJ0ZO2e4ND tJzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=cHTCjd6VHvR+zleLdDe2Y29zcWpmUeoY8q7ITWu5Bys=; b=Jw1lauQ9HE6+hWqdfiuBkPsbPw+SIiz0Hv1mLkKkJyDh4O/i/BbLXs5AjUWiWySAwT tO6pQuittv2DWxf2hrwqfiaeGF5PlWQllK8WkDLcUaJZoQTNOuMLcRAmM8YC9if5xJjP 97w5Vzf+iJW2QEtIzxGUtRJw9u38/XjKoQ2qgd7H7BeXhpYXnC65ogGiOetvUJYrPlCc aerJ0ABD5GJpGGieG9scXC6iONTpTwF+Am2JNsRJxgufEJDUyvaPtIlp6AI82DM6+TyX 4TDtuJEgCWIbdDt/FvZBZIjZKLBdgXhiw8sYe6OnZggLlc42k85ngpt5UDX2qM3TVa6n 17ow== X-Gm-Message-State: AOAM533JKgnqVgJBDBx+4np/fxFVPgO9AoXcpAi4ud/MCKADRwGRBzBq +m6gM4mE1ZaJJUsIGhgUdcs0jGeK10s= X-Google-Smtp-Source: ABdhPJxUxJ9Nf55+2mJcvwQ6O/iXb5OMdHIBN/4+n843DXFnMLnWVUL5MmN0RwRttslwbfShRTww8w== X-Received: by 2002:a05:6214:5010:b0:42c:f952:6608 with SMTP id jo16-20020a056214501000b0042cf9526608mr20650318qvb.77.1645563605236; Tue, 22 Feb 2022 13:00:05 -0800 (PST) Received: from hurd (dsl-10-149-208.b2b2c.ca. [72.10.149.208]) by smtp.gmail.com with ESMTPSA id r207sm431774qka.67.2022.02.22.13.00.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 13:00:04 -0800 (PST) From: Maxim Cournoyer References: <8uXKUPs7X8nEsyxB7xZHJMEG1553-m9uZKlIht98yyMaoaKhVeQs5dJCWKtsvvLdUKVYFVay6GYodkE9WmKxlG7Es9_fRhdS0aOwdqJIOVs=@protonmail.com> Date: Tue, 22 Feb 2022 16:00:03 -0500 In-Reply-To: <8uXKUPs7X8nEsyxB7xZHJMEG1553-m9uZKlIht98yyMaoaKhVeQs5dJCWKtsvvLdUKVYFVay6GYodkE9WmKxlG7Es9_fRhdS0aOwdqJIOVs=@protonmail.com> (John Kehayias's message of "Tue, 22 Feb 2022 19:34:41 +0000") Message-ID: <875yp6obvw.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) 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 (-) Hi John, John Kehayias writes: > Hi Brendan and Maxim, > > I'm aware of a couple of programs that want to use the plain > pci.ids. True, they could use pciutils for that, but pci.ids is very > simple, just a list of hardware ids paired with manufacturer/device > names. While we can see if upstream for these programs will move to > using pciutils, I could see reasons for not wanting the dependency or > wanting more current info (especially in Guix where we would only > update pciutils on core-updates). > > So I would find the separate hwdata package useful for a few packages > I have, like mangohud (pending review) and corectrl (not submitted > yet). I have to check, but they might only want pci.ids and not > anything in pciutils anyway. Also, hwdata provides more data than just > pci.ids, which we don't have packaged for Guix as far as I know. > > As for pciutils itself, I don't have any strong feelings on its > pci.ids. Unbundling the included (old) info and using a hwdata package > as input makes sense to me and is more flexible. On core-updates we > can make that change for pciutils, where at some point we'd want to > freeze what hwdata version it uses. Meanwhile, hwdata can be updated > regularly (looks like monthly releases) for up-to-date data. > > I think this would keep pciutils small (zipped pci.ids), > unbundled/more up to date, and give us the hwdata as a useful package > to use. I think your proposition makes a lot of sense; the handful of applications wanting raw pci.ids can have it via hwdata, while our pciutils package can take (a frozen/fixed variant of hwdata) as an input to a get a newer yet compressed pci.ids.gz file. Seems a win/win solution to me! Thank you, Maxim From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Feb 2022 21:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: "54069@debbugs.gnu.org" <54069@debbugs.gnu.org> Reply-To: John Kehayias Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164556498524304 (code B ref 54069); Tue, 22 Feb 2022 21:24:01 +0000 Received: (at 54069) by debbugs.gnu.org; 22 Feb 2022 21:23:05 +0000 Received: from localhost ([127.0.0.1]:42764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMccj-0006Jw-K4 for submit@debbugs.gnu.org; Tue, 22 Feb 2022 16:23:05 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:63140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMcci-0006J6-1n for 54069@debbugs.gnu.org; Tue, 22 Feb 2022 16:23:04 -0500 Date: Tue, 22 Feb 2022 21:22:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1645564977; bh=IEGsqmTeHkfgnBeoL7hVyITSNtqaYeGOsTeXLlS9ANU=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=QBZEoEpXXHgFWMhHGYL5KILFHy0UO+xhQhhiOZWuQOm1UERtJzvPhGZeUGpKCap/9 m8cgGc3CqqEN4uUNAP2pQoFSzJ5Zl09Im29EVjn45J/KZC+oLCXzyYVh7YKI18KLLR H9aL23YHTmX4mzRgVQtRif9ZTselSr9OvaFsbSZgq3Y0zuXU+IKsOrB8E+WRWI9Xwb M7EsXuVmN32DrlrCpRJZBSrMpNzQl08PwUdPrnTz978P+o+5lAHUtJyR8+6VqNC6rR jUkGBN9VirH5l+Cn8sJns68oWGFsbiM4zZm38r+/CxeVquap35LCjE65G6aUdhRV6O Bo72NucPBkyiw== From: John Kehayias Message-ID: In-Reply-To: <875yp6obvw.fsf@gmail.com> References: <8uXKUPs7X8nEsyxB7xZHJMEG1553-m9uZKlIht98yyMaoaKhVeQs5dJCWKtsvvLdUKVYFVay6GYodkE9WmKxlG7Es9_fRhdS0aOwdqJIOVs=@protonmail.com> <875yp6obvw.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) 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 (-) Hi Maxim, ------- Original Message ------- On Tuesday, February 22nd, 2022 at 4:00 PM, Maxim Cournoyer wrote: > I think your proposition makes a lot of sense; the handful of > applications wanting raw pci.ids can have it via hwdata, while our > pciutils package can take (a frozen/fixed variant of hwdata) as an input > to a get a newer yet compressed pci.ids.gz file. > > Seems a win/win solution to me! > Great! Brendan do you want to update your patches if you agree with this ap= proach? I will test hwdata later for my mangohud patch, but since it is a s= imple copy install, I don't anticipate any problems. Oh, and if I understand correctly, keeping pciutils with a pci.ids.gz would= avoid a profile collision with hwdata's pci.ids (so you can have both pciu= tils and the extra data of hwdata), right? Which would also be good. Thanks everyone, John From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Feb 2022 01:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: John Kehayias Cc: "54069@debbugs.gnu.org" <54069@debbugs.gnu.org> Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164557851124475 (code B ref 54069); Wed, 23 Feb 2022 01:09:02 +0000 Received: (at 54069) by debbugs.gnu.org; 23 Feb 2022 01:08:31 +0000 Received: from localhost ([127.0.0.1]:43133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMg8t-0006Mg-Ef for submit@debbugs.gnu.org; Tue, 22 Feb 2022 20:08:31 -0500 Received: from mail-qv1-f45.google.com ([209.85.219.45]:40582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMg8s-0006MQ-7v for 54069@debbugs.gnu.org; Tue, 22 Feb 2022 20:08:30 -0500 Received: by mail-qv1-f45.google.com with SMTP id fc19so4528543qvb.7 for <54069@debbugs.gnu.org>; Tue, 22 Feb 2022 17:08:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=rrGgyzoEEHtPsHw6wv2qMKLVVbc1W65ozIY+Cz8yez4=; b=ZlxLi+/h/epugBoAo8l4YbJuIi6LE/KJjZQL1hV6PRf/v7WjeI3JEVRXzArF+hntxN Qm0EwatUTOLvdILkGmxOgwKtpRhVJKsoh+kIGmzeNxsPnqUN4wU3ILvTeCgRplioQVCe prTrORTtYJuAjNWPUdwO7d0c0dMu/YQ5CnTXeA3RWR8949NWEudesZ8M2g0ikANEzOJe HxiZqOPVKFn3Dji7k0owWGoT/l/82BT27Hbep7spItNA6+KOMWObag+17cJd84d+v7wA oMHLmOQOWZELfI0V63DzoNbVLcn2UH/W8iO6ngU7yCpnOlLZha1XAmQ6gNZH8nCztqhH lMJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=rrGgyzoEEHtPsHw6wv2qMKLVVbc1W65ozIY+Cz8yez4=; b=Q90b/7jyWOmRNoDmBUOAsYhepVvYVgut3rJ10eFy2fbuxYYDMm/yJzTnu4OU3sDmaf 8/WCpDEP1GBckxIau4/NOQc2XzqwKVKQS65VR0AFUoYSSfmkzGI6nojquTxs/5AdSKdj DjUmH9FrQK1ASFh5TB272WAK0173Fss8GFbhKfa4B3xXB4qUKFF8D7V6pr9kZSszMiKM +A3kt4v1I4gSu+TmI+gwK/8jeeN6WWyil/ppPxn2eIGY9paEqrE9v+y8ERNrdxJ2TD2g c3iOb7R7OKWWdnU45Ynw6q6SNCUj0UpNrHT4ixzb+0t6KAfuTIg4Y0RViVKaBK//3knP MSeQ== X-Gm-Message-State: AOAM531xLiMP6HoBu7F2VDVQHLSg7vSnczSw1UNUFpigMGDmKen0mSq/ FS/tPao5RyU2nBP0qkdKL5kg81ii1AA= X-Google-Smtp-Source: ABdhPJwL7GVsLjqpRARkFfXufI7SrjJY+BMHcSAvdl3YPRc3WbCJoVU+nKgUc02AnN/7sZlRn3OGhg== X-Received: by 2002:ac8:7d44:0:b0:2de:4d14:b6b9 with SMTP id h4-20020ac87d44000000b002de4d14b6b9mr6068095qtb.505.1645578504643; Tue, 22 Feb 2022 17:08:24 -0800 (PST) Received: from hurd (dsl-10-149-208.b2b2c.ca. [72.10.149.208]) by smtp.gmail.com with ESMTPSA id v144sm883335qkb.121.2022.02.22.17.08.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 17:08:24 -0800 (PST) From: Maxim Cournoyer References: <8uXKUPs7X8nEsyxB7xZHJMEG1553-m9uZKlIht98yyMaoaKhVeQs5dJCWKtsvvLdUKVYFVay6GYodkE9WmKxlG7Es9_fRhdS0aOwdqJIOVs=@protonmail.com> <875yp6obvw.fsf@gmail.com> Date: Tue, 22 Feb 2022 20:08:23 -0500 In-Reply-To: (John Kehayias's message of "Tue, 22 Feb 2022 21:22:54 +0000") Message-ID: <87tucqmltk.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) 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 (-) Hi, John Kehayias writes: > Hi Maxim, > > ------- Original Message ------- > > On Tuesday, February 22nd, 2022 at 4:00 PM, Maxim Cournoyer wrote: > >> I think your proposition makes a lot of sense; the handful of >> applications wanting raw pci.ids can have it via hwdata, while our >> pciutils package can take (a frozen/fixed variant of hwdata) as an input >> to a get a newer yet compressed pci.ids.gz file. >> >> Seems a win/win solution to me! >> > > Great! Brendan do you want to update your patches if you agree with > this approach? I will test hwdata later for my mangohud patch, but > since it is a simple copy install, I don't anticipate any problems. > > Oh, and if I understand correctly, keeping pciutils with a pci.ids.gz > would avoid a profile collision with hwdata's pci.ids (so you can have > both pciutils and the extra data of hwdata), right? Which would also > be good. Indeed, I hadn't thought about this but it seems a nice property. Maxim From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Feb 2022 06:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: "54069@debbugs.gnu.org" <54069@debbugs.gnu.org> Reply-To: John Kehayias Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164559699625740 (code B ref 54069); Wed, 23 Feb 2022 06:17:02 +0000 Received: (at 54069) by debbugs.gnu.org; 23 Feb 2022 06:16:36 +0000 Received: from localhost ([127.0.0.1]:43598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMkx2-0006h6-3W for submit@debbugs.gnu.org; Wed, 23 Feb 2022 01:16:36 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:22313) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMkwz-0006gs-Mi for 54069@debbugs.gnu.org; Wed, 23 Feb 2022 01:16:34 -0500 Date: Wed, 23 Feb 2022 06:16:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1645596987; bh=U5OponRba6V4dolZXpLTkbZN0+1YNsA8tXTCrPM18xo=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=pST0MMwKcuDZKfQ3iP4YmA2RnOuwNgXg7cZzAbd9Mn7piSL8XkPdIJFw2IkrL242I J5L6yL29IEMEQ/oPsBUSmYaf9dUbiJzXPEVIwyncivcCndklGxOdhqP4SX5Huyvq12 PLWfDiW5XLQC099U0lMX3o6kBQCln3FCu1V+fRGrWbYxwejZ4j001XB2TYNXt7JrWr nti0VfL9CVMGWwOmfYqd1+ouy+xqQfPtaWFkKmd9bPKNddMUlHZr5LxQpscDv275nn vI/p9oDzt0iwRjmnMkPALcQbAof0PEii/ZJJaaI0Hr51k14X6TqBEfmjfPjC+57TYF OJDWkJ1az9gSQ== From: John Kehayias Message-ID: In-Reply-To: <87tucqmltk.fsf@gmail.com> References: <8uXKUPs7X8nEsyxB7xZHJMEG1553-m9uZKlIht98yyMaoaKhVeQs5dJCWKtsvvLdUKVYFVay6GYodkE9WmKxlG7Es9_fRhdS0aOwdqJIOVs=@protonmail.com> <875yp6obvw.fsf@gmail.com> <87tucqmltk.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) 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 (-) I can report that the hwdata package installs for me, and a pending package= (mangohud) that wanted the pci.ids file is happy with just hwdata; pciutil= s is no longer needed. I did not do a review of the package definition other than this testing, bu= t it worked and was useful for me. From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Feb 2022 03:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brendan Tildesley Cc: 54069@debbugs.gnu.org Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164567356222219 (code B ref 54069); Thu, 24 Feb 2022 03:33:01 +0000 Received: (at 54069) by debbugs.gnu.org; 24 Feb 2022 03:32:42 +0000 Received: from localhost ([127.0.0.1]:47032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nN4ru-0005mD-BI for submit@debbugs.gnu.org; Wed, 23 Feb 2022 22:32:41 -0500 Received: from mail-qv1-f49.google.com ([209.85.219.49]:40879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nN4rr-0005lz-JR for 54069@debbugs.gnu.org; Wed, 23 Feb 2022 22:32:36 -0500 Received: by mail-qv1-f49.google.com with SMTP id fc19so1617439qvb.7 for <54069@debbugs.gnu.org>; Wed, 23 Feb 2022 19:32:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=4JjxcBnhNMUg5KeNWKVmK8QuVR1k62V7UCtiAGCz89E=; b=JH8s8y4F3ul5FaKh8jhgxR17gjhBqyok9k54EpfjixWmQRZBLzZZ5rgYUimizCfrLv HWBOw6kiSpZPvjz+G/1T8QEjIAqSQhVu8nrbgLqF5kkeUgfOR4HUY73e3ZVDQvCu6pK0 P3IpZvg2Qa4GRNjlt+D7fgl/D/2IoRXjHyAcopea9oc7ckz54OSEZ3R3ZR1OtjbXThfL jniY2pjVC9jw6xLEa5ruTNWd+mh1ihs42ypTALRFxJAlZgsEgfnOG4lnIyBttB/KvVup PlMbRajTbTFkbRvDmksUi10j1MRHRfCsAF2HxqwN96hdHjLXL/9l4g8rrtf5b3RV5tUO bHxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=4JjxcBnhNMUg5KeNWKVmK8QuVR1k62V7UCtiAGCz89E=; b=DlKRmn4WDzbQh8kesixKTB5bTS70lOB6daER0BdWJ94gc4ZBxDatZ7Hmftkyw+utIH ZW9iFb7okozU0TrW3Gy8CVODU3fxcKYGU1ktLKDgOkEMXaRUCIrgqBvauwW1F5t3XFuc PRt7jraLVyF3pJPrDwyPtSjG9mw/mVkMQEszRkehrcbk2WUf4qgV3yE6VYqvMdBzWPrC hiJfFD5hqlxMkD2xKYoEBc57MSS3NgXrhz8hjjV2cjej+nm0Dz6GdVi/UTIDIiB0Xa/s fMXbrtGS0VyeFx/LtkN1oFgsNE/XmG04W9nRWzxmWJR8x2QjKw2wgxM1xlAqGgQqPjf6 zUvg== X-Gm-Message-State: AOAM530EpIGYdd4O/CtOP0SkRCCMdpL9thw/3uBYnjChwRea/H0ajlyd esqx5wfNWqCuNFiSaBzKRwzEmVJlqmv1og== X-Google-Smtp-Source: ABdhPJybdkHet88+hROrINFqL5zbFCu348QxFOidFbVfFszDtyA+7PXW87RFrkcEVtFOkN/qMCB5vg== X-Received: by 2002:a05:6214:2489:b0:42c:ddfa:e233 with SMTP id gi9-20020a056214248900b0042cddfae233mr486061qvb.123.1645673549825; Wed, 23 Feb 2022 19:32:29 -0800 (PST) Received: from hurd (dsl-156-1.b2b2c.ca. [66.158.156.1]) by smtp.gmail.com with ESMTPSA id f7sm967473qtb.94.2022.02.23.19.32.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 19:32:29 -0800 (PST) From: Maxim Cournoyer References: <635599986.289572.1645350831631@office.mailbox.org> <20220220095557.1497-1-mail@brendan.scot> Date: Wed, 23 Feb 2022 22:32:28 -0500 In-Reply-To: <20220220095557.1497-1-mail@brendan.scot> (Brendan Tildesley's message of "Sun, 20 Feb 2022 20:55:56 +1100") Message-ID: <87tucpkkhf.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) 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 (-) Hello, Brendan Tildesley writes: > * gnu/packages/pciutils.scm (hwdata): New variable. > --- > gnu/packages/pciutils.scm | 29 +++++++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm > index b6b1e3ad85..416328bda2 100644 > --- a/gnu/packages/pciutils.scm > +++ b/gnu/packages/pciutils.scm > @@ -4,6 +4,7 @@ > ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice > ;;; Copyright =C2=A9 2019 Mathieu Othacehe > ;;; Copyright =C2=A9 2020 Jan (janneke) Nieuwenhuizen > +;;; Copyright =C2=A9 2022 Brendan Tildesley > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -25,7 +26,9 @@ (define-module (gnu packages pciutils) > #:use-module (guix download) > #:use-module ((guix licenses) #:prefix license:) > #:use-module (guix utils) > + #:use-module (guix git-download) > #:use-module (guix build-system gnu) > + #:use-module (guix build-system copy) > #:use-module (gnu packages) > #:use-module (gnu packages compression) > #:use-module (gnu packages pkg-config) > @@ -33,6 +36,32 @@ (define-module (gnu packages pciutils) > #:use-module (gnu packages linux) > #:use-module (gnu packages base)) >=20=20 > +(define-public hwdata > + (package > + (name "hwdata") > + (version "0.356") > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/vcrhonek/hwdata") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "0m04d93dwiplwp9v74nhnc0hyi2n007mylkg8f0frb46z5qjrpl3"))= )) > + (build-system copy-build-system) > + (arguments > + `(#:install-plan '(("pci.ids" "share/hwdata/pci.ids") > + ("pnp.ids" "share/hwdata/pnp.ids") > + ("usb.ids" "share/hwdata/usb.ids")))) A Makefile is provided and has an install target; we should use it. It installs the following files: --8<---------------cut here---------------start------------->8--- IDFILES =3D pci.ids usb.ids oui.txt iab.txt pnp.ids --8<---------------cut here---------------end--------------->8--- > + (home-page "https://pci-ids.ucw.cz") The home page should rather be "https://github.com/vcrhonek/hwdata"; this project aggregates various databases that are sourced not only from the pciutils project (see: https://github.com/vcrhonek/hwdata/blob/master/Makefile#L99). > + (synopsis "Hardware identification databases") > + (description "Hardware databases pci.ids, pnp.ids, and usb.ids inclu= ding > +all known ID's used in PCI devices: ID's of vendors, devices, subsystems= and > +device classes.") I'd take the summary and description from Fedora, which reads better to me [0]: synopsis: "Hardware identification and configuration data" =09 description: "@code{hwdata} contains various hardware identification and configuration data, such as the @file{pci.ids} and @file{usb.ids} databases." [0] https://src.fedoraproject.org/rpms/hwdata/blob/rawhide/f/hwdata.spec > + (license (list license:gpl2+ > + license:expat)))) ;; XFree86 1.0 > +;; Nit-pick: inline comments should be ";some comment" (typically no capitalization although XFree86 is OK and no space between the single semicolon and first comment word). Also some trailing ';;' was added by mistake. Could you make the changes along those lines and resend a v2 for the first patch? Thanks, Maxim From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Feb 2022 04:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: 54069@debbugs.gnu.org Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164576427613551 (code B ref 54069); Fri, 25 Feb 2022 04:45:02 +0000 Received: (at 54069) by debbugs.gnu.org; 25 Feb 2022 04:44:36 +0000 Received: from localhost ([127.0.0.1]:51015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNST5-0003WV-VZ for submit@debbugs.gnu.org; Thu, 24 Feb 2022 23:44:36 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:39518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNST4-0003WF-K3 for 54069@debbugs.gnu.org; Thu, 24 Feb 2022 23:44:35 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:105:465:1:3:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4K4ccr0HKgz9sQm; Fri, 25 Feb 2022 05:44:28 +0100 (CET) Date: Fri, 25 Feb 2022 05:44:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645764266; 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=2qJZNa/XDM69VaydoQCvvT1hmkkvGhEL+xI4aRi7Whw=; b=bibXnFGMVb5NZl1EysV/8ffVbThiU09z1hmWLHs59o8OTm9zw1qQq5W/HBxVq6aUm+TqgW /SO7k2QesgQmNTZx6VIQtWuZbzKJqv6Nzf0CXOQ350yk1d75RhAZbC/Y5+5zjEopeSgGlJ /AxbaYdVDhax7kWTljVkqUrnVVBST1Aefi0iWYHN9mjqxeSt9djxF169OvJmhCwqJGALHo Y2p4yW1n2EI5qP5lCAlWo7Q+yEhIszsVW8hz+tA9pZynG8AFHTaqN9bWtlsVJssDTBYo8s 6dwBtUu/F42rgvVebKF0v4wvPAF//R85adFXS+ZqaqogNE4yvi6NS/Sx9qHvNA== From: Brendan Tildesley Message-ID: <1186105933.49973.1645764264219@office.mailbox.org> In-Reply-To: <87tucpkkhf.fsf_-_@gmail.com> References: <635599986.289572.1645350831631@office.mailbox.org> <20220220095557.1497-1-mail@brendan.scot> <87tucpkkhf.fsf_-_@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Spam-Score: -0.7 (/) 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 (-) > On 02/24/2022 4:32 AM Maxim Cournoyer wrote: > ... > > A Makefile is provided and has an install target; we should use it. It > installs the following files: > > --8<---------------cut here---------------start------------->8--- > IDFILES = pci.ids usb.ids oui.txt iab.txt pnp.ids > --8<---------------cut here---------------end--------------->8--- > Note that it doesn't gzip them, and oui.txt is 8.4MB. Dependencies only tend to need one or two of these files, lke usb.ids or pci.ids. Also the hwdata project only updates these every couple months. We could define a package for each individual file, then if for some reason all are needed in a directory, a "hwdata" union package could be created. Also, this hwdata project is not fully up to date either but have 1-2 month old versions. It also installs dist-blacklist.conf. Do we need that? From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 1/4] gnu: Add hwdata. References: <635599986.289572.1645350831631@office.mailbox.org> In-Reply-To: <635599986.289572.1645350831631@office.mailbox.org> Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 04:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164584998821156 (code B ref 54069); Sat, 26 Feb 2022 04:34:02 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 04:33:08 +0000 Received: from localhost ([127.0.0.1]:54062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNolY-0005V9-A6 for submit@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:08 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:46916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNolV-0005UV-VN for 54069@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:07 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4K5DK74ngrz9sSc; Sat, 26 Feb 2022 05:32:59 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645849978; 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; bh=ZHRXsluTMAREtph1WiKdD24JGxv0QdYzv69RND/TwqI=; b=rAsWWuxF/6YIZGv0SKFY9HZzrppVmJU2bSidrfrMaMsKlXBNfkihfnlB3MzkQ+CNYMJ0RS w0MGgWxWlZ2mXaPkCTKDwHQo+xRrkoDgtIQ8Vy9I/Ur9DSBoKDw/c/vmYRShveOgRG9tN4 auY7QTtSY1aqZhvJhIjFEMYfpYvup4LNSoBNu9uhrE8kD4t53z4sVbzyPMLIsj/6Wv5JCD iLm6/l7ZTlUKVEXIgbVh2Df8NLrHfXRVVW3MGbExmEKypx0ZPvBEgHIosTHfWqYoI8bB+t OGg+ZC0ZYDADe8v4lR3W2qMPNCbiG5bmrWWmkeEq1OLB4eqBeZ1X/9eOF3RTyQ== Date: Sat, 26 Feb 2022 15:32:35 +1100 Message-Id: <20220226043238.2657-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/pciutils.scm (hwdata): New variable. --- gnu/packages/pciutils.scm | 41 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index b6b1e3ad85..f16f420ec2 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,11 +22,14 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages pciutils) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) + #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages pkg-config) @@ -33,6 +37,43 @@ (define-module (gnu packages pciutils) #:use-module (gnu packages linux) #:use-module (gnu packages base)) +(define-public hwdata + (package + (name "hwdata") + (version "0.356") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vcrhonek/hwdata") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0m04d93dwiplwp9v74nhnc0hyi2n007mylkg8f0frb46z5qjrpl3")))) + (build-system gnu-build-system) + (outputs '("out" "iab" "oui" "pci" "pnp" "usb")) + (native-inputs (list gzip)) + (arguments + ;; Tests require pciutils, python, podman. Disable to avoid recursive dep. + (list + #:tests? #f + #:configure-flags #~(list (string-append "--datadir=" #$output "/share")) + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (install-file "iab.txt" (string-append #$output:iab "/share/hwdata")) + (install-file "oui.txt" (string-append #$output:oui "/share/hwdata")) + (install-file "pci.ids" (string-append #$output:pci "/share/hwdata")) + (install-file "pnp.ids" (string-append #$output:pnp "/share/hwdata")) + (install-file "usb.ids" (string-append #$output:usb "/share/hwdata"))))))) + (home-page "https://github.com/vcrhonek/hwdata") + (synopsis "Hardware identification and configuration data") + (description "@code{hwdata} contains various hardware identification and + configuration data, such as the @file{pci.ids} and @file{usb.ids} databases.") + (license (list license:gpl2+ + license:expat)))) ;XFree86 1.0 + (define-public pciutils (package (name "pciutils") -- 2.34.0 From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 2/4] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 04:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164584999321176 (code B ref 54069); Sat, 26 Feb 2022 04:34:02 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 04:33:13 +0000 Received: from localhost ([127.0.0.1]:54065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNolc-0005VT-LJ for submit@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:13 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:47118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNolW-0005UX-EO for 54069@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:11 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4K5DK81mPZz9sS9; Sat, 26 Feb 2022 05:33:00 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645849978; 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=sp/iG8C6CEPjIqBgr1FFcDmcF+gwqbvM16U66N7q0ok=; b=YLm/ipcG03SiHX13uYxZ9fVRJR99VutJWWGrAVBnKCLnUTLGseoU42r7mS7pyg+cPcWNf8 STfwnd1faxw/VSkZOhTvPpL9HO7dArXgtm9W88TnQt++hh4FsKS8ONRxEjJPjZqzxKXuoZ JLLLoShn7hTAZ0AEUasRWg2LRzOApaNLdFPSGhoOtm4XcC/5SPHfXxkIt09f2ltAOV+r4G 5K9XtBAub4ZaM56yQZzh3wjAKh9T0eAVIVYmIUrbiwW4OSdD8bZ/a6/VXa/R8tSQ3CD+St LYZQQrebNZddM64SiJDpOlq+svG6jCpmeUVSFcQM2xtIW3nfo2u5ujXc/kDERA== Date: Sat, 26 Feb 2022 15:32:36 +1100 Message-Id: <20220226043238.2657-2-mail@brendan.scot> In-Reply-To: <20220226043238.2657-1-mail@brendan.scot> References: <20220226043238.2657-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/pciutils.scm (pciutils): [inputs]: Add hwdata:pci for latest pci.ids file. Remove zlib since the ids files aren't gzipped. [arguments]: Don't install update-pciids script or it's man page. Don't install bundled old pci.ids file, use hwdata instead. --- gnu/packages/pciutils.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index f16f420ec2..f7969e0c4d 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -92,7 +92,7 @@ (define-public pciutils `(#:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; There's no 'configure' script, just a raw makefile. (substitute* "Makefile" ,@(if (%current-target-system) @@ -122,13 +122,16 @@ (define-public pciutils (("^SHARED=.*$") ;; Build libpciutils.so. "SHARED := yes\n") - (("^ZLIB=.*$") - ;; Ask for zlib support, for 'pci.ids.gz' decompression. - "ZLIB := yes\n") (("^IDSDIR=.*$") ;; Installation directory of 'pci.ids.gz'. - "IDSDIR = $(SHAREDIR)/hwdata\n")))) + (string-append "IDSDIR = " (assoc-ref inputs "hwdata:pci") "share/hwdata\n")) + ;; Don't install update script, its man page, or old bundled pci.ids file. + ((".*INSTALL.*update-pciids .*") "") + (("update-pciids update-pciids.8 ") "") + (("(.*INSTALL.*)(update-pciids.8)(.*)" _ a _ b) + (string-append a b)) + ((".*INSTALL.*PCI_IDS.*") "")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) ;; Install the commands, library, and .pc files. @@ -157,7 +160,7 @@ (define-public pciutils ,@(if (hurd-target?) `(("hurd-patch" ,(search-patch "pciutils-hurd-fix.patch"))) '()) - ("zlib" ,zlib))) + ("hwdata:pci" ,hwdata "pci"))) (home-page "https://mj.ucw.cz/sw/pciutils/") (synopsis "Programs for inspecting and manipulating PCI devices") (description -- 2.34.0 From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 04:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164584999621195 (code B ref 54069); Sat, 26 Feb 2022 04:34:02 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 04:33:16 +0000 Received: from localhost ([127.0.0.1]:54068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNolg-0005Vn-66 for submit@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:16 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:59218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNold-0005V2-3o for 54069@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:13 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4K5DKH21l5z9sTd; Sat, 26 Feb 2022 05:33:07 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645849984; 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=ZaHH8ZFC2m2Bu8t8vk5GLp+Ge/HgyY0OL217zp99/ok=; b=m8/cOV8sKkkJvX9Gij6m8wBmXyyEqVRm9zzXBPoEoRaTsYfwBhluya3NT/p5a30jEG9P10 J6x6fSuKdTPEPqEKo9mcPFPbjpWY1+rYXvwm1dB2amgl1AcQ2+6CLw8eu/UJJwsp7v1lP9 3yr5LrcosXeGFZ4NQQNAcQ3xMVHEaO2xUWM5MZma6Eg8fqXMuzdRoriE1O4h+FDI86MvcI seS91SGvRbMtNMUrfK86xKafFppmryg/KMrin7wMyFj9KWM1Gpb4ux/vJsInkTdmWJBjS6 v/tRHWnaxOZgBQiOgrIJJ7EgdT12Bjj4hyNpnLUrIQ0wY1rhw5SVmp2upSioQQ== Date: Sat, 26 Feb 2022 15:32:37 +1100 Message-Id: <20220226043238.2657-3-mail@brendan.scot> In-Reply-To: <20220226043238.2657-1-mail@brendan.scot> References: <20220226043238.2657-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/virtualization.scm (libosinfo): [arguments]: Use Gexp style. Use hwdata package for latest usb.ids and pci.ids. [inputs]: Add hwdata:pci, hwdata:usb. remove pci.ids, usb.ids origins. Use new input style. --- gnu/packages/virtualization.scm | 64 ++++++++++++++------------------- 1 file changed, 26 insertions(+), 38 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 506ebe4bc2..c890b43a3e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Oleg Pykhalov +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,6 +99,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) + #:use-module (gnu packages pciutils) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) @@ -1027,46 +1029,32 @@ (define-public libosinfo "0nd360c9ampw8hb6xh5g45q858df2r4jj9q88bcl6gzgaj0l3wxl")))) (build-system meson-build-system) (arguments - `(#:configure-flags - (list (string-append "-Dwith-usb-ids-path=" - (assoc-ref %build-inputs "usb.ids")) - (string-append "-Dwith-pci-ids-path=" - (assoc-ref %build-inputs "pci.ids"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-osinfo-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "osinfo/osinfo_loader.c" - (("path = DATA_DIR.*") - (string-append "path = \"" (assoc-ref inputs "osinfo-db") - "/share/osinfo\";")))))))) + (list + #:configure-flags + #~(list + (string-append "-Dwith-usb-ids-path=" #$hwdata:usb "/share/hwdata/usb.ids") + (string-append "-Dwith-pci-ids-path=" #$hwdata:pci "/share/hwdata/pci.ids")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-osinfo-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "osinfo/osinfo_loader.c" + (("path = DATA_DIR.*") + (string-append "path = \"" #$osinfo-db "/share/osinfo\";")))))))) (inputs - `(("libsoup" ,libsoup-minimal-2) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("osinfo-db" ,osinfo-db))) + (list libsoup-minimal-2 + libxml2 + libxslt + osinfo-db)) (native-inputs - `(("glib" ,glib "bin") ; glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) - ("vala" ,vala) - ("intltool" ,intltool) - ("pkg-config" ,pkg-config) - ("pci.ids" - ,(origin - (method url-fetch) - (uri "https://github.com/pciutils/pciids/raw/ad02084f0bc143e3c15e31a6152a3dfb1d7a3156/pci.ids") - (sha256 - (base32 - "0kfhpj5rnh24hz2714qhfmxk281vwc2w50sm73ggw5d15af7zfsw")))) - ("usb.ids" - ,(origin - (method url-fetch) - (uri "https://svn.code.sf.net/p/linux-usb/repo/trunk/htdocs/usb.ids?r=2681") - (file-name "usb.ids") - (sha256 - (base32 - "1m6yhvz5k8aqzxgk7xj3jkk8frl1hbv0h3vgj4wbnvnx79qnvz3r")))))) + (list `(,glib "bin") ; glib-mkenums, etc. + gobject-introspection + gtk-doc/stable + vala + intltool + pkg-config + `(,hwdata "pci") + `(,hwdata "usb"))) (home-page "https://libosinfo.org/") (synopsis "Operating system information database") (description "libosinfo is a GObject based library API for managing -- 2.34.0 From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 4/4] gnu: libpciaccess: Use hwdata for pci.ids. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 04:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164585000221213 (code B ref 54069); Sat, 26 Feb 2022 04:34:03 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 04:33:22 +0000 Received: from localhost ([127.0.0.1]:54070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNoll-0005W4-HL for submit@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:21 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:46922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNola-0005Uv-OG for 54069@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:20 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4K5DKF2TYDz9sTj; Sat, 26 Feb 2022 05:33:05 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645849983; 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=fyKbFmRYWH04Q30NYoCpr2IESdxVpC6jHCM41BR4KOI=; b=GCfgi7mz0x9hlVwPm3oFXk3M8Hxx3GoBhTiGBkEtSz5sOPQ3xAGxYsuw+5DLejY+vemU+I TSmHjAW+21WgZqyirMvoCCtRJgxFnXgPbc2co56rzu5BQmuBzJrrY/k6pyEC3I3ggPLwvM FIANIHnQWLUsLQ9hqiP+xFuNklyEqLZIQAmWHZAwlNIv6D+FSNvYddRXgupbWrCbm7uwcp 1FLOpvYNeLMMQRp1mrFuPXLz63FWS/2p3Jku2sBwlTvTZObPrFFkqgPoEMawQ1IX2ctJOB 2MpjwFzX0cOlHD+COSCmvFGX0qsVe8StfHvxuQc5fqxcMGS2ET6dn3vlZ6xDyQ== Date: Sat, 26 Feb 2022 15:32:38 +1100 Message-Id: <20220226043238.2657-4-mail@brendan.scot> In-Reply-To: <20220226043238.2657-1-mail@brendan.scot> References: <20220226043238.2657-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/xorg.scm (libpciaccess): [arguments]: Remove zlib support since pci.ids isn't gzipped. Use Gexp. [inputs]: Add hwdata:pci, remove zlib, pciutils. [native-inputs]: Remove pkg-config since zlib isn't used. --- gnu/packages/xorg.scm | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 14e35d19ae..99ef114e9c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Lu Hui +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -1150,36 +1151,16 @@ (define-public libpciaccess (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libpciaccess-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11")))) (build-system gnu-build-system) (arguments - '(;; Make sure libpciaccess can read compressed 'pci.ids' files as - ;; provided by pciutils. - #:configure-flags - (list "--with-zlib" - (string-append "--with-pciids-path=" - (assoc-ref %build-inputs "pciutils") - "/share/hwdata")) - - #:phases - (modify-phases %standard-phases - (add-after 'install 'add-L-zlib - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Provide '-LZLIB/lib' next to '-lz' in the .la file. - (let ((zlib (assoc-ref inputs "zlib")) - (out (assoc-ref outputs "out"))) - (substitute* (string-append out "/lib/libpciaccess.la") - (("-lz") - (string-append "-L" zlib "/lib -lz"))) - #t)))))) - (inputs - (list zlib pciutils)) ;for 'pci.ids.gz' - (native-inputs - (list pkg-config)) + (list + #:configure-flags + #~(list (string-append "--with-pciids-path=" #$hwdata:pci "/share/hwdata")))) + (inputs (list `(,hwdata "pci"))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg PCI access library") (description "Xorg Generic PCI access library.") -- 2.34.0 From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 05:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brendan Tildesley Cc: 54069@debbugs.gnu.org Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164585166724378 (code B ref 54069); Sat, 26 Feb 2022 05:02:02 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 05:01:07 +0000 Received: from localhost ([127.0.0.1]:54092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNpCc-0006L6-Ph for submit@debbugs.gnu.org; Sat, 26 Feb 2022 00:01:07 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:39812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNpCa-0006KR-JL for 54069@debbugs.gnu.org; Sat, 26 Feb 2022 00:01:05 -0500 Received: by mail-qt1-f170.google.com with SMTP id b23so4407848qtt.6 for <54069@debbugs.gnu.org>; Fri, 25 Feb 2022 21:01:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=gY8p1m2AroNnMvi/xXclLuAL9xFAcJ/jjYuzmOANXNM=; b=HNU3y9YBaDY/Uxutvu2m7fPZtVhDrK+TvFX8Xt8n1mye9YlfQRZoakyF5yaMp81v5n rY5iXcrKSDTV3WQKfBmXyhVSDDih/AqpUs/8JgXOdUaJxCy/rNX04ywFgVzyPayEDRLu M98Z/laUowPMoWzUuPdCWj/AXsCOmn2Qkv8iveGi9HcwENkJBgVSoo05/ZPxMkTWeQ47 5wg2MMySqLIiOsUTsJYE0b1mVqOjd4lZZoZzIh5QJ+vENiGkvqnRY+5j00meuRm+CHXi oxAWF9HHl6DO+QekBiMIhzqa0b7JJY8GrNrZLqQfjTzY2tQWDJdlCphTZvzoCSm3h7R2 AqZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=gY8p1m2AroNnMvi/xXclLuAL9xFAcJ/jjYuzmOANXNM=; b=h1DpQ6QKtnLt6t7n7Q/+KnvGgvDknhXrg91Ez5YfrGQwI93xvdr+YD1Go9zQyGlvxm LoUhQ0kp4YXVMYQhbKO61cD2jNqRpV+G/aJ6t0kOIZvBnbdIvojStQWob3G7aFNdygb9 B/lxXHHsJDeVWTXyagmGq1GtH1cPZA8y/Hlf9htRVCcibXMCEAXySfIO+VI8lr4ze+oc M4joYDdmcyc5sjJkPjdMotC7Gg+84IcGmZjQLFn1yeXJo5Cq8nvLO2vESfIqvCOx0sYU CDZJZy4xa8oxRk/EdIe/hnGMTXCLDtwWiNVkjMAV6YYdywCakn/Tk+mFAMdM/5i4iGGG o+Vg== X-Gm-Message-State: AOAM530jK6MKvo1KbutGOLQ43JakOVweD4YRVbuX38yLGWQB0hr/j3py 7C+PWRlPSsDVW2SdXt83w4imPEDvzGk= X-Google-Smtp-Source: ABdhPJzydwZ/n31bcjIaBUzcp+KkbcZ1tk1FUna7Vm8TNE+K3ggtRpNiqbPUiQQiziaTtICF15fdMw== X-Received: by 2002:a05:622a:1116:b0:2dd:5b52:60ac with SMTP id e22-20020a05622a111600b002dd5b5260acmr9589297qty.237.1645851658724; Fri, 25 Feb 2022 21:00:58 -0800 (PST) Received: from hurd (dsl-149-67.b2b2c.ca. [66.158.149.67]) by smtp.gmail.com with ESMTPSA id h14-20020ac8584e000000b002ddf8b971b2sm2837680qth.87.2022.02.25.21.00.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 21:00:58 -0800 (PST) From: Maxim Cournoyer References: <635599986.289572.1645350831631@office.mailbox.org> <20220220095557.1497-1-mail@brendan.scot> <87tucpkkhf.fsf_-_@gmail.com> <1186105933.49973.1645764264219@office.mailbox.org> Date: Sat, 26 Feb 2022 00:00:57 -0500 In-Reply-To: <1186105933.49973.1645764264219@office.mailbox.org> (Brendan Tildesley's message of "Fri, 25 Feb 2022 05:44:24 +0100 (CET)") Message-ID: <878rtyxlva.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) 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 (-) Hi Brendan, Brendan Tildesley writes: >> On 02/24/2022 4:32 AM Maxim Cournoyer wrote: >> ... >> >> A Makefile is provided and has an install target; we should use it. It >> installs the following files: >> >> --8<---------------cut here---------------start------------->8--- >> IDFILES = pci.ids usb.ids oui.txt iab.txt pnp.ids >> --8<---------------cut here---------------end--------------->8--- >> > Note that it doesn't gzip them, and oui.txt is 8.4MB. Dependencies only tend > to need one or two of these files, lke usb.ids or pci.ids. Also the hwdata project > only updates these every couple months. We could define a package for each individual > file, then if for some reason all are needed in a directory, a "hwdata" union package > could be created. Unless there's a good reason to split the package (which could be multiple outputs instead of multiple packages), I'd leave it the way upstream intended it; and there's no better place for inspiration than [0] for that, as the Fedora package maintainer happens to also be the maintainer of hwdata :-). [0] https://src.fedoraproject.org/rpms/hwdata/blob/rawhide/f/hwdata.spec *If* we want to have our pciutils package use the hwdata pci.ids, we can avoid depending on the bigger 'hwdata' package by copying hwdata's pci.ids over its own, and then build as usual. Does that make sense? Thank you for looking into it! Maxim From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 11:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brendan Tildesley , 54069@debbugs.gnu.org Cc: John Kehayias , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16458744701103 (code B ref 54069); Sat, 26 Feb 2022 11:22:01 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 11:21:10 +0000 Received: from localhost ([127.0.0.1]:54351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNv8Q-0000Hj-El for submit@debbugs.gnu.org; Sat, 26 Feb 2022 06:21:10 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:41634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNv8N-0000HV-90 for 54069@debbugs.gnu.org; Sat, 26 Feb 2022 06:21:09 -0500 Received: from [192.168.104.254] ([188.189.133.236]) by michel.telenet-ops.be with bizsmtp id znM42600856BEPw06nM4HD; Sat, 26 Feb 2022 12:21:05 +0100 Message-ID: From: Maxime Devos Date: Sat, 26 Feb 2022 12:21:01 +0100 In-Reply-To: <20220226043238.2657-3-mail@brendan.scot> References: <20220226043238.2657-1-mail@brendan.scot> <20220226043238.2657-3-mail@brendan.scot> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-x/Fzms7QwSl2gvVcNLvq" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1645874465; bh=Dd5OReGpn80L2k+WQxXZ6sHZVcVR+HLDp9dyqD+RrHw=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=XqPejRGeFCpRQdcVQBhzLdWEnHxz4p65GRlAuffrGssHJ0Fvs3dcT3T6xBWrjt8vs JjKgo+iCXQVi9GgB1h5j3Bc0jH8+pG8/TgsYN5Zf9bUJTQEM1ePI2CdoemhJlAylXO 88wmGry7FSu7KHR4Hf/7dAs3DywOgKNhV/69IYiYzI9ez2BT5N9usO7QmOhOc32ukj p0aNvCwyR9nGtZ4gCCN3xl+TfYh5uaYNpFS+I985mbQRz6zbZXidUZYjSwu++rZny0 kReVqWE8HVzbPq0y+6zhmqmz+nzJZ7CkyHI2s/kRjc+u4ROSczPcD4Oi1TmyTtyBKJ Fck+SCo+TyDkQ== X-Spam-Score: -0.7 (/) 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 (-) --=-x/Fzms7QwSl2gvVcNLvq Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Brendan Tildesley schreef op za 26-02-2022 om 15:32 [+1100]: > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append "-Dwith-= usb-ids-path=3D" #$hwdata:usb "/share/hwdata/usb.ids") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append "-Dwith-= pci-ids-path=3D" #$hwdata:pci "/share/hwdata/pci.ids")) To allow for package transformations, I recommend using this-package-input or the like instead of hardcoding a particular package: #~(list (string-append "-Dwith-usb-ids-path=3D" #$(this-package-input "hwdata:usb") "/share/hwdata/usb.ids")) [...]) it might also be possible to use 'search-input-file' instead, avoiding input labels (untested): #~(let* ((inputs #$(input-tuples->gexp (package-inputs this-package))) (usb.ids (search-input-file inputs "/share/hwdata/usb.ids")) (pci.ids (search-input-file inputs "/share/hwdata/pci.ids"))) (list (string-append "-Dwith-usb-ids-path=3D" usb.ids) [...])) Greetings, Maxime. =20 --=-x/Fzms7QwSl2gvVcNLvq Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYhoNHRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7pLdAQCkZNcgN3MvSO3qBNGNectyRuvN Wxy6xg7ds+JW9LMn0gEAuYlqPn4sb5ZgBxaLiuRWU8lR3VOSzy705Dm9bEj/Iw8= =+HFP -----END PGP SIGNATURE----- --=-x/Fzms7QwSl2gvVcNLvq-- From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 2/4] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 14:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brendan Tildesley Cc: John Kehayias , 54069@debbugs.gnu.org Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164588518029483 (code B ref 54069); Sat, 26 Feb 2022 14:20:02 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 14:19:40 +0000 Received: from localhost ([127.0.0.1]:54587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNxvA-0007fT-5e for submit@debbugs.gnu.org; Sat, 26 Feb 2022 09:19:40 -0500 Received: from mail-qk1-f174.google.com ([209.85.222.174]:39920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNxv5-0007ev-5l for 54069@debbugs.gnu.org; Sat, 26 Feb 2022 09:19:35 -0500 Received: by mail-qk1-f174.google.com with SMTP id t21so6915230qkg.6 for <54069@debbugs.gnu.org>; Sat, 26 Feb 2022 06:19:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=8E9jYS504ANrbbR3RH0OqWCdTifGkgPWdTuhlcz4+YU=; b=II6zEhhug0LqIPDBhHV5SeHywpRwaTwWiYDGrH2iOqpbg0lxVAk8nXH3xkT6GrXvsF VATaLQOVOON7yhEMVoMuWVbLnpwAZlQtRFqbO7HQ5uctrL2vtekb1/8mO4xLButH/0HX ytpfGDCZYy/6ZGiXEKVWgR90K4mvO64et6MUBqQ4/kqcF8CG0+jE4RkP2Ry8Lrc2sdxC K/CgfXojYooUeY47jBRpHwttMMeKSTI/4avvjFNrDCxJlzDiMVIKDzOsLgk295bQ5xmU KKncnc0ocgaVchjgWEXv6dtsQWmLzx4Q/+mwT1jGzlmF5jwtuawgIsH02GE2c+ekrF3H PRPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=8E9jYS504ANrbbR3RH0OqWCdTifGkgPWdTuhlcz4+YU=; b=PKE4VeFttszN71XkWI2bCAwKpQcHXE5r8duyJtr0bPRDkxGVHYeoEgEbkfV70sP1vF dYUwxQ8FVPeVLO01LVgXugIGxLU2fQKuP2v6T91BkusyaypGpgMkrE8YwqFNYNpFA/+6 hwJHvuQd+1MgzMqq/Xpk0VtVh+mUV8vLCrGygfIlPbry3ELCY88YMvkQ2VqSe6yNh/iP Vg7BCaXzs1hNdOYMyzfA8jWMyJU50bywUXmSarMZSn+1m6H/554g1M5bFz27WbTRRqBL SmilHcaFEavGZ3FJGmJjFgTxkgtizbLxKzdJJN6zu4r771Js1oIjtyA+hPz1JR8jfjVu /EPA== X-Gm-Message-State: AOAM5304+NoFvfJxDcE3e241bMyxtIoU68FW/1wRmYd6JXsLHfZGLd8H De4dz3OizqA4WYFENTpXYRg= X-Google-Smtp-Source: ABdhPJwkJbNr9idgOh+/b+aTmrTD0fvsoKhGIsXpeSG3PmU5LVQgt1zjlZOh/3LTgHVgaXOJdpS/DQ== X-Received: by 2002:a37:9d92:0:b0:508:19df:5557 with SMTP id g140-20020a379d92000000b0050819df5557mr7419657qke.101.1645885169469; Sat, 26 Feb 2022 06:19:29 -0800 (PST) Received: from hurd (dsl-149-67.b2b2c.ca. [66.158.149.67]) by smtp.gmail.com with ESMTPSA id w140-20020a376292000000b00648e88c1f05sm2605739qkb.67.2022.02.26.06.19.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Feb 2022 06:19:29 -0800 (PST) From: Maxim Cournoyer References: <20220226043238.2657-1-mail@brendan.scot> <20220226043238.2657-2-mail@brendan.scot> Date: Sat, 26 Feb 2022 09:19:28 -0500 In-Reply-To: <20220226043238.2657-2-mail@brendan.scot> (Brendan Tildesley's message of "Sat, 26 Feb 2022 15:32:36 +1100") Message-ID: <874k4lww0f.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) 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 (-) Hi Brendan, Brendan Tildesley writes: > * gnu/packages/pciutils.scm (pciutils): > [inputs]: Add hwdata:pci for latest pci.ids file. Remove zlib since the ids > files aren't gzipped. > [arguments]: Don't install update-pciids script or it's man page. Don't > install bundled old pci.ids file, use hwdata instead. > --- > gnu/packages/pciutils.scm | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm > index f16f420ec2..f7969e0c4d 100644 > --- a/gnu/packages/pciutils.scm > +++ b/gnu/packages/pciutils.scm > @@ -92,7 +92,7 @@ (define-public pciutils > `(#:phases > (modify-phases %standard-phases > (replace 'configure > - (lambda* (#:key outputs #:allow-other-keys) > + (lambda* (#:key inputs outputs #:allow-other-keys) > ;; There's no 'configure' script, just a raw makefile. > (substitute* "Makefile" > ,@(if (%current-target-system) > @@ -122,13 +122,16 @@ (define-public pciutils > (("^SHARED=.*$") > ;; Build libpciutils.so. > "SHARED := yes\n") > - (("^ZLIB=.*$") > - ;; Ask for zlib support, for 'pci.ids.gz' decompression. > - "ZLIB := yes\n") > > (("^IDSDIR=.*$") > ;; Installation directory of 'pci.ids.gz'. > - "IDSDIR = $(SHAREDIR)/hwdata\n")))) > + (string-append "IDSDIR = " (assoc-ref inputs "hwdata:pci") "share/hwdata\n")) > + ;; Don't install update script, its man page, or old bundled pci.ids file. > + ((".*INSTALL.*update-pciids .*") "") > + (("update-pciids update-pciids.8 ") "") > + (("(.*INSTALL.*)(update-pciids.8)(.*)" _ a _ b) > + (string-append a b)) > + ((".*INSTALL.*PCI_IDS.*") "")))) > (replace 'install > (lambda* (#:key outputs #:allow-other-keys) > ;; Install the commands, library, and .pc files. > @@ -157,7 +160,7 @@ (define-public pciutils > ,@(if (hurd-target?) > `(("hurd-patch" ,(search-patch "pciutils-hurd-fix.patch"))) > '()) > - ("zlib" ,zlib))) > + ("hwdata:pci" ,hwdata "pci"))) > (home-page "https://mj.ucw.cz/sw/pciutils/") > (synopsis "Programs for inspecting and manipulating PCI devices") > (description Thank you for refreshing this series. It's starting to look good! For pciutils though, what I had in mind was more like this: 1. copy hwdata's pci.ids *over* pciutils one after unpack. This means hwdata can be a simple native-input and no run time reference gets registered. 2. This would leave the rest of the build unaltered, so that our pciutils package could still be smaller thanks to the gzip'd pci.ids.gz (generated at build time from the version copied from hwdawa). Does this makes sense? Thanks again, Maxim From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 1/4] gnu: Add hwdata. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 23:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brendan Tildesley Cc: John Kehayias , 54069@debbugs.gnu.org Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164591728226497 (code B ref 54069); Sat, 26 Feb 2022 23:15:01 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 23:14:42 +0000 Received: from localhost ([127.0.0.1]:56453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nO6Gw-0006tJ-Cq for submit@debbugs.gnu.org; Sat, 26 Feb 2022 18:14:42 -0500 Received: from mail-qk1-f180.google.com ([209.85.222.180]:46647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nO6Gv-0006t4-1B for 54069@debbugs.gnu.org; Sat, 26 Feb 2022 18:14:42 -0500 Received: by mail-qk1-f180.google.com with SMTP id f21so7583054qke.13 for <54069@debbugs.gnu.org>; Sat, 26 Feb 2022 15:14:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=fDhRpA6cC1Ildl5ucBzRnP5ebD6HaMa1Oe8P7MmVwaQ=; b=DW7obrZIAI50yH5tDoVJtRK8pa2Nz4ohhOZdUaXIAN6YTmkVHIHDgoP/JsE79MBVMK HMvNnhFx9oll5O8l/a3RjtNZD22evxTqLJNHGA4cpoW+Sszxd8Bd8QBbAWx6WCu/xeNa bgi5KSva5xVvQoJ9BzTGuqBcsZYdSeUiDufy5WqXsb6cuZINPhGlwBNU6595TuOtaTEW K+CY8pJvoKW2dXL0etLPmW3Q32I1LmWJ5fVEkl68VKuy+g41vWvNKqirF//6YqAYF/pZ WETYDnLMhH7mVp1EJH7WxYmFAlAAgXacDPGOf4FS8axcxpAV/buB79M3TbQN/fZCWG9+ 9Fzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=fDhRpA6cC1Ildl5ucBzRnP5ebD6HaMa1Oe8P7MmVwaQ=; b=GGq4u2E/2q6HvWH6lD6vstK9eYp2yiSxyZaeqp0fRvSmllixht3jaCzLVlJSaFBLtd sXCE1ZWUu2qZhiaW3GvM7Hl0IMWe1ae9rxucXwIz8Vzw5cGMdLysXze2PaxpgVEo4EuK DNS+wBqRVfxmSORymHFyO1QSweSLl+vuVIy+YkLuGpm5vLhV+Ul21manRU5HhOs5Qcmo yPX8LMm0TDKncsTISUuDwt6hOJxkMJW2Kjw0MU4gId7E3zESvRyloPmRslhAF+d9gm67 haxGWClIZ/mMzJvyINSZ0g6mmuohx38dFLRKRmSw/AjUbGWdNW42VHIDwaMeuZvfNyTL dFvQ== X-Gm-Message-State: AOAM532JGjyT+nYskuF4OJ7f444+vxWSGmE5dC/y31CHt6TTPq2Z1kM3 r61/6StzwVjXKKuAtkWejJM= X-Google-Smtp-Source: ABdhPJw2K5WFHyPmWTFK3Oqd5P6gosAi7T1T/nF68e5A1I5ko/Yh+N34+tP8l4UXPT1nInSSwWWoYA== X-Received: by 2002:a37:68d5:0:b0:47d:835e:384d with SMTP id d204-20020a3768d5000000b0047d835e384dmr8473685qkc.87.1645917275415; Sat, 26 Feb 2022 15:14:35 -0800 (PST) Received: from hurd (dsl-149-67.b2b2c.ca. [66.158.149.67]) by smtp.gmail.com with ESMTPSA id j18-20020ac85c52000000b002deaca065dfsm4024763qtj.10.2022.02.26.15.14.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Feb 2022 15:14:34 -0800 (PST) From: Maxim Cournoyer References: <20220226043238.2657-1-mail@brendan.scot> Date: Sat, 26 Feb 2022 18:14:33 -0500 In-Reply-To: <20220226043238.2657-1-mail@brendan.scot> (Brendan Tildesley's message of "Sat, 26 Feb 2022 15:32:35 +1100") Message-ID: <87zgmduso6.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) 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 (-) Hello Brendan, Brendan Tildesley writes: > * gnu/packages/pciutils.scm (hwdata): New variable. > --- > gnu/packages/pciutils.scm | 41 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 41 insertions(+) > > diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm > index b6b1e3ad85..f16f420ec2 100644 > --- a/gnu/packages/pciutils.scm > +++ b/gnu/packages/pciutils.scm > @@ -4,6 +4,7 @@ > ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice > ;;; Copyright =C2=A9 2019 Mathieu Othacehe > ;;; Copyright =C2=A9 2020 Jan (janneke) Nieuwenhuizen > +;;; Copyright =C2=A9 2022 Brendan Tildesley > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -21,11 +22,14 @@ > ;;; along with GNU Guix. If not, see . >=20=20 > (define-module (gnu packages pciutils) > + #:use-module (guix gexp) > #:use-module (guix packages) > #:use-module (guix download) > #:use-module ((guix licenses) #:prefix license:) > #:use-module (guix utils) > + #:use-module (guix git-download) > #:use-module (guix build-system gnu) > + #:use-module (guix build-system trivial) I've removed the above extraneous import, > #:use-module (gnu packages) > #:use-module (gnu packages compression) > #:use-module (gnu packages pkg-config) > @@ -33,6 +37,43 @@ (define-module (gnu packages pciutils) > #:use-module (gnu packages linux) > #:use-module (gnu packages base)) >=20=20 > +(define-public hwdata > + (package > + (name "hwdata") > + (version "0.356") > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/vcrhonek/hwdata") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "0m04d93dwiplwp9v74nhnc0hyi2n007mylkg8f0frb46z5qjrpl3"))= )) > + (build-system gnu-build-system) > + (outputs '("out" "iab" "oui" "pci" "pnp" "usb")) > + (native-inputs (list gzip)) > + (arguments > + ;; Tests require pciutils, python, podman. Disable to avoid recursi= ve dep. > + (list > + #:tests? #f > + #:configure-flags #~(list (string-append "--datadir=3D" #$output "= /share")) > + #:phases > + #~(modify-phases %standard-phases > + (replace 'install > + (lambda _ > + (install-file "iab.txt" (string-append #$output:iab "/shar= e/hwdata")) > + (install-file "oui.txt" (string-append #$output:oui "/shar= e/hwdata")) > + (install-file "pci.ids" (string-append #$output:pci "/shar= e/hwdata")) > + (install-file "pnp.ids" (string-append #$output:pnp "/shar= e/hwdata")) > + (install-file "usb.ids" (string-append #$output:usb "/shar= e/hwdata"))))))) > + (home-page "https://github.com/vcrhonek/hwdata") > + (synopsis "Hardware identification and configuration data") > + (description "@code{hwdata} contains various hardware identification= and > + configuration data, such as the @file{pci.ids} and @file{usb.ids} > databases.") expound the description a bit to provide guidance about output usage, e.g.: --8<---------------cut here---------------start------------->8--- @@ -69,7 +69,10 @@ (define-public hwdata (home-page "https://github.com/vcrhonek/hwdata") (synopsis "Hardware identification and configuration data") (description "@code{hwdata} contains various hardware identification a= nd - configuration data, such as the @file{pci.ids} and @file{usb.ids} databas= es.") +configuration data, such as the @file{pci.ids} and @file{usb.ids} database= s. +Each database is contained in a specific package output, such as the +@code{pci} output for @file{pci.ids}, the @code{usb} output for +@file{usb.ids}, etc.") (license (list license:gpl2+ license:expat)))) ;XFree86 1.0 --8<---------------cut here---------------end--------------->8--- and pushed this first commit as 7f8bc02fd8. Thanks! Maxim From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 01:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , 54069@debbugs.gnu.org Cc: John Kehayias , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16459258369528 (code B ref 54069); Sun, 27 Feb 2022 01:38:02 +0000 Received: (at 54069) by debbugs.gnu.org; 27 Feb 2022 01:37:16 +0000 Received: from localhost ([127.0.0.1]:56493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nO8Ut-0002Tc-Kz for submit@debbugs.gnu.org; Sat, 26 Feb 2022 20:37:15 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:52146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nO8Ur-0002T6-6m for 54069@debbugs.gnu.org; Sat, 26 Feb 2022 20:37:14 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4K5mMk2xnGz9sSm; Sun, 27 Feb 2022 02:37:06 +0100 (CET) Date: Sun, 27 Feb 2022 02:37:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645925824; 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=IC7yVRvXVDG9Hl7Q492RiDZgZPy8Q7tOSKlYM08kTSc=; b=MOYp4iIEEcHD6ivieyiVfoz3N8AeVqNz0DIKP1b7at0g3hob0v6qgwtjh98sO6UB0kCtyH Nizc7+b5aEJhM5xmwlLGj4mf5DeZjyVBsWqL/3MEEw8yptAB8SKfCnuXf1NjIV4a5vT7AR 0iOsiuZRZx7z2BQReWKdWQhgL5mrGyJiJW0vQq4+mFThG+uvIYPAtGMlg2nKrFkT51s+zp lmNf5Vtk4TBp0Cnt9gsXe6wKs76rFuDqeCIkK7psHIRhSfZ3BBW8zY81US0Q2CNEFfQcwi obEZLRp6HVTdVtQOY1Ch1BjQqjOGbYzxL4yhdXj/hFOMvTsEe0f4k9tdakcA+Q== From: Brendan Tildesley Message-ID: <190017101.145924.1645925822107@office.mailbox.org> In-Reply-To: References: <20220226043238.2657-1-mail@brendan.scot> <20220226043238.2657-3-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Priority: 3 Importance: Normal X-Spam-Score: -0.7 (/) 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 (-) > On 02/26/2022 12:21 PM Maxime Devos wrote: >=20 > =20 > Brendan Tildesley schreef op za 26-02-2022 om 15:32 [+1100]: > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append "-Dwit= h-usb-ids-path=3D" #$hwdata:usb "/share/hwdata/usb.ids") > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append "-Dwit= h-pci-ids-path=3D" #$hwdata:pci "/share/hwdata/pci.ids")) >=20 > To allow for package transformations, I recommend using > this-package-input or the like instead of hardcoding a particular > package: >=20 > #~(list > (string-append > "-Dwith-usb-ids-path=3D" > #$(this-package-input "hwdata:usb") "/share/hwdata/usb.ids")) > [...]) >=20 > it might also be possible to use 'search-input-file' instead, avoiding > input labels (untested): >=20 > #~(let* ((inputs #$(input-tuples->gexp (package-inputs this-package))) > (usb.ids (search-input-file inputs "/share/hwdata/usb.ids")) > (pci.ids (search-input-file inputs "/share/hwdata/pci.ids"))) > (list (string-append "-Dwith-usb-ids-path=3D" usb.ids) [...])) >=20 I got strange errors trying that and couldn't figure out how to make it wor= k. There are no examples of input-tuples->gexp being used in a package definit= ion. This works: #~(list (string-append "-Dwith-usb-ids-path=3D" (search-input-file %build-inputs "/share/hwdata/usb= .ids")) (string-append "-Dwith-pci-ids-path=3D" (search-input-file %build-inputs "/share/hwdata/pci= .ids"))) I thought %build-inputs was not a recommended thing to use though? > Greetings, > Maxime. Backtrace: In guix/store.scm: 1385:9 19 (map/accumulate-builds # =E2=80=A6) 1320:8 18 (call-with-build-handler # =E2=80=A6) In guix/scripts/build.scm: 582:16 17 (_ #) 571:24 16 (_ # =E2=80=A6) In guix/packages.scm: 1260:17 15 (supported-package? # =E2=80=A6) In guix/memoization.scm: 101:0 14 (_ # # =E2=80=A6) In guix/packages.scm: 1238:37 13 (_) 1498:16 12 (package->bag _ _ _ #:graft? _) 1603:43 11 (thunk) In ice-9/eval.scm: 191:35 10 (_ #(#(#)= =E2=80=A6)) 173:47 9 (_ #(#(#)= =E2=80=A6)) 213:29 8 (_ #(#(#)= =E2=80=A6)) 155:9 7 (_ #(#(#)= =E2=80=A6)) 202:35 6 (_ #(#(#)= =E2=80=A6)) In guix/gexp.scm: 1886:4 5 (input-tuples->gexp (("glib" # =E2= =80=A6) =E2=80=A6) =E2=80=A6) In srfi/srfi-1.scm: 586:17 4 (map1 (("glib" # = =E2=80=A6) =E2=80=A6)) In guix/gexp.scm: 1886:9 3 (_ _) In ice-9/boot-9.scm: 1685:16 2 (raise-exception _ #:continuable? _) 1685:16 1 (raise-exception _ #:continuable? _) 1685:16 0 (raise-exception _ #:continuable? _) ice-9/boot-9.scm:1685:16: In procedure raise-exception: Throw to key `match-error' with args `("match" "no matching pattern" ("glib= " # "bin"))'. From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 10:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brendan Tildesley , 54069@debbugs.gnu.org Cc: John Kehayias , ludo@gnu.org, Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16459588275882 (code B ref 54069); Sun, 27 Feb 2022 10:48:01 +0000 Received: (at 54069) by debbugs.gnu.org; 27 Feb 2022 10:47:07 +0000 Received: from localhost ([127.0.0.1]:56902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOH51-0001Wo-9P for submit@debbugs.gnu.org; Sun, 27 Feb 2022 05:47:07 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:34094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOH4z-0001Wf-5X for 54069@debbugs.gnu.org; Sun, 27 Feb 2022 05:47:06 -0500 Received: from [192.168.160.254] ([188.188.52.46]) by michel.telenet-ops.be with bizsmtp id 0An22700B0zovbQ06An2ke; Sun, 27 Feb 2022 11:47:03 +0100 Message-ID: From: Maxime Devos Date: Sun, 27 Feb 2022 11:46:57 +0100 In-Reply-To: <190017101.145924.1645925822107@office.mailbox.org> References: <20220226043238.2657-1-mail@brendan.scot> <20220226043238.2657-3-mail@brendan.scot> <190017101.145924.1645925822107@office.mailbox.org> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-7on8p+R3hgkh5bsOXTc2" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1645958823; bh=qYp2sH2DAwmdYuCbhwQ4pmZPCDCK//5Wmsa2k86d+og=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=nEDLezekVcyFfWHOc1sfS5Ui5giDbjrc0BMhfsYRDTb+N6MacpYkXKCFlX5RZPs9x 4A6UtNdKB4Lre3aeB4Z5H037y4m+e44EpHjllQUMC1HuaMFSdFFMdKpLZH/kZW9PMX FMgf+fltUG6bGhMT8AwCE0mA3B8T5uqAKawWhz/hWSwxozdM0JcM2CmjJrLPOgCwsB +jZ3p8UxG1de2QCU/qPhoKUciHqjxG8qiyP/CgZZ/6qxC4+8ghOxxJaktX158NTJBd zFEeSSWZrNi9HzINJH+ifqXVuCC9ByrLD5zm3+5AnRXTkj7muhSvHkT9M+uScoGK9o 4Ti2koC+dAT2Q== X-Spam-Score: -0.7 (/) 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 (-) --=-7on8p+R3hgkh5bsOXTc2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Brendan Tildesley schreef op zo 27-02-2022 om 02:37 [+0100]: > I got strange errors trying that and couldn't figure out how to make it w= ork. > There are no examples of input-tuples->gexp being used in a package defin= ition. >=20 > This works: > =C2=A0#~(list > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append "-Dwith-u= sb-ids-path=3D" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (search-= input-file %build-inputs "/share/hwdata/usb.ids")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append "-Dwith-p= ci-ids-path=3D" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (search-= input-file %build-inputs "/share/hwdata/pci.ids"))) >=20 > I thought %build-inputs was not a recommended thing to use though? It is. Anyway, I found a solution, see attachement. Maybe the 'gexp-input-compiler' could be moved into (guix gexp) and 'this-package-input-list'/'this-package-native-input-list' could be moved into (guix packages) (+ documented in the manual)? CC'ing ludo for the proposed new gexpology. Greetings, Maxime. --=-7on8p+R3hgkh5bsOXTc2 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYhtWoRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7nVEAP9sDmzIo/6OVKZEldZeI64qXr4O V0YkMCTDFGNSttmScAD8CraziR0fM9eoE5OWr2vfaPZ3Cf9rYJgiVzs8DnvwfQY= =hrh0 -----END PGP SIGNATURE----- --=-7on8p+R3hgkh5bsOXTc2-- From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 10:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brendan Tildesley , 54069@debbugs.gnu.org Cc: John Kehayias , ludo@gnu.org, Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16459593936835 (code B ref 54069); Sun, 27 Feb 2022 10:57:01 +0000 Received: (at 54069) by debbugs.gnu.org; 27 Feb 2022 10:56:33 +0000 Received: from localhost ([127.0.0.1]:56917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOHE8-0001mB-KL for submit@debbugs.gnu.org; Sun, 27 Feb 2022 05:56:32 -0500 Received: from albert.telenet-ops.be ([195.130.137.90]:52428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOHE6-0001m1-Rp for 54069@debbugs.gnu.org; Sun, 27 Feb 2022 05:56:31 -0500 Received: from [192.168.160.254] ([188.188.52.46]) by albert.telenet-ops.be with bizsmtp id 0AwU2700F0zovbQ06AwUKi; Sun, 27 Feb 2022 11:56:29 +0100 Message-ID: <58cd826af583022698ee91d0c2a25526ccb27756.camel@telenet.be> From: Maxime Devos Date: Sun, 27 Feb 2022 11:56:28 +0100 In-Reply-To: References: <20220226043238.2657-1-mail@brendan.scot> <20220226043238.2657-3-mail@brendan.scot> <190017101.145924.1645925822107@office.mailbox.org> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-w8wGENj1z7B2bKmT5uuI" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1645959389; bh=yOeIa+v51rF12q8WgBzq+kMdnieBlEeMaS/1JkV60DQ=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=iwbrv9mEzp2OjxoYNEagLaJHgEkj6cHEhSRA1UH1YrYCPWm09VHDvfwc9aGigPmt6 vObR0Md08T60DtiZ+nIHsACVwfAO4wSVlHHBQPq0cqZuuMncHon4/rkkU0VFeBKshs EyiMjc9VTcPl3o5Pxg7C9rk/WTKqzMLdv5eiXO9RCi4V+FJS2i0PJxEpF4c3WRmWlT 8x0aGjDa0Ugg7Vs9SJsNFx2XoyKQ35w3SD0KUCNxO0vmzuup0qB3LtSjiQNM5D5sw9 L3cbci1pOGfU1tGupSELMO7zDmBJazp75XLwlsMXCcFZQyf3AJ27dzN/3vp97R0lDY bN5vv/yUXQG3A== X-Spam-Score: -0.7 (/) 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 (-) --=-w8wGENj1z7B2bKmT5uuI Content-Type: multipart/mixed; boundary="=-kVodbn5zNFeKvYp2Cv0A" --=-kVodbn5zNFeKvYp2Cv0A Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Maxime Devos schreef op zo 27-02-2022 om 11:46 [+0100]: >=20 > It is. Anyway, I found a solution, see attachement. Oops forgot the attachement > Maybe the 'gexp-input-compiler' could be moved into (guix gexp) > and 'this-package-input-list'/'this-package-native-input-list' could > be moved into (guix packages) (+ documented in the manual)? >=20 > CC'ing ludo for the proposed new gexpology. >=20 > Greetings, > Maxime. --=-kVodbn5zNFeKvYp2Cv0A Content-Disposition: attachment; filename="foo" Content-Type: text/plain; name="foo"; charset="UTF-8" Content-Transfer-Encoding: base64 KHVzZS1tb2R1bGVzIChndWl4IHBhY2thZ2VzKSAoZ251IHBhY2thZ2VzKSAoZ251IHBhY2thZ2Vz IGd0aykgKGdudSBwYWNrYWdlcyBnbGliKSAoZ3VpeCBnZXhwKQogICAgICAgICAgICAgKGdudSBw YWNrYWdlcyBnbm9tZSkgKGdudSBwYWNrYWdlcyB4bWwpIChnbnUgcGFja2FnZXMgdmlydHVhbGl6 YXRpb24pCiAgICAgICAgICAgICAoZ251IHBhY2thZ2VzIHBrZy1jb25maWcpIChndWl4IGdpdC1k b3dubG9hZCkgKGd1aXggYnVpbGQtc3lzdGVtIGdudSkKICAgICAgICAgICAgIChndWl4IGJ1aWxk LXN5c3RlbSBtZXNvbikgKGdudSBwYWNrYWdlcyBjb21wcmVzc2lvbikgKGljZS05IG1hdGNoKQog ICAgICAgICAgICAgKGd1aXggbW9uYWRzKSAoZ3VpeCBzdG9yZSkgKGd1aXggZGVyaXZhdGlvbnMp CiAgICAgICAgICAgICAoKGd1aXggbGljZW5zZXMpICM6cHJlZml4IGxpY2Vuc2U6KSkKCgooZGVm aW5lIDxnZXhwLWlucHV0PiAoQEAgKGd1aXggZ2V4cCkgPGdleHAtaW5wdXQ+KSkKKGRlZmluZS1n ZXhwLWNvbXBpbGVyIGdleHAtaW5wdXQtY29tcGlsZXIgPGdleHAtaW5wdXQ+CiAgY29tcGlsZXIg PT4gKGxhbWJkYSAoaW5wdXQgc3lzdGVtIHRhcmdldCkKICAgICAgICAgICAgICAgIChsb3dlci1v YmplY3QgKGdleHAtaW5wdXQtdGhpbmcgaW5wdXQpIHN5c3RlbQogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAjOnRhcmdldAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoYW5kIChu b3QgKGdleHAtaW5wdXQtbmF0aXZlPyBpbnB1dCkpIHRhcmdldCkpKQogIGV4cGFuZGVyID0+IChs YW1iZGEgKG9iamVjdCBsb3dlcmVkIG91dHB1dCkKICAgICAgICAgICAgICAgIChkZXJpdmF0aW9u LT5vdXRwdXQtcGF0aCBsb3dlcmVkIChnZXhwLWlucHV0LW91dHB1dCBvYmplY3QpKSkpCgogCihk ZWZpbmUtcHVibGljIGh3ZGF0YQogIChwYWNrYWdlCiAgICAobmFtZSAiaHdkYXRhIikKICAgICh2 ZXJzaW9uICIwLjM1NiIpCiAgICAoc291cmNlIChvcmlnaW4KICAgICAgICAgICAgICAobWV0aG9k IGdpdC1mZXRjaCkKICAgICAgICAgICAgICAodXJpIChnaXQtcmVmZXJlbmNlCiAgICAgICAgICAg ICAgICAgICAgKHVybCAiaHR0cHM6Ly9naXRodWIuY29tL3ZjcmhvbmVrL2h3ZGF0YSIpCiAgICAg ICAgICAgICAgICAgICAgKGNvbW1pdCAoc3RyaW5nLWFwcGVuZCAidiIgdmVyc2lvbikpKSkKICAg ICAgICAgICAgICAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCiAgICAg ICAgICAgICAgKHNoYTI1NgogICAgICAgICAgICAgICAoYmFzZTMyCiAgICAgICAgICAgICAgICAi MG0wNGQ5M2R3aXBsd3A5djc0bmhuYzBoeWkybjAwN215bGtnOGYwZnJiNDZ6NXFqcnBsMyIpKSkp CiAgICAoYnVpbGQtc3lzdGVtIGdudS1idWlsZC1zeXN0ZW0pCiAgICAob3V0cHV0cyAnKCJvdXQi ICJpYWIiICJvdWkiICJwY2kiICJwbnAiICJ1c2IiKSkKICAgIChuYXRpdmUtaW5wdXRzIChsaXN0 IGd6aXApKQogICAgKGFyZ3VtZW50cwogICAgIDs7IFRlc3RzIHJlcXVpcmUgcGNpdXRpbHMsIHB5 dGhvbiwgcG9kbWFuLiBEaXNhYmxlIHRvIGF2b2lkIHJlY3Vyc2l2ZSBkZXAuCiAgICAgKGxpc3QK ICAgICAgIzp0ZXN0cz8gI2YKICAgICAgIzpjb25maWd1cmUtZmxhZ3MgI34obGlzdCAoc3RyaW5n LWFwcGVuZCAiLS1kYXRhZGlyPSIgIyRvdXRwdXQgIi9zaGFyZSIpKQogICAgICAjOnBoYXNlcwog ICAgICAjfihtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKICAgICAgICAgIChyZXBsYWNl ICdpbnN0YWxsCiAgICAgICAgICAgIChsYW1iZGEgXwogICAgICAgICAgICAgIChpbnN0YWxsLWZp bGUgImlhYi50eHQiIChzdHJpbmctYXBwZW5kICMkb3V0cHV0OmlhYiAiL3NoYXJlL2h3ZGF0YSIp KQogICAgICAgICAgICAgIChpbnN0YWxsLWZpbGUgIm91aS50eHQiIChzdHJpbmctYXBwZW5kICMk b3V0cHV0Om91aSAiL3NoYXJlL2h3ZGF0YSIpKQogICAgICAgICAgICAgIChpbnN0YWxsLWZpbGUg InBjaS5pZHMiIChzdHJpbmctYXBwZW5kICMkb3V0cHV0OnBjaSAiL3NoYXJlL2h3ZGF0YSIpKQog ICAgICAgICAgICAgIChpbnN0YWxsLWZpbGUgInBucC5pZHMiIChzdHJpbmctYXBwZW5kICMkb3V0 cHV0OnBucCAiL3NoYXJlL2h3ZGF0YSIpKQogICAgICAgICAgICAgIChpbnN0YWxsLWZpbGUgInVz Yi5pZHMiIChzdHJpbmctYXBwZW5kICMkb3V0cHV0OnVzYiAiL3NoYXJlL2h3ZGF0YSIpKSkpKSkp CiAgICAoaG9tZS1wYWdlICJodHRwczovL2dpdGh1Yi5jb20vdmNyaG9uZWsvaHdkYXRhIikKICAg IChzeW5vcHNpcyAiSGFyZHdhcmUgaWRlbnRpZmljYXRpb24gYW5kIGNvbmZpZ3VyYXRpb24gZGF0 YSIpCiAgICAoZGVzY3JpcHRpb24gIkBjb2Rle2h3ZGF0YX0gY29udGFpbnMgdmFyaW91cyBoYXJk d2FyZSBpZGVudGlmaWNhdGlvbiBhbmQKIGNvbmZpZ3VyYXRpb24gZGF0YSwgc3VjaCBhcyB0aGUg QGZpbGV7cGNpLmlkc30gYW5kIEBmaWxle3VzYi5pZHN9IGRhdGFiYXNlcy4iKQogICAgKGxpY2Vu c2UgKGxpc3QgbGljZW5zZTpncGwyKwogICAgICAgICAgICAgICAgICAgbGljZW5zZTpleHBhdCkp KSkgO1hGcmVlODYgMS4wCgoKKGRlZmluZSogKHBhY2thZ2UtaW5wdXQtbGlzdC0+YnVpbGQtaW5w dXQtbGlzdCBpbnB1dHMgbmF0aXZlPykKICAiRXhwYW5kIElOUFVUUywgYSBsaXN0IG9mIGlucHV0 IHR1cGxlcywgaW50byBhIGxpc3Qgb2YgbmFtZS88Z2V4cC1pbnB1dD4KdHVscGxlcy4iCiAgI34n IyQobWFwIChtYXRjaC1sYW1iZGEKICAgICAgICAgICAgICAoKG5hbWUgb2JqZWN0IG91dHB1dCkK ICAgICAgICAgICAgICAgI34oIyRuYW1lIC4gIyQoZ2V4cC1pbnB1dCBvYmplY3Qgb3V0cHV0ICM6 bmF0aXZlPyBuYXRpdmU/KSkpCiAgICAgICAgICAgICAgKChuYW1lIG9iamVjdCkgI34oIyRuYW1l IC4gIyRvYmplY3QpKSkKICAgICAgICAgICAgaW5wdXRzKSkKCihkZWZpbmUtc3ludGF4IHRoaXMt cGFja2FnZS1pbnB1dC1saXN0CiAgKGlkZW50aWZpZXItc3ludGF4CiAgICAocGFja2FnZS1pbnB1 dC1saXN0LT5idWlsZC1pbnB1dC1saXN0CiAgICAgIChhcHBlbmQgKHBhY2thZ2UtaW5wdXRzIHRo aXMtcGFja2FnZSkKICAgICAgICAgICAgICAocGFja2FnZS1wcm9wYWdhdGVkLWlucHV0cyB0aGlz LXBhY2thZ2UpKQogICAgICAjZmFsc2UpKSkKCihkZWZpbmUtc3ludGF4IHRoaXMtcGFja2FnZS1u YXRpdmUtaW5wdXQtbGlzdAogIChpZGVudGlmaWVyLXN5bnRheAogICAgKHBhY2thZ2UtaW5wdXQt bGlzdC0+YnVpbGQtaW5wdXQtbGlzdAogICAgICAocGFja2FnZS1uYXRpdmUtaW5wdXRzIHRoaXMt cGFja2FnZSkgI3RydWUpKSkKCihkZWZpbmUgbGlib3NpbmZvLW5ldwogIChwYWNrYWdlCiAgICAo aW5oZXJpdCAoc3BlY2lmaWNhdGlvbi0+cGFja2FnZSAibGlib3NpbmZvIikpCiAgICAoYXJndW1l bnRzCiAgICAgIChsaXN0ICM6Y29uZmlndXJlLWZsYWdzCiAgICAgICAgICAgICN+KGxldCogKChp bnB1dHMgIyR0aGlzLXBhY2thZ2UtbmF0aXZlLWlucHV0LWxpc3QpCiAgICAgICAgICAgICAgICAg ICAgICh1c2IuaWRzIChzZWFyY2gtaW5wdXQtZmlsZSBpbnB1dHMgIi9zaGFyZS9od2RhdGEvdXNi LmlkcyIpKQogICAgICAgICAgICAgICAgICAgICAocGNpLmlkcyAoc2VhcmNoLWlucHV0LWZpbGUg aW5wdXRzICIvc2hhcmUvaHdkYXRhL3BjaS5pZHMiKSkpCiAgICAgICAgICAgICAgICAobGlzdCAo c3RyaW5nLWFwcGVuZCAiLUR3aXRoLXVzYi1pZHMtcGF0aD0iIHVzYi5pZHMpCiAgICAgICAgICAg ICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiLUR3aXRoLXBjaS1pZHMtcGF0aD0iIHBjaS5pZHMp KSkKICAgICAgICAgICAgIzpwaGFzZXMKICAgICAgICAgICAgI34obW9kaWZ5LXBoYXNlcyAlc3Rh bmRhcmQtcGhhc2VzCiAgICAgICAgICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ3BhdGNoLW9z aW5mby1wYXRoCiAgICAgICAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgIzphbGxv dy1vdGhlci1rZXlzKQogICAgICAgICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAib3NpbmZvL29z aW5mb19sb2FkZXIuYyIKICAgICAgICAgICAgICAgICAgICAgICgoInBhdGggPSBEQVRBX0RJUi4q IikKICAgICAgICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAicGF0aCA9IFwiIiAoc2Vh cmNoLWlucHV0LWRpcmVjdG9yeSBpbnB1dHMgIi9zaGFyZS9vc2luZm8iKSAiXCI7IikpKSkpKSkp CiAgICAoaW5wdXRzCiAgICAgIChsaXN0IGxpYnNvdXAtbWluaW1hbC0yIGxpYnhtbDIgbGlieHNs dCBvc2luZm8tZGIpKQogICAgKG5hdGl2ZS1pbnB1dHMKICAgICAgKGxpc3QgYCgsZ2xpYiAiYmlu IikKICAgICAgICAgICAgZ29iamVjdC1pbnRyb3NwZWN0aW9uCiAgICAgICAgICAgIGd0ay1kb2Mv c3RhYmxlCiAgICAgICAgICAgIHZhbGEKICAgICAgICAgICAgaW50bHRvb2wKICAgICAgICAgICAg cGtnLWNvbmZpZwogICAgICAgICAgICBgKCxod2RhdGEgInBjaSIpCiAgICAgICAgICAgIGAoLGh3 ZGF0YSAidXNiIikpKSkpCmxpYm9zaW5mby1uZXcK --=-kVodbn5zNFeKvYp2Cv0A-- --=-w8wGENj1z7B2bKmT5uuI Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYhtY3BccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7vllAP9abSmdy3eAk4tY0YJT//FM/Lg4 xYTopIsHO3IB63XjXgEAiD0GAOou9ffCnEG8b6btYdxs1oOL40nQM0cJVyr35AQ= =oAI+ -----END PGP SIGNATURE----- --=-w8wGENj1z7B2bKmT5uuI-- From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 1/4] gnu: Add hwdata. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 12:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer , Brendan Tildesley Cc: John Kehayias , 54069@debbugs.gnu.org Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164596371815205 (code B ref 54069); Sun, 27 Feb 2022 12:09:01 +0000 Received: (at 54069) by debbugs.gnu.org; 27 Feb 2022 12:08:38 +0000 Received: from localhost ([127.0.0.1]:56966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOILu-0003xB-DO for submit@debbugs.gnu.org; Sun, 27 Feb 2022 07:08:38 -0500 Received: from laurent.telenet-ops.be ([195.130.137.89]:60320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOILs-0003x1-1Q for 54069@debbugs.gnu.org; Sun, 27 Feb 2022 07:08:36 -0500 Received: from [192.168.160.254] ([188.188.52.46]) by laurent.telenet-ops.be with bizsmtp id 0C8Z2700M0zovbQ01C8aUh; Sun, 27 Feb 2022 13:08:34 +0100 Message-ID: From: Maxime Devos Date: Sun, 27 Feb 2022 13:08:28 +0100 In-Reply-To: <87zgmduso6.fsf@gmail.com> References: <20220226043238.2657-1-mail@brendan.scot> <87zgmduso6.fsf@gmail.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-krEThfK1KwU8Mmx7TJvh" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1645963714; bh=Oboet9Zczd0rt9aykiL1xX/5WHThFHNrDAlJM7KsGiQ=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=Abyn06OOW42DTeTxPyYihL6YNoD2s64BD2PKgLiiIeTfIyOMPbQeIhEjGB503FwRc NqsGGIHtSJEx2cBvyoeONIAY/MUz/atO2Goh83FJVEgxnEN1TSP9zmn1Myrj/zSfmt NFE4fcPDjfgdo40+heQT9ON8bPM7gWxdhjhZRbfOo/Lx/gFgHq0XbQU2NO0R8LKkNw TzS0M9jbWVoSn2AjInLa9pvS8Ha37ADdEf0zM4Rm+fU6PvYVxCWIZuF14FI9OFyzP0 1I70GarQdqDgQ7oCDStoDBLj1xjpZPbVkdlPr3QXJyCd88Kcnk7lkIg80XSWof4k0Q P8zajvLipH4BA== X-Spam-Score: -0.7 (/) 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 (-) --=-krEThfK1KwU8Mmx7TJvh Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Maxim Cournoyer schreef op za 26-02-2022 om 18:14 [-0500]: > > +(define-public hwdata > > +=C2=A0 (package > > +=C2=A0=C2=A0=C2=A0 (name "hwdata") > > +=C2=A0=C2=A0=C2=A0 (version "0.356") Given that this is pure data, WDYT of adding #:target #false to 'arguments', such that =E2=80=98cross-compiling=E2=80=99 hwdata is free, by making the derivation for cross-compiling hwdata the same as the derivation for compiling hwdata natively? Greetings, Maxime. --=-krEThfK1KwU8Mmx7TJvh Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYhtpvBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7oPXAQCSxDD8KLJFdAN3uIJeX8dzVZ9/ NXiaalnImJ4VbMrLwQD+MiT362v6VPYdW/7NEyGAH3mi8D4KdLMkpqHlLotBaw0= =gN86 -----END PGP SIGNATURE----- --=-krEThfK1KwU8Mmx7TJvh-- From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 12:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brendan Tildesley , 54069@debbugs.gnu.org Cc: John Kehayias , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164596397415580 (code B ref 54069); Sun, 27 Feb 2022 12:13:02 +0000 Received: (at 54069) by debbugs.gnu.org; 27 Feb 2022 12:12:54 +0000 Received: from localhost ([127.0.0.1]:56971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOIQ1-00043E-U5 for submit@debbugs.gnu.org; Sun, 27 Feb 2022 07:12:54 -0500 Received: from albert.telenet-ops.be ([195.130.137.90]:46772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOIPx-000433-JZ for 54069@debbugs.gnu.org; Sun, 27 Feb 2022 07:12:52 -0500 Received: from [192.168.160.254] ([188.188.52.46]) by albert.telenet-ops.be with bizsmtp id 0CCn270090zovbQ06CCocu; Sun, 27 Feb 2022 13:12:48 +0100 Message-ID: <4015dac77070e12f823051104427bc02baefd720.camel@telenet.be> From: Maxime Devos Date: Sun, 27 Feb 2022 13:12:47 +0100 In-Reply-To: <20220226043238.2657-3-mail@brendan.scot> References: <20220226043238.2657-1-mail@brendan.scot> <20220226043238.2657-3-mail@brendan.scot> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-bcgP6rGcPIT7FszKV6oC" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1645963968; bh=hkmV5VH1IaoltZarRbxyw+K/h6tMsfdYobkpWd2vdrY=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=clxnRQS2X4S5HysRIGDFKmhXTTkQPPG88ssOaLNLncwibTtimJIhZ9AYFQQNYG3o+ UfjCqYiCvj5W/XChwx3NMeCJ40oG3OsO/n/ZYgYVp72Jt0GPF2Gqu9G/1axUxil803 rcHETTvWdimQiZ7qZztX28uDlGXIq05S3nOcuSLDKaNHFVzlLWue67ivCB6Zd8aKxE /cssLlY3+4q3OdpXhW04j+3jI0XbZjzaZZS34//cO5HCtShnwO7vwkTZMURN75eVhj gZc95BzSGOmkYu586FO3gGhy5i50MbLLyGfQTwLaGL/WQzjbY9q6Tw8J4PXsdTKgV8 1m4br5+GXRllg== X-Spam-Score: -0.7 (/) 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 (-) --=-bcgP6rGcPIT7FszKV6oC Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Brendan Tildesley schreef op za 26-02-2022 om 15:32 [+1100]: > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 `(,hwdata "= pci") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 `(,hwdata "= usb"))) I would put these in 'inputs', since they are kept in the closure, and I'd like to eventually automatically=C2=A0implicitely set #:allowed- references to make sure only (non-native) inputs make their way into the references, to catch some cross-compilation bugs early. It doesn't truly matter here though, since hwdata is architecture- independent. Greetings, Maxime. --=-bcgP6rGcPIT7FszKV6oC Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYhtqvxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7o8cAQCq4lFC7e1qkpmvVjGHeDD9Leo0 ensy7ITjVnIdvx/7AwD/QRew6VqilZkX/1Usnia6ThXyrSQhqdTqGZZcTGH/4Qg= =Npk+ -----END PGP SIGNATURE----- --=-bcgP6rGcPIT7FszKV6oC-- From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 21:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: John Kehayias , 54069@debbugs.gnu.org, Brendan Tildesley , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164599701030747 (code B ref 54069); Sun, 27 Feb 2022 21:24:02 +0000 Received: (at 54069) by debbugs.gnu.org; 27 Feb 2022 21:23:30 +0000 Received: from localhost ([127.0.0.1]:59311 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOR0r-0007zr-UM for submit@debbugs.gnu.org; Sun, 27 Feb 2022 16:23:30 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:55548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOR0q-0007zd-4m for 54069@debbugs.gnu.org; Sun, 27 Feb 2022 16:23:28 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 748BB399; Sun, 27 Feb 2022 22:23:21 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id laNnjTC3V8M6; Sun, 27 Feb 2022 22:23:20 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 48AA32D9; Sun, 27 Feb 2022 22:23:20 +0100 (CET) From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20220226043238.2657-1-mail@brendan.scot> <20220226043238.2657-3-mail@brendan.scot> <190017101.145924.1645925822107@office.mailbox.org> <58cd826af583022698ee91d0c2a25526ccb27756.camel@telenet.be> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 9 =?UTF-8?Q?Vent=C3=B4se?= an 230 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 27 Feb 2022 22:23:19 +0100 In-Reply-To: <58cd826af583022698ee91d0c2a25526ccb27756.camel@telenet.be> (Maxime Devos's message of "Sun, 27 Feb 2022 11:56:28 +0100") Message-ID: <87r17ot35k.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: + X-Spam-Level: * X-Rspamd-Server: hera Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Queue-Id: 748BB399 X-Spamd-Result: default: False [1.40 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_CC(0.00)[brendan.scot,debbugs.gnu.org,protonmail.com,gmail.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com,protonmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_FIVE(0.00)[5]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; SUSPICIOUS_RECIPS(1.50)[] X-Spam-Score: 1.0 (+) 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: -0.0 (/) Hello! Maxime Devos skribis: > (define libosinfo-new > (package > (inherit (specification->package "libosinfo")) > (arguments > (list #:configure-flags > #~(let* ((inputs #$this-package-native-input-list) > (usb.ids (search-input-file inputs "/share/hwdata/us= b.ids")) > (pci.ids (search-input-file inputs "/share/hwdata/pc= i.ids"))) > (list (string-append "-Dwith-usb-ids-path=3D" usb.ids) > (string-append "-Dwith-pci-ids-path=3D" pci.ids))) I think this is equivalent to: #~(let* ((inputs #$(input-tuples->gexp (package-inputs this-package))) =E2=80=A6) =E2=80=A6) Am I right? However, that looks a bit far-fetched to me. Can=E2=80=99t we instead do: #~(let* ((usb.ids (string-append #$hwdata:usb "/share/hwdata/usb.ids")) (pci.ids (string-append #$hwdata:pci "/share/hwdata/pci.ids"))) =E2=80=A6) ? Ludo=E2=80=99. From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 22:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: John Kehayias , 54069@debbugs.gnu.org, Brendan Tildesley , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164600027612692 (code B ref 54069); Sun, 27 Feb 2022 22:18:01 +0000 Received: (at 54069) by debbugs.gnu.org; 27 Feb 2022 22:17:56 +0000 Received: from localhost ([127.0.0.1]:59501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nORrX-0003Id-Rn for submit@debbugs.gnu.org; Sun, 27 Feb 2022 17:17:56 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:32864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nORrV-0003IU-PV for 54069@debbugs.gnu.org; Sun, 27 Feb 2022 17:17:54 -0500 Received: from [192.168.158.254] ([178.119.10.153]) by xavier.telenet-ops.be with bizsmtp id 0NHr270023J72EA01NHrc0; Sun, 27 Feb 2022 23:17:52 +0100 Message-ID: From: Maxime Devos Date: Sun, 27 Feb 2022 23:17:46 +0100 In-Reply-To: <87r17ot35k.fsf@gnu.org> References: <20220226043238.2657-1-mail@brendan.scot> <20220226043238.2657-3-mail@brendan.scot> <190017101.145924.1645925822107@office.mailbox.org> <58cd826af583022698ee91d0c2a25526ccb27756.camel@telenet.be> <87r17ot35k.fsf@gnu.org> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-wmi5i3WUbnCCeuK2U92F" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1646000272; bh=c9I+3wu1lMYSf+CrUo+7jIzzjBEqlq/r7DpEJJaQd5Q=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=okvdO5W1WNlFokMYCt0Q0Iic0CSWYpXdF6GKOuZCAlwPjkVpXFuSSOM2KsST3zezA szC2meZ4Pwo3RxzZ6OgX0hHF+ucOa1ID1NOR7N6Umhnp2nq7jDIfOhdZxu9meX9DkE QCKTW0FGh/hnNgN0bx0Wi9ba1m/M6xQItFQB0Y270sezVpwLrR8rS5B4vWEpmd4hCw IT0yze0CxTUMynjsyAJCDvRnRSBBfa2o7sGnho7EyzrOlnBtOh7+pFF8NNtgab0ZRA 6INJ/GqVYK3klmbD63KLK2OFyBmNe0Ex4IRpm0YXmbb/68RteRmiV934e9Qlk2GHIk gi73vwrsVTkrA== X-Spam-Score: -0.7 (/) 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 (-) --=-wmi5i3WUbnCCeuK2U92F Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s schreef op zo 27-02-2022 om 22:23 [+0100]: > Can=E2=80=99t we instead do: >=20 > =C2=A0 #~(let* ((usb.ids (string-append #$hwdata:usb "/share/hwdata/usb.i= ds")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (pci.ids (st= ring-append #$hwdata:pci "/share/hwdata/pci.ids"))) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =E2=80=A6) >=20 > ? We could, and that's what the original v2 patch did. However, this prevents package transformations: (package (inherit libosinfo) (native-inputs ;; not sure about the syntax=20 (modify-inputs (package-inputs libosinfo) (replace "hwdata:usb" hwdata-with-some-new-fancy-hardware "usb")))) Greetings, Maxime. --=-wmi5i3WUbnCCeuK2U92F Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYhv4ihccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7ghPAQCZya1aqHLA6nEXivZvbm7o/8zY 6ooPfqCstuvAVl+8TwD/erEQeL9eG2X+hATjvYg1YYnUeY0Wg+HFiVTvSNzr0QI= =Wwzf -----END PGP SIGNATURE----- --=-wmi5i3WUbnCCeuK2U92F-- From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 22:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: John Kehayias , 54069@debbugs.gnu.org, Brendan Tildesley , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164600029012742 (code B ref 54069); Sun, 27 Feb 2022 22:19:02 +0000 Received: (at 54069) by debbugs.gnu.org; 27 Feb 2022 22:18:10 +0000 Received: from localhost ([127.0.0.1]:59506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nORrm-0003JS-1t for submit@debbugs.gnu.org; Sun, 27 Feb 2022 17:18:10 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:32864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nORrk-0003IU-ML for 54069@debbugs.gnu.org; Sun, 27 Feb 2022 17:18:09 -0500 Received: from [192.168.158.254] ([178.119.10.153]) by xavier.telenet-ops.be with bizsmtp id 0NJ72700J3J72EA01NJ8dc; Sun, 27 Feb 2022 23:18:08 +0100 Message-ID: <6eb423c92273988a9c62acf6b49d744fe97fd035.camel@telenet.be> From: Maxime Devos Date: Sun, 27 Feb 2022 23:18:07 +0100 In-Reply-To: <87r17ot35k.fsf@gnu.org> References: <20220226043238.2657-1-mail@brendan.scot> <20220226043238.2657-3-mail@brendan.scot> <190017101.145924.1645925822107@office.mailbox.org> <58cd826af583022698ee91d0c2a25526ccb27756.camel@telenet.be> <87r17ot35k.fsf@gnu.org> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-zTS8Shp71r/SyXU7GuwJ" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1646000288; bh=2FdsoSJc6r71CTqN8FFCROIdMRh1WSj0fkjjftC5z5k=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=TBzrADlhrUx9/aPcAEQZUi0aYW9q++I2KqtnSA2RBqTuqySACLUqra8Ej4/xTNSDt BA/ewFnOgsCAXgR2rFX1rkozpJ7D64opCh17WGWl+nJ2eIGM+dxq83+YOhY5/GDFxq /B+QQ0jNLNSDpwzEaU/MwzDrn+wcpmNbEJn5UTkzbNz8ZgrmUbjAqyqPD95KhSgAwN mF5z1HspYvE+Kd0aSTpoRFYzkFH+y6/+nIIT+LS+x58uVh6BpvKd+nP9boECoNPJgu wYmFBhgODBUqhcBsNWWmLOGtAMyzvuD62Y7KfJPFGuNAOxscvoyo8P5xQfvdEVFNTz PPF3PKypoWWtw== X-Spam-Score: -0.7 (/) 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 (-) --=-zTS8Shp71r/SyXU7GuwJ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s schreef op zo 27-02-2022 om 22:23 [+0100]: > I think this is equivalent to: >=20 > =C2=A0 #~(let* ((inputs #$(input-tuples->gexp (package-inputs this-packag= e))) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =E2=80=A6) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =E2=80=A6) >=20 > Am I right? That's what I suggested initially: > > #~(let* ((inputs #$(input-tuples->gexp (package-inputs this- > package))) > > (usb.ids (search-input-file inputs > "/share/hwdata/usb.ids")) > > (pci.ids (search-input-file inputs > "/share/hwdata/pci.ids"))) > > (list (string-append "-Dwith-usb-ids-path=3D" usb.ids) [...])) > >=20 >=20 However, that lead to errors -- strings like # appeared in the builder. Greetings, Maxime. --=-zTS8Shp71r/SyXU7GuwJ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYhv4nxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7rjVAQC8ewHu7htrmSxQnLp91wg+Tw8q 0p1fkmKZt+nj02dxWAEAv5utcIBbeCmhG/E9RLCid5rdNBMS95b5Uf4a0OyY9gg= =7000 -----END PGP SIGNATURE----- --=-zTS8Shp71r/SyXU7GuwJ-- From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Feb 2022 11:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: John Kehayias , 54069@debbugs.gnu.org, Brendan Tildesley , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16460489343403 (code B ref 54069); Mon, 28 Feb 2022 11:49:02 +0000 Received: (at 54069) by debbugs.gnu.org; 28 Feb 2022 11:48:54 +0000 Received: from localhost ([127.0.0.1]:60317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOeWL-0000sp-Oc for submit@debbugs.gnu.org; Mon, 28 Feb 2022 06:48:53 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:60638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOeWJ-0000sb-Pc for 54069@debbugs.gnu.org; Mon, 28 Feb 2022 06:48:52 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 23D6226E; Mon, 28 Feb 2022 12:48:46 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Pf2f7zWjmnIh; Mon, 28 Feb 2022 12:48:44 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id EAA8DBD; Mon, 28 Feb 2022 12:48:43 +0100 (CET) From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20220226043238.2657-1-mail@brendan.scot> <20220226043238.2657-3-mail@brendan.scot> <190017101.145924.1645925822107@office.mailbox.org> <58cd826af583022698ee91d0c2a25526ccb27756.camel@telenet.be> <87r17ot35k.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 10 =?UTF-8?Q?Vent=C3=B4se?= an 230 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 28 Feb 2022 12:48:43 +0100 In-Reply-To: (Maxime Devos's message of "Sun, 27 Feb 2022 23:17:46 +0100") Message-ID: <87sfs3dxes.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: + X-Spam-Level: * X-Rspamd-Server: hera Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Queue-Id: 23D6226E X-Spamd-Result: default: False [1.40 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_CC(0.00)[brendan.scot,debbugs.gnu.org,protonmail.com,gmail.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com,protonmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_FIVE(0.00)[5]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; SUSPICIOUS_RECIPS(1.50)[] X-Spam-Score: 1.0 (+) 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: -0.0 (/) Hi! Maxime Devos skribis: > Ludovic Court=C3=A8s schreef op zo 27-02-2022 om 22:23 [+0100]: >> Can=E2=80=99t we instead do: >>=20 >> =C2=A0 #~(let* ((usb.ids (string-append #$hwdata:usb "/share/hwdata/usb.= ids")) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (pci.ids (s= tring-append #$hwdata:pci "/share/hwdata/pci.ids"))) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =E2=80=A6) >>=20 >> ? > > We could, and that's what the original v2 patch did. > However, this prevents package transformations: Right, but maybe that=E2=80=99s good enough?=E2=80=A6 Otherwise, we can do: #~(let* ((usb.ids (string-append (ungexp (this-package-inputs "hwdata") "usb") =E2=80=A6))) =E2=80=A6) [...] > Ludovic Court=C3=A8s schreef op zo 27-02-2022 om 22:23 [+0100]: >> I think this is equivalent to: >>=20 >> =C2=A0 #~(let* ((inputs #$(input-tuples->gexp (package-inputs this-packa= ge))) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =E2=80=A6) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =E2=80=A6) >>=20 >> Am I right? > > That's what I suggested initially: > >> > #~(let* ((inputs #$(input-tuples->gexp (package-inputs this- >> package))) >> > (usb.ids (search-input-file inputs >> "/share/hwdata/usb.ids")) >> > (pci.ids (search-input-file inputs >> "/share/hwdata/pci.ids"))) >> > (list (string-append "-Dwith-usb-ids-path=3D" usb.ids) [...])) >> >=20 >>=20 > > However, that lead to errors -- strings like # > appeared in the builder. Hmm weird. Thanks, Ludo=E2=80=99. From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCHES v3 0/7]: Update and make use of hwdata References: <635599986.289572.1645350831631@office.mailbox.org> In-Reply-To: <635599986.289572.1645350831631@office.mailbox.org> Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047519564 (code B ref 54069); Thu, 10 Mar 2022 09:33:01 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:31 +0000 Received: from localhost ([127.0.0.1]:33182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9q-0002UC-Np for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:30 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:39844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9o-0002Tt-7J for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:29 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4KDkP06pXZz9sl2; Thu, 10 Mar 2022 10:32:20 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904739; 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=M0mTN5Iaao2J/mKxLPhQ6LfBmtKxzFqx/i4wd7YyDNk=; b=WhLw0kO9AmOiPmqvcB9J63ZMor6ilGmxYu3tPuHbosq0XRL7ZBfkw9Tden1Q2dZCogni7I rTwq5Za1JpLY32bSxTN1WlATCSyWNrxJMDMHel4sPnhLY6GtRc8uKADm8opRpjmWTZuQz+ gSDo8SiKuZ4K1Jc7N5MwTuK05JpiMcC4CabX6D88HNwi1zM+lsbrnzyLk0ZBteWi2D/PIP 2fpU3GC+7GEbApC4f3IGqLcSpxzmomM2ghygJHGnR9TiFZa2beH/xP+MsY1kERRSDExHiE Uf3bu4hbyR9CIGN/x6tt+/BaDNAj/+CBx4SItbUW8XntATV3tPcSueM37JGbZw== Date: Thu, 10 Mar 2022 20:31:38 +1100 Message-Id: <20220310093145.31649-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 have used the ungexp suggestion Ludo made. I don't have any stance on the gexp-ology business, so I just did that. Feel free to change it however one wishes. the hwata updates can go to master, but the rest should be considered for core-updates i think? I have fixed up the pciutils definiton a bit, where I had previously removed the installation of a man page by mistake. Implemented the #:target #f suggestion in hwdata, and fixed a small mistake. I was away from the computer for a week so I hope I haven't forgotten to consider all feedback. Updated hwdata to 357. From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 1/7] gnu: hwdata: Set #:target #f. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047549581 (code B ref 54069); Thu, 10 Mar 2022 09:33:02 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:34 +0000 Received: from localhost ([127.0.0.1]:33186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9t-0002UT-UH for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:34 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:39864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9r-0002Ty-N6 for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:32 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4KDkP552dTz9sZJ; Thu, 10 Mar 2022 10:32:25 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904743; 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=lekshpj3YDQ+8IJOkNyDpJIUcb4fW6PjUz8T82Vlqvg=; b=fNTG4YQXqToSuo39yJyq7pjOPu3n9j+2FpiZ0OeO5aLd7ho5IYHG26k8CaXD6e1g57jZ6/ DMlSd6cU8kcWc7o0uWEayuOTQS9bRME77Su6gk2aCQ4xp7/NIkk4N9fCOD3ZNXJ25fUjjF LGn2uBLUjDOlNwsLlnrgBKKItARH7mMS+zfdwzLTkTZ6d5CXnXGV/1vHFYWDTC9ETQsURf lmDx7RpEUB61Ti/FVfoOpTYF6AnHa+fhxPRhPDNoMXlzifXhrmBekgYbBtkznuSkjpfk0x wu3TU+hN7KohokQf/IhModnJEZy7K/SV8bAWCkeQAZQssQVtcZSQOJYCA7MQkA== Date: Thu, 10 Mar 2022 20:31:39 +1100 Message-Id: <20220310093145.31649-2-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/pciutils.scm (hwdata): Set #:target #f to make cross-compiling free, as explained by Maxime in bug#54069. --- gnu/packages/pciutils.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 34abfb3c2d..5c25e78ac9 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -56,6 +56,7 @@ (define-public hwdata ;; Tests require pciutils, python, podman. Disable to avoid recursive dep. (list #:tests? #f + #:target #f ; Make the derivation the same when cross-compiling, since it's just data. #:configure-flags #~(list (string-append "--datadir=" #$output "/share")) #:phases #~(modify-phases %standard-phases -- 2.34.0 From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 2/7] gnu: hwdata: Remove unused gzip native-input. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047569593 (code B ref 54069); Thu, 10 Mar 2022 09:33:02 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:36 +0000 Received: from localhost ([127.0.0.1]:33190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9w-0002Uf-5d for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:36 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:39888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9u-0002U9-Q9 for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:35 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4KDkP85YsDz9sl1; Thu, 10 Mar 2022 10:32:28 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904746; 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=RlR6nk5JYK0yc4wjR0zmhmWGn0Tw1yDlwqQDLXH7xXo=; b=jeoalwyXFomUxkH9ihzq4KgV68v2EHrLFspnhJnCY09NRkRWIO8QqDixCrr8JuMQCj4u6Y z1tUje/jI6rQKyfn3sEEyv6sihVLINjBp/StH9ozJogElGrffkpNe8r01/XYr2jQ16E+qh Z0NtYgk8WsXZ+2UJiuSnTIJKO1TSiEmkSol7ek3gcZaGKZWjME2IajNYpvOJMFcptDRgHP 7pjeFXuh3566fhcTpEkyNs0QXqmh26zozv7V+/CkRCFioBTJJkrimMLoAQ2drq2iuXvNMW TUwGQn33cSf37B1aS6+3wJQ5Auu+tmaiMzMO7eOk3sEqKR7CVFuG3/IbYfBemg== Date: Thu, 10 Mar 2022 20:31:40 +1100 Message-Id: <20220310093145.31649-3-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/pciutils.scm (hwdata): I accidently left this gzip input here which is unused. Remove it. --- gnu/packages/pciutils.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 5c25e78ac9..bad42e238d 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -51,7 +51,6 @@ (define-public hwdata "0m04d93dwiplwp9v74nhnc0hyi2n007mylkg8f0frb46z5qjrpl3")))) (build-system gnu-build-system) (outputs '("out" "iab" "oui" "pci" "pnp" "usb")) - (native-inputs (list gzip)) (arguments ;; Tests require pciutils, python, podman. Disable to avoid recursive dep. (list -- 2.34.0 From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 3/7] gnu: hwdata: Update to 0.357. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047599608 (code B ref 54069); Thu, 10 Mar 2022 09:33:03 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:39 +0000 Received: from localhost ([127.0.0.1]:33194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9z-0002Uu-C3 for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:39 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:34842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9y-0002UQ-EK for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:38 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4KDkPD23Kmz9sjD; Thu, 10 Mar 2022 10:32:32 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904750; 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=r+t4uAZXSKy4GheYaQfOxpvA4gqrq9egbDuH1klNpO4=; b=Lyxvc6REf3OYnCBSvcodX0eoq/mhDFQ6I+K4BYxtRm4KoLCmeJnW3D4zc1lnyYFARbvld+ ymC90Fz7eg4wP7HmK2tuNu+B5I8NkAkOl5jZKC273Bu2/pM7i0JRwyoNdZgy/oZopoAorC p4dv79kvkHX425RLNXvgLBfEI6vg/Jriyf+nfVbrzh5kfkH0mCcrlWHPU0QqdE5an8KHHl aA7ZdfUezyK2ziHcxNUGdF1NwmwQFWPWwJGcwb0w7vVAv7H9+bH1PYMBm/MkFc2Q5uSQLU SIe32vVvMacGOB8CR9UWCVwzwIbkAFHwswWP2zGsMiytuSzL/OezKUC/w+x3AQ== Date: Thu, 10 Mar 2022 20:31:41 +1100 Message-Id: <20220310093145.31649-4-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/pciutils.scm (hwdata): Update to 0.357. --- gnu/packages/pciutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index bad42e238d..41ba10f1e1 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -39,7 +39,7 @@ (define-module (gnu packages pciutils) (define-public hwdata (package (name "hwdata") - (version "0.356") + (version "0.357") ;hwdata is updated monthly (source (origin (method git-fetch) (uri (git-reference @@ -48,7 +48,7 @@ (define-public hwdata (file-name (git-file-name name version)) (sha256 (base32 - "0m04d93dwiplwp9v74nhnc0hyi2n007mylkg8f0frb46z5qjrpl3")))) + "0kvxpdx14w2myqm3dikjvr2mr4j6767y4v5j8v7kffwvcv0ga9gv")))) (build-system gnu-build-system) (outputs '("out" "iab" "oui" "pci" "pnp" "usb")) (arguments -- 2.34.0 From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 4/7] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047679633 (code B ref 54069); Thu, 10 Mar 2022 09:33:03 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:47 +0000 Received: from localhost ([127.0.0.1]:33198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFA7-0002VJ-J5 for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:47 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:34882) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFA5-0002V2-HR for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:46 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4KDkPM4ppGz9sks; Thu, 10 Mar 2022 10:32:39 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904757; 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=mIdm/DZN9elqrSdPNkI6GwtW3ryHQx5St81iJ8XjCyA=; b=XWDQ+BuK9ck+6S/Jrb0yew+sogpMKWcA6BH2qZfANNruXHDnJkWaqliAeTOuPHkJkd9ioZ +v1/tTxIhTnFAjLr9ReR/oEOXyNf9LDMe0cpOcyqlmBbwADteDQHZdYh09IFAjDwjm9m89 gvuJkrh3NqA1IF9lkj9sA3Pnh3gdGXPoH2r7jibf9xGMXXOXCMnRgdy4JAjMwInA5f8pKa TqXCCJcM/ve8hpFBZkYVGzCo3mQjW8+0jk9LWtaf6/j9sg3Vy7GpQP9f/6RVFV/n3zfd5w fBThdftFGhZZ/9ieLvpuOOHpf98Qyq1mRALiEVt22HHeDktOM1zpbglZ1ionGA== Date: Thu, 10 Mar 2022 20:31:42 +1100 Message-Id: <20220310093145.31649-5-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/pciutils.scm (pciutils): [inputs]: Add hwdata:pci for latest pci.ids file. [arguments]: Don't install update-pciids script or it's man page. Don't install bundled old pci.ids file, use hwdata instead. Copy the pci.ids over so it can be gzipped. --- gnu/packages/pciutils.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 41ba10f1e1..648d1385e4 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -93,8 +93,13 @@ (define-public pciutils (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'unbundle-pci.ids + (lambda* (#:key inputs outputs #:allow-other-keys) + (copy-file (string-append (assoc-ref inputs "hwdata:pci") + "/share/hwdata/pci.ids") + "pci.ids"))) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; There's no 'configure' script, just a raw makefile. (substitute* "Makefile" ,@(if (%current-target-system) @@ -124,13 +129,19 @@ (define-public pciutils (("^SHARED=.*$") ;; Build libpciutils.so. "SHARED := yes\n") + (("^ZLIB=.*$") ;; Ask for zlib support, for 'pci.ids.gz' decompression. "ZLIB := yes\n") (("^IDSDIR=.*$") ;; Installation directory of 'pci.ids.gz'. - "IDSDIR = $(SHAREDIR)/hwdata\n")))) + "IDSDIR = $(SHAREDIR)/hwdata\n") + ;; Don't install update script or its man page, + ((".*INSTALL.*update-pciids .*") "") + (("update-pciids update-pciids.8 ") "") + (("(.*INSTALL.*)(update-pciids.8)(.*)" _ a _ b) + (string-append a b))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) ;; Install the commands, library, and .pc files. @@ -159,7 +170,8 @@ (define-public pciutils ,@(if (hurd-target?) `(("hurd-patch" ,(search-patch "pciutils-hurd-fix.patch"))) '()) - ("zlib" ,zlib))) + ("zlib" ,zlib) + ("hwdata:pci" ,hwdata "pci"))) (home-page "https://mj.ucw.cz/sw/pciutils/") (synopsis "Programs for inspecting and manipulating PCI devices") (description -- 2.34.0 From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 6/7] gnu: libosinfo: Use this-package-input. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047729656 (code B ref 54069); Thu, 10 Mar 2022 09:33:03 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:52 +0000 Received: from localhost ([127.0.0.1]:33204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFAB-0002Ve-TX for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:52 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:37704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFA9-0002V9-OB for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:50 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4KDkPR4vCgz9sV0; Thu, 10 Mar 2022 10:32:43 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904761; 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=5aKdLWqFvV+Nzh+g25gtPls2qK3HWauJNwyV/5fn3+w=; b=lpmZXs7QNjK9bXmcabImdwByju2vMTa+k1T/6V4bqKIaolUgkjX8z3ZUPmRPDci9MmsTBN X5eEgcjjLRRzaSnWFnqKtllNppg7FhaH+uRq6HaGMRaMCqhsTQgaEyppBrqiCC3poVR5Qo Rs0wJb73yGuWQyOC2Z0jkPG1T509xR/MlJr+0pBXyL/Ojc9gSN9Tg7I2MZOkm+U9dW9RGF 3Qc6NkVII8ObYj1SfzSX8l8UmlJuhUif9wdCR67bkDV0r3zsyYIm5GAniY/+ShRGnRiRb2 PaFy8tjaSQhjLiwDnXuOP0qtJfcKIHnIq1rrvAb7IbGGtlPBmcTkZ6HcCu4ESQ== Date: Thu, 10 Mar 2022 20:31:44 +1100 Message-Id: <20220310093145.31649-7-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/virtualization.scm (libosinfo): [arguments]: Use this-package-input for osinfo-db to support package-transformations. --- gnu/packages/virtualization.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5756c49b07..10d9bd0de9 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1048,7 +1048,9 @@ (define-public libosinfo (lambda* (#:key inputs #:allow-other-keys) (substitute* "osinfo/osinfo_loader.c" (("path = DATA_DIR.*") - (string-append "path = \"" #$osinfo-db "/share/osinfo\";")))))))) + (string-append "path = \"" + #$(this-package-input "osinfo-db") + "/share/osinfo\";")))))))) (inputs (list libsoup-minimal-2 libxml2 -- 2.34.0 From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 5/7] gnu: libosinfo: Unbundle usb.ids, pci.ids. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047759667 (code B ref 54069); Thu, 10 Mar 2022 09:33:04 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:55 +0000 Received: from localhost ([127.0.0.1]:33206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFAC-0002Vh-4b for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:55 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:42770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFA9-0002VA-WA for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:50 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4KDkPR41w1z9sc3; Thu, 10 Mar 2022 10:32:43 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904761; 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=1LxrSGoVBoCBpdsu7xexlcD8+MCaI9sy4XGFnBiqsJY=; b=2KJz6X17r3UdXlxsmOGCu3wkHFDG+HBPAfZCer5BXXTvsCFpMMUE5mbL/YW4EeNWmoZfI7 oCLAEODiiBvFSd+JRBODXoQ5E2ltu3GiNVRvFPBhVBsZw0ZFkbz+0fAGBrr9bpgclMhZ7w i2fFcoyLwZzXgiLvfANtwM71BmnJYqJHJl32UIQGuEjyPUHYKVPXLutw2JNrdY0xBEJEan Q7FRBVeq8b6OqvZkpx7RGnV8Uo9ckxrGKmGrpetNflCLdTkR5nUT7x5Ts6wii5CvxQVsbR epWavWaaNNA6gY8UZJvI1O1u7WTb5m8dqaB5ypDDQNo8SYQ6rhkL5GOmaqCLvw== Date: Thu, 10 Mar 2022 20:31:43 +1100 Message-Id: <20220310093145.31649-6-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/virtualization.scm (libosinfo): [arguments]: Use Gexp style. Use hwdata package for latest usb.ids and pci.ids. [inputs]: Add hwdata:pci, hwdata:usb. remove pci.ids, usb.ids origins. Use new input style. --- gnu/packages/virtualization.scm | 68 +++++++++++++++------------------ 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 8098a0aec3..5756c49b07 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Oleg Pykhalov +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,6 +99,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) + #:use-module (gnu packages pciutils) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) @@ -1031,46 +1033,36 @@ (define-public libosinfo "0nd360c9ampw8hb6xh5g45q858df2r4jj9q88bcl6gzgaj0l3wxl")))) (build-system meson-build-system) (arguments - `(#:configure-flags - (list (string-append "-Dwith-usb-ids-path=" - (assoc-ref %build-inputs "usb.ids")) - (string-append "-Dwith-pci-ids-path=" - (assoc-ref %build-inputs "pci.ids"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-osinfo-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "osinfo/osinfo_loader.c" - (("path = DATA_DIR.*") - (string-append "path = \"" (assoc-ref inputs "osinfo-db") - "/share/osinfo\";")))))))) + (list + #:configure-flags + #~(list + (string-append "-Dwith-usb-ids-path=" + (ungexp (this-package-input "hwdata") "usb") + "/share/hwdata/usb.ids") + (string-append "-Dwith-pci-ids-path=" + (ungexp (this-package-input "hwdata") "pci") + "/share/hwdata/pci.ids")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-osinfo-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "osinfo/osinfo_loader.c" + (("path = DATA_DIR.*") + (string-append "path = \"" #$osinfo-db "/share/osinfo\";")))))))) (inputs - `(("libsoup" ,libsoup-minimal-2) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("osinfo-db" ,osinfo-db))) + (list libsoup-minimal-2 + libxml2 + libxslt + osinfo-db + `(,hwdata "pci") + `(,hwdata "usb"))) (native-inputs - `(("glib" ,glib "bin") ; glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) - ("vala" ,vala) - ("intltool" ,intltool) - ("pkg-config" ,pkg-config) - ("pci.ids" - ,(origin - (method url-fetch) - (uri "https://github.com/pciutils/pciids/raw/ad02084f0bc143e3c15e31a6152a3dfb1d7a3156/pci.ids") - (sha256 - (base32 - "0kfhpj5rnh24hz2714qhfmxk281vwc2w50sm73ggw5d15af7zfsw")))) - ("usb.ids" - ,(origin - (method url-fetch) - (uri "https://svn.code.sf.net/p/linux-usb/repo/trunk/htdocs/usb.ids?r=2681") - (file-name "usb.ids") - (sha256 - (base32 - "1m6yhvz5k8aqzxgk7xj3jkk8frl1hbv0h3vgj4wbnvnx79qnvz3r")))))) + (list `(,glib "bin") ; glib-mkenums, etc. + gobject-introspection + gtk-doc/stable + vala + intltool + pkg-config)) (home-page "https://libosinfo.org/") (synopsis "Operating system information database") (description "libosinfo is a GObject based library API for managing -- 2.34.0 From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 7/7] gnu: libpciaccess: Use hwdata for pci.ids. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047829702 (code B ref 54069); Thu, 10 Mar 2022 09:33:04 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:33:02 +0000 Received: from localhost ([127.0.0.1]:33210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFAI-0002W7-KQ for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:33:02 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:37734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFAH-0002Vf-8B for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:57 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4KDkPb37pBz9sjC; Thu, 10 Mar 2022 10:32:51 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904769; 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=u8Kg3uuPdBugYsQQ5Ljw6DkS1qEYck3mLEl779Nw2yA=; b=nnRqsEhnQQmfB/ktNQ3aZvPrCc1INJgLISiYY+WV76RK9w+bRx6cUzKnJoGPKN4jP4sfo7 em17nRsFAxwwYq9zvK3bTm2BYNunRgKbV+1capxfXjNRzbv/wwuUsNLHdrq9tVXdWnFDJu FZJhPAMVGj+z0rLu2LjB3GRzAqan9eQR8hV3/KrsxicRw0APDozFS52RNdbTE8aeC8zibt mW6O4ZGWyn91O9YT1j82D7wnoH46ZTWF7nl7OLcDyg0i4wPjHHpZBf6Ynn5DAc0esz1Glr F8oDNXj0t13lgrGKXHbHyDXgkpbIfU77WoXJHOXzalsgIEONxXkFztIx8+cXzw== Date: Thu, 10 Mar 2022 20:31:45 +1100 Message-Id: <20220310093145.31649-8-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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 (-) * gnu/packages/xorg.scm (libpciaccess): [arguments]: Remove zlib support since pci.ids isn't gzipped. Use Gexp. [inputs]: Add hwdata:pci, remove zlib, pciutils. [native-inputs]: Remove pkg-config since zlib isn't used. --- gnu/packages/xorg.scm | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 14cd3bc789..67ce0c9980 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Lu Hui +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -1150,36 +1151,19 @@ (define-public libpciaccess (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libpciaccess-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11")))) (build-system gnu-build-system) (arguments - '(;; Make sure libpciaccess can read compressed 'pci.ids' files as - ;; provided by pciutils. - #:configure-flags - (list "--with-zlib" - (string-append "--with-pciids-path=" - (assoc-ref %build-inputs "pciutils") - "/share/hwdata")) - - #:phases - (modify-phases %standard-phases - (add-after 'install 'add-L-zlib - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Provide '-LZLIB/lib' next to '-lz' in the .la file. - (let ((zlib (assoc-ref inputs "zlib")) - (out (assoc-ref outputs "out"))) - (substitute* (string-append out "/lib/libpciaccess.la") - (("-lz") - (string-append "-L" zlib "/lib -lz"))) - #t)))))) - (inputs - (list zlib pciutils)) ;for 'pci.ids.gz' - (native-inputs - (list pkg-config)) + (list + #:configure-flags + #~(list (string-append + "--with-pciids-path=" + (ungexp (this-package-input "hwdata") "pci") + "/share/hwdata/pci.ids")))) + (inputs (list `(,hwdata "pci"))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg PCI access library") (description "Xorg Generic PCI access library.") -- 2.34.0 From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Mar 2022 22:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brendan Tildesley Cc: John Kehayias , 54069@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164798657016447 (code B ref 54069); Tue, 22 Mar 2022 22:03:01 +0000 Received: (at 54069) by debbugs.gnu.org; 22 Mar 2022 22:02:50 +0000 Received: from localhost ([127.0.0.1]:42030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWmaY-0004HD-Aj for submit@debbugs.gnu.org; Tue, 22 Mar 2022 18:02:50 -0400 Received: from mail-qt1-f169.google.com ([209.85.160.169]:34484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWmaX-0004Gz-AP for 54069@debbugs.gnu.org; Tue, 22 Mar 2022 18:02:49 -0400 Received: by mail-qt1-f169.google.com with SMTP id c4so15638066qtx.1 for <54069@debbugs.gnu.org>; Tue, 22 Mar 2022 15:02:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=mrsKZ/BReYCDrH03WDuiLll7x6oo4AoIknhmk5G49Ag=; b=X6z4DsvI5lM03T03vg4pvf7fb8rYYF0xa4XZ8Iu6yuKxHC9EphGyUzvgE0GKmhHBfx uj7/pBt+uPmJoWcAkBWXa7ELbRQn2dwxXjbVPx1P/x6i0Ubw+rSithrKsU4izeSkZz7v 24Be6axJ9fOLYprwttRSIblpElOqIzteJ4Yyq3Xb+GmIT9l4uQhuo6lSv1OXzMFPOTvN Sea+CY4DTZf+OMKQaGkOjlZxUxz4HajVTOizCDay9XwDSNuburXzkZnnp+ntmXqfO3RW X19SU1lNcpZj08bp+dRZJLzkoBlP3C//gs4sA0IZLTG+KKciUch+oIBqPIp9rbxudps3 WBSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=mrsKZ/BReYCDrH03WDuiLll7x6oo4AoIknhmk5G49Ag=; b=8J5Tq91+/OR4j4+U6Bh81bf7YH2G25+vgT8bWn6ij6NTfFMOVtRGpqFqNuk0wdOTVY FDQBhQmQDnzKD5FXhtsXbaIGEDDxEwz0R69VBdm4Nl/q95le079BY0uhqmlXHUbQ9oT9 Ca+hoIN33keTUsw/jDuw4VFFvueJwLx77lRf61bN/JayD4J74JXnar+7PdBiivTkSI6r PRB2izSrZOuNXtmMl4LOsHAaH94IaKiqr8MFHGEYUfpgGcpAusjO210aiWBObSgizEmf tz23g4p2LxEW9c/A9ztluOeQpNnoKQadQoZtx63aayUNMONbVqBlQEGnkNyotxjVtJQU pB3Q== X-Gm-Message-State: AOAM530qv+Gs8tcGqXyW0DK16SeCYCNVaD8Mc0AUTroLvAb9BW7pOU+S 88SJZtdkgapsax5BWEZrrMk= X-Google-Smtp-Source: ABdhPJzkVnXImK6vpHMXtUBgKADlKmO+ZXG9DsZ81heJCHQU2I06RAco+RHqIDbbeJYjZrgAVgD5KA== X-Received: by 2002:a05:622a:1905:b0:2e0:7543:21d4 with SMTP id w5-20020a05622a190500b002e0754321d4mr22327798qtc.12.1647986563788; Tue, 22 Mar 2022 15:02:43 -0700 (PDT) Received: from hurd (dsl-10-129-199.b2b2c.ca. [72.10.129.199]) by smtp.gmail.com with ESMTPSA id 22-20020ac85756000000b002e1cabad999sm15313144qtx.89.2022.03.22.15.02.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Mar 2022 15:02:43 -0700 (PDT) From: Maxim Cournoyer References: <20220310093145.31649-1-mail@brendan.scot> <20220310093145.31649-8-mail@brendan.scot> Date: Tue, 22 Mar 2022 18:02:42 -0400 In-Reply-To: <20220310093145.31649-8-mail@brendan.scot> (Brendan Tildesley's message of "Thu, 10 Mar 2022 20:31:45 +1100") Message-ID: <87o81x1w8t.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) 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 (-) Hi Brendan, Brendan Tildesley writes: > * gnu/packages/xorg.scm (libpciaccess): > [arguments]: Remove zlib support since pci.ids isn't gzipped. Use Gexp. > [inputs]: Add hwdata:pci, remove zlib, pciutils. > [native-inputs]: Remove pkg-config since zlib isn't used. While that simplify things a bit, it's not really required since the pci.ids.gz from pciutils will now be generated from hwdata:pci, right? I think I'd rather it stay that way for now. Thanks, Maxim From unknown Sat Aug 16 16:23:40 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Mar 2022 01:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brendan Tildesley Cc: John Kehayias , 54069@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164800067423050 (code B ref 54069); Wed, 23 Mar 2022 01:58:02 +0000 Received: (at 54069) by debbugs.gnu.org; 23 Mar 2022 01:57:54 +0000 Received: from localhost ([127.0.0.1]:42218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWqG2-0005zi-HN for submit@debbugs.gnu.org; Tue, 22 Mar 2022 21:57:54 -0400 Received: from mail-qk1-f169.google.com ([209.85.222.169]:40897) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWqG1-0005zT-Cc for 54069@debbugs.gnu.org; Tue, 22 Mar 2022 21:57:53 -0400 Received: by mail-qk1-f169.google.com with SMTP id i65so100977qkd.7 for <54069@debbugs.gnu.org>; Tue, 22 Mar 2022 18:57:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=p5fa0FoO5KGSuQU8atdHWhUApmV29f+Pu7zb0oWjKdc=; b=exBisEgjQcShVngNEfMiERXfPB72B1qgoHfk4p4qsQ0So8Kh+9rrX9J2qUBXCs8k6J RETBcXHLh2oQiYBH2ChGEq6ZQ/VS57rwgFySGyPaZdhqi53+mytyeqte6dqylxwWabwD B48HsZi42P3eknQm5RcX2IhSEWtgUGiexUmhE9ptV5VI9ayacYP9cyRIkZFqJ6l+ceA2 m8PoGgwIAI0yQ1hZC2HxR8tTuKGxgwT6Zkh7drwcjNSVFpfzEf7Bfmt7519/UKuyUUlO 68jeWrS1l/ReDr4ZFc+JCiw5z/6D6TzyYV5q7zU+SA2uv/sF88CvTW1T3lrskkO7rfxm bDeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=p5fa0FoO5KGSuQU8atdHWhUApmV29f+Pu7zb0oWjKdc=; b=3Rpq9t7so1quaewzGCBBi8UskoF8FGgg81qpQzV6qaO15yonGQ4+jE4h6WKrliCXYC hvdFfYkY71J/M1JzwBOY8Io3dlnF32lP6guw3iSriPEyaJksAZShfGnY5O/tJif4r6p5 LTv4U5hVRjpR8lENOgJPT6YCO6R0R0OdddOta0UpJkhWWdUwqrj9JXyW6tzmKkG9A8Br moP4nJ2jqyIiGyha1miTLNRrPyAYSRTUH9AzG7/ECPVT0m95pqJYMPKRztqWD9tbiXpl m+59zcp3PO5cxp+8Sq2LCPI7JPd4Hv2U0Qh2FrbxLFSNtBIqMbDnLIac+0n0iG+9p8PM 3KWg== X-Gm-Message-State: AOAM5322oy5fHjmcWUKTYpluiZD1WLuJ/NTwImCJGxP6eq4Tx7LVW3Wz 5B0gOBSVcqZu+B7B4EIz7rE= X-Google-Smtp-Source: ABdhPJyHatafAuiU5oD/OyYTJGAyU7Y/AtsevmMUKGfSTJXsWe04l05nKkxbkKijhOwNYJecfOAVDA== X-Received: by 2002:a37:de03:0:b0:67e:4c75:9a07 with SMTP id h3-20020a37de03000000b0067e4c759a07mr15197222qkj.121.1648000667650; Tue, 22 Mar 2022 18:57:47 -0700 (PDT) Received: from hurd (dsl-10-129-199.b2b2c.ca. [72.10.129.199]) by smtp.gmail.com with ESMTPSA id s16-20020ac85cd0000000b002e1ed82f1e5sm14612041qta.75.2022.03.22.18.57.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Mar 2022 18:57:47 -0700 (PDT) From: Maxim Cournoyer References: <20220310093145.31649-1-mail@brendan.scot> <20220310093145.31649-5-mail@brendan.scot> Date: Tue, 22 Mar 2022 21:57:45 -0400 In-Reply-To: <20220310093145.31649-5-mail@brendan.scot> (Brendan Tildesley's message of "Thu, 10 Mar 2022 20:31:42 +1100") Message-ID: <87mthh1ld2.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) 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 (-) Hi Brendan, Brendan Tildesley writes: > * gnu/packages/pciutils.scm (pciutils): > [inputs]: Add hwdata:pci for latest pci.ids file. > [arguments]: Don't install update-pciids script or it's man page. Don't > install bundled old pci.ids file, use hwdata instead. Copy the pci.ids > over so it can be gzipped. The GNU changelog idea is to stick to changes in the commit message; if explanations are needed they can go in the code as comments. Alternatively, you can also put explanations as a paragraph between the commit summary (first line) and the changelog. > --- > gnu/packages/pciutils.scm | 18 +++++++++++++++--- > 1 file changed, 15 insertions(+), 3 deletions(-) > > diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm > index 41ba10f1e1..648d1385e4 100644 > --- a/gnu/packages/pciutils.scm > +++ b/gnu/packages/pciutils.scm > @@ -93,8 +93,13 @@ (define-public pciutils > (arguments > `(#:phases > (modify-phases %standard-phases > + (add-after 'unpack 'unbundle-pci.ids > + (lambda* (#:key inputs outputs #:allow-other-keys) ^ not needed > + (copy-file (string-append (assoc-ref inputs "hwdata:pci") > + "/share/hwdata/pci.ids") > + "pci.ids"))) I used search-input-file, making sure to use (or native-inputs inputs) as its first argument, so that it works even when cross-compiling. > (replace 'configure > - (lambda* (#:key outputs #:allow-other-keys) > + (lambda* (#:key inputs outputs #:allow-other-keys) ^ not needed > ;; There's no 'configure' script, just a raw makefile. > (substitute* "Makefile" > ,@(if (%current-target-system) > @@ -124,13 +129,19 @@ (define-public pciutils > (("^SHARED=.*$") > ;; Build libpciutils.so. > "SHARED := yes\n") > + > (("^ZLIB=.*$") > ;; Ask for zlib support, for 'pci.ids.gz' decompression. > "ZLIB := yes\n") > > (("^IDSDIR=.*$") > ;; Installation directory of 'pci.ids.gz'. > - "IDSDIR = $(SHAREDIR)/hwdata\n")))) > + "IDSDIR = $(SHAREDIR)/hwdata\n") > + ;; Don't install update script or its man page, > + ((".*INSTALL.*update-pciids .*") "") > + (("update-pciids update-pciids.8 ") "") > + (("(.*INSTALL.*)(update-pciids.8)(.*)" _ a _ b) > + (string-append a b))))) > (replace 'install > (lambda* (#:key outputs #:allow-other-keys) > ;; Install the commands, library, and .pc files. > @@ -159,7 +170,8 @@ (define-public pciutils > ,@(if (hurd-target?) > `(("hurd-patch" ,(search-patch "pciutils-hurd-fix.patch"))) > '()) > - ("zlib" ,zlib))) > + ("zlib" ,zlib) > + ("hwdata:pci" ,hwdata "pci"))) I moved hwdata to native-inputs, And pushed as 387a9772c2571d4375d6c3682c7572d12e7ec5b2 to the core-updates branch. Thank you! Maxim From unknown Sat Aug 16 16:23:40 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Brendan Tildesley Subject: bug#54069: closed (Re: bug#54069: [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest.) Message-ID: References: <87ils51kln.fsf_-_@gmail.com> <635599986.289572.1645350831631@office.mailbox.org> X-Gnu-PR-Message: they-closed 54069 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 54069@debbugs.gnu.org Date: Wed, 23 Mar 2022 02:15:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1648001702-24706-1" This is a multi-part message in MIME format... ------------=_1648001702-24706-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #54069: [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 54069@debbugs.gnu.org. --=20 54069: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D54069 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1648001702-24706-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 54069-done) by debbugs.gnu.org; 23 Mar 2022 02:14:21 +0000 Received: from localhost ([127.0.0.1]:42233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWqVx-0006PW-8F for submit@debbugs.gnu.org; Tue, 22 Mar 2022 22:14:21 -0400 Received: from mail-qt1-f179.google.com ([209.85.160.179]:40827) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWqVv-0006PJ-Oj for 54069-done@debbugs.gnu.org; Tue, 22 Mar 2022 22:14:20 -0400 Received: by mail-qt1-f179.google.com with SMTP id i4so151790qti.7 for <54069-done@debbugs.gnu.org>; Tue, 22 Mar 2022 19:14:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=cXFwcOszWsk11FuhFTb9RJ2KJwkfeeK+pNicaOyRz5E=; b=Ky8wANu9fcMaI2jPuYZ8OmZjwyeFeSJT03gkDuQ22qUbI0aUQxQuHfv/Fd4ZTSAFZj 5sLRoGXHktag9d/vLPLqOhOn7kdupFq5TNN6/A7xp8UlKbyDRGtuVaq/RodV8p3oPfny +HFRlT+Crd1yN8oJJSfWUh/idWoBWmB6fvkWNbCwOJyTyVPgQ+L7SBEVu/SMnLJ/gk/t LAC5sAIZYqVMzYj4ncRr9DG46OEjbXhrO8nteaLm6qzn+ixXnmlLCn/CCWZQQCIP/R/q DFz/MEq7eWQUC8G7/1a7zrxK4ZEDbcjYfAjuC8EwfwRzBKEaKZewqrSPcsq6/Vk96O2h GzQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=cXFwcOszWsk11FuhFTb9RJ2KJwkfeeK+pNicaOyRz5E=; b=5aiQUw6POuCkINFG1RDov9G/03kxhYsEaVMNHlqI8ptztOM1sG3vuADaCueYQ5B3+k Ug0WMppcQUQVPDguYq/1P/3xI26qpRhuQj6EOPBLWo802Xk7yUpQVFJBypaMCXd9EePP IkFu1EHUwcCpr9w+URHcBrQOC5h966WyX7ESH0CewXwRM+57YuahMkaD83y1zSxtIJ5q De/YWm5IJRsV1vNkxxln7erPBX5z6HSWK+hBxcXQG+QxzlzlI1QkRXWuJJ/Lyu9xz5/n 8i9wKWrwFZB9nMNNgq30Ae2jZNE1ki+Uq33XyPoPfaKwyEobxlIXDCq1dIspPn5MfpJE 4DvA== X-Gm-Message-State: AOAM533D5syrc2yJr0PUeu3KsgvJH4ft0HKSFdRL7rfj8zOBNQNDWd7Z lHi+3s5AyrPclvBBTy+C/ig= X-Google-Smtp-Source: ABdhPJzCEyZNktRek5ZXl2QcUm2S4CllUZnshsocLplB6O8W6PCwpsBdRsx1z+mz3834VbhCuCwszA== X-Received: by 2002:ac8:7c46:0:b0:2e1:d6c2:2b15 with SMTP id o6-20020ac87c46000000b002e1d6c22b15mr22452138qtv.405.1648001654194; Tue, 22 Mar 2022 19:14:14 -0700 (PDT) Received: from hurd (dsl-10-129-199.b2b2c.ca. [72.10.129.199]) by smtp.gmail.com with ESMTPSA id o14-20020a05622a138e00b002e1e78c899fsm15864614qtk.53.2022.03.22.19.14.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Mar 2022 19:14:13 -0700 (PDT) From: Maxim Cournoyer To: Brendan Tildesley Subject: Re: bug#54069: [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. References: <20220310093145.31649-1-mail@brendan.scot> <20220310093145.31649-6-mail@brendan.scot> Date: Tue, 22 Mar 2022 22:14:12 -0400 In-Reply-To: <20220310093145.31649-6-mail@brendan.scot> (Brendan Tildesley's message of "Thu, 10 Mar 2022 20:31:43 +1100") Message-ID: <87ils51kln.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54069-done Cc: John Kehayias , Ludovic =?utf-8?Q?Court=C3=A8s?= , 54069-done@debbugs.gnu.org, Maxime Devos 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 (-) Hi! Brendan Tildesley writes: > * gnu/packages/virtualization.scm (libosinfo): > [arguments]: Use Gexp style. Use hwdata package for latest usb.ids and > pci.ids. > [inputs]: Add hwdata:pci, hwdata:usb. remove pci.ids, usb.ids origins. > Use new input style. I've squashed the modified the libosinfo patches a little bit, updated it to 1.10.0, and made some other small adjustments, and pushed the hwdata and libosinfo patches as 4b3b873344eb78a4cd96742e4035b39cbec79577. Thank you! Closing. Maxim ------------=_1648001702-24706-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 20 Feb 2022 09:54:06 +0000 Received: from localhost ([127.0.0.1]:59379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLiur-0007ZZ-MW for submit@debbugs.gnu.org; Sun, 20 Feb 2022 04:54:05 -0500 Received: from lists.gnu.org ([209.51.188.17]:45144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLiuq-0007ZS-TU for submit@debbugs.gnu.org; Sun, 20 Feb 2022 04:54:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nLiuq-0001HD-7t for guix-patches@gnu.org; Sun, 20 Feb 2022 04:54:04 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:43798) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1nLiun-0002d7-UK for guix-patches@gnu.org; Sun, 20 Feb 2022 04:54:03 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4K1gkD3j5jz9sR8 for ; Sun, 20 Feb 2022 10:53:56 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645350834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RMHpbqQIJYUNVOYxOLv6a1jqZ832PvYRyy2X4ZnlUdc=; b=XLSxVpJ+fBKdMhgG0bxCRs6Xv4jmj7GvU4f4oT0ZcQWhqq1mx23udZ9p1Q42Jjy4eIPyTT YXIj+nywK8N1qX1qoG32I5P4QsJTDOOtOSWB3GKocvSlvXVqrFNaJ1mr460RK+in+aqINN CSKJp5vRyQNdmbrCoJIMoUH4GmrOkTGmSxcwJuAKlkGK/6s51XP3nnRIP7F3Ow2ZZCHdqE +dh+XEC5CiP8YhjakOQI3U1oMc9b0ZEeyKyd6px3F6uoPvYo80hRrNN0v39f4o5tYxLDuD wRJRgrjTk1a86SnppCH0gIeBVqq9ZoMBOcyC/J90RpzQnjz3Ss6loHWk8+YziA== Date: Sun, 20 Feb 2022 10:53:51 +0100 (CET) From: Brendan Tildesley To: "guix-patches@gnu.org" Message-ID: <635599986.289572.1645350831631@office.mailbox.org> Subject: [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal Received-SPF: pass client-ip=80.241.56.151; envelope-from=mail@brendan.scot; helo=mout-p-101.mailbox.org 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_H2=-0.001, 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-Spam-Score: -1.7 (-) X-Debbugs-Envelope-To: submit 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.7 (--) Completely untested but I needed pci.ids for something and discovered pciutils bundles an old version so I made this patch as something of a suggestion. Looks like it would be a core-updates change. ------------=_1648001702-24706-1--