From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YONuG3f8FmIWUQEAgWs5BA (envelope-from ) for ; Thu, 24 Feb 2022 04:33:11 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id qKadGHf8FmKBsgAA9RJhRA (envelope-from ) for ; Thu, 24 Feb 2022 04:33:11 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CA45342408 for ; Thu, 24 Feb 2022 04:33:10 +0100 (CET) Received: from localhost ([::1]:39460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nN4sO-0000iv-QM for larch@yhetil.org; Wed, 23 Feb 2022 22:33:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nN4sI-0000ii-KR for guix-patches@gnu.org; Wed, 23 Feb 2022 22:33:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53136) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nN4sI-0003sb-Aq for guix-patches@gnu.org; Wed, 23 Feb 2022 22:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nN4sI-0005ms-0D for guix-patches@gnu.org; Wed, 23 Feb 2022 22:33:02 -0500 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-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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645673590; h=from:from:sender:sender: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:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=4JjxcBnhNMUg5KeNWKVmK8QuVR1k62V7UCtiAGCz89E=; b=U6Nti8fRbmAaJITeHPUB5058zPHBHCUmJKzcK5AwVRw8Vu4eARsEZbAbLPMagbGQSH+c2T m7ljeQKw52BoDnvcIcAQFpDKuXDvJILdU+933mW+zKc0jos1Jqf/ta6j5GQHbSKi+llQxU BJBh8KyMjVu4pFVgxs1C2oeY26cLfi6rsrXDuL6xU/KSitxWdj4c7Rw6xkYPYyBksAQVxX bLkoD8LdLOMu4F4r1XGsW9qQvXYVa0Hmx0zQ+mBPrZhmFU4dvnoukVPxa7C97k+4GqjzCh Ez95Z+1kpZACXZAyppdZLbKdyT2JZpx/xj1Gi1HgClIXjUfUOYfj/VIna75cAg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645673590; a=rsa-sha256; cv=none; b=hiuMIWmjtk6GA+tm588RTa8w2Pt31G2aarT6wacoqzH+icsSBKkAZgJKuwa6KR9y05OyEN Ckc3m+n3FDSdyJ7ZQ4haRIyETv6Ze8+IZw5tgomtcyjdDgVGuaSHaJ1/7Xp4zlaz/AsGSD lOV3RtLBjwUb3cWWBZ/WFFzGePpFXREVTGVtupORdCoe0aamOGh4wC1h+88Kw0PMyduUui I30zzsHbnjqxEaedB3t7rUFo0fUPFvr79I6YbeuHgHUeBHYH8R9xmMYcJyQBePSkV2lp3A kM6WkupYKSSM7OJGX9rqmlFBECc6DNgTr0GFJ0uVer7qGx9OKwgJgHcS0FwgWA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=JH8s8y4F; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=JH8s8y4F; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: CA45342408 X-Spam-Score: -2.03 X-Migadu-Scanner: scn1.migadu.com X-TUID: bY7U6loSo7Td 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