From patchwork Sun Feb 20 09:55:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37378 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E0B0527BBEA; Sun, 20 Feb 2022 09:57:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9DCA527BBE9 for ; Sun, 20 Feb 2022 09:57:38 +0000 (GMT) Received: from localhost ([::1]:38378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nLiyF-0001px-Sb for patchwork@mira.cbaines.net; Sun, 20 Feb 2022 04:57:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nLixm-0001ow-S5 for guix-patches@gnu.org; Sun, 20 Feb 2022 04:57:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37258) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nLixi-0003Dc-TA for guix-patches@gnu.org; Sun, 20 Feb 2022 04:57:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nLixi-0007ek-U8 for guix-patches@gnu.org; Sun, 20 Feb 2022 04:57:02 -0500 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Sun Feb 20 09:55:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37379 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2347127BBEA; Sun, 20 Feb 2022 09:57:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C3D6527BBE9 for ; Sun, 20 Feb 2022 09:57:40 +0000 (GMT) Received: from localhost ([::1]:38384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nLiyJ-0001qc-UC for patchwork@mira.cbaines.net; Sun, 20 Feb 2022 04:57:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nLixm-0001ov-RZ for guix-patches@gnu.org; Sun, 20 Feb 2022 04:57:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37257) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nLixi-0003Db-GN for guix-patches@gnu.org; Sun, 20 Feb 2022 04:57:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nLixi-0007ed-G8 for guix-patches@gnu.org; Sun, 20 Feb 2022 04:57:02 -0500 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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