From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kBLHMZi0GmKqWwAAgWs5BA (envelope-from ) for ; Sun, 27 Feb 2022 00:15:36 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 8D83L5i0GmJ8+gAA9RJhRA (envelope-from ) for ; Sun, 27 Feb 2022 00:15:36 +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 592901B5CB for ; Sun, 27 Feb 2022 00:15:36 +0100 (CET) Received: from localhost ([::1]:33062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nO6Hn-0002In-3W for larch@yhetil.org; Sat, 26 Feb 2022 18:15:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nO6HG-0002IP-2C for guix-patches@gnu.org; Sat, 26 Feb 2022 18:15:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34323) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nO6HF-0003AG-OP for guix-patches@gnu.org; Sat, 26 Feb 2022 18:15:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nO6HF-0006u6-JZ for guix-patches@gnu.org; Sat, 26 Feb 2022 18:15:01 -0500 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-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=1645917336; 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=fDhRpA6cC1Ildl5ucBzRnP5ebD6HaMa1Oe8P7MmVwaQ=; b=ZHmldiCxco9T9sip/XGoC89oR40zLu5x6Mw4Reg5HBm5jp9t7/ZsTCsQ6IfX92fPvSpWDg 2gXKW9ApJXzmCstc+YKflgGQYp8306oyYk5RsVd1wnv/KuIZEnGOxbOpRhqVw1sEWOBtLj isYMf+arsdt9qNpXuuvKq6qCVGM4iFmnhlwbj9ZLQeMfwvtI9KiXaWWFQF2RyF+PrrfH+b etEWp4+OBqVYCahasbtGO4ixUK120HCO3c8/+/3J2T8AtWQ75kZvDM3tNR4zzeJo3B4kOJ 1QU1oWkluXUUOeNUjRM+1AuUPHZpKIFIHojIPeilZcETXA9GVFF302FW9xXF8w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645917336; a=rsa-sha256; cv=none; b=sN2zlXRXNFf9nnO9sdc+CR4fe29DAZxzw+lilLsPgHLogWd8aG5+dCVlBLGYSUcFFFVXjP 2uRJdEkdvp5grY6v3LZ9mTitYzu6WdHfLOe0xwrqjtFtCj1QvCehgTeezsbWTKVvQT5gbn z/tmYRa4CiG15GYZmau316RSsMJc86Srw8JKXgC0JkpmB+uCo5gpu8etUFi+Iga8aHQKwL pQGOn6rkLZpbpexUP464Bxb5OOKeGFFl/y7geYNX6lZtXAPVxcDrV540fU6CM2S6SsrTK6 Ksje8WhkVTXahwVaZa5kB1p/NOH4FvsO7Y6/oVwMI9ubc8HPYSuu9ooTNmuxHg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=DW7obrZI; 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: 4.58 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=DW7obrZI; 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: 592901B5CB X-Spam-Score: 4.58 X-Migadu-Scanner: scn0.migadu.com X-TUID: K4gpJAOc8+xm 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