Subject: [bug#54069] [PATCH v2 1/4] gnu: Add hwdata.

From: Maxim Cournoyer <[email-masked]>
Date: Sat, 26 Feb 2022 18:14:33 -0500

Hello Brendan,

Brendan Tildesley <[email-masked]> 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 © 2018 Tobias Geerinckx-Rice <[email-masked]>
>  ;;; Copyright © 2019 Mathieu Othacehe <[email-masked]>
>  ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <[email-masked]>
> +;;; Copyright © 2022 Brendan Tildesley <[email-masked]>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -21,11 +22,14 @@
>  ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
>  
>  (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))
>  
> +(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.")

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 and
- configuration data, such as the @file{pci.ids} and @file{usb.ids} databases.")
+configuration data, such as the @file{pci.ids} and @file{usb.ids} databases.
+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