all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Brendan Tildesley <mail@brendan.scot>
Cc: John Kehayias <john.kehayias@protonmail.com>, 54069@debbugs.gnu.org
Subject: [bug#54069] [PATCH v2 1/4] gnu: Add hwdata.
Date: Sat, 26 Feb 2022 18:14:33 -0500	[thread overview]
Message-ID: <87zgmduso6.fsf@gmail.com> (raw)
In-Reply-To: <20220226043238.2657-1-mail@brendan.scot> (Brendan Tildesley's message of "Sat, 26 Feb 2022 15:32:35 +1100")

Hello Brendan,

Brendan Tildesley <mail@brendan.scot> 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 <me@tobias.gr>
>  ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
>  ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
> +;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot>
>  ;;;
>  ;;; 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




  parent reply	other threads:[~2022-02-26 23:15 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-20  9:53 [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest Brendan Tildesley
2022-02-20  9:55 ` [bug#54069] [PATCH 1/2] gnu: Add hwdata Brendan Tildesley
2022-02-20  9:55   ` [bug#54069] [PATCH 2/2] gnu: pciutils: Unbundle pci.ids and use latest Brendan Tildesley
2022-02-21 19:40     ` [bug#54069] [PATCH 0/2] " Maxim Cournoyer
2022-02-22  8:40       ` Brendan Tildesley
2022-02-24  3:32   ` Maxim Cournoyer
2022-02-25  4:44     ` Brendan Tildesley
2022-02-26  5:00       ` Maxim Cournoyer
2022-02-21 16:19 ` John Kehayias via Guix-patches via
2022-02-22 19:34   ` John Kehayias via Guix-patches via
2022-02-22 21:00     ` Maxim Cournoyer
2022-02-22 21:22       ` John Kehayias via Guix-patches via
2022-02-23  1:08         ` Maxim Cournoyer
2022-02-23  6:16           ` John Kehayias via Guix-patches via
2022-02-26  4:32 ` [bug#54069] [PATCH v2 1/4] gnu: Add hwdata Brendan Tildesley
2022-02-26  4:32   ` [bug#54069] [PATCH v2 2/4] gnu: pciutils: Unbundle pci.ids and use latest Brendan Tildesley
2022-02-26 14:19     ` Maxim Cournoyer
2022-02-26  4:32   ` [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids Brendan Tildesley
2022-02-26 11:21     ` Maxime Devos
2022-02-27  1:37       ` Brendan Tildesley
2022-02-27 10:46         ` Maxime Devos
2022-02-27 10:56           ` Maxime Devos
2022-02-27 21:23             ` Ludovic Courtès
2022-02-27 22:17               ` Maxime Devos
2022-02-28 11:48                 ` Ludovic Courtès
2022-02-27 22:18               ` Maxime Devos
2022-02-27 12:12     ` Maxime Devos
2022-02-26  4:32   ` [bug#54069] [PATCH v2 4/4] gnu: libpciaccess: Use hwdata for pci.ids Brendan Tildesley
2022-02-26 23:14   ` Maxim Cournoyer [this message]
2022-02-27 12:08     ` [bug#54069] [PATCH v2 1/4] gnu: Add hwdata Maxime Devos
2022-03-10  9:31 ` [bug#54069] [PATCHES v3 0/7]: Update and make use of hwdata Brendan Tildesley
2022-03-10  9:31   ` [bug#54069] [PATCH v3 1/7] gnu: hwdata: Set #:target #f Brendan Tildesley
2022-03-10  9:31   ` [bug#54069] [PATCH v3 2/7] gnu: hwdata: Remove unused gzip native-input Brendan Tildesley
2022-03-10  9:31   ` [bug#54069] [PATCH v3 3/7] gnu: hwdata: Update to 0.357 Brendan Tildesley
2022-03-10  9:31   ` [bug#54069] [PATCH v3 4/7] gnu: pciutils: Unbundle pci.ids and use latest Brendan Tildesley
2022-03-23  1:57     ` [bug#54069] [PATCH 0/2] " Maxim Cournoyer
2022-03-10  9:31   ` [bug#54069] [PATCH v3 5/7] gnu: libosinfo: Unbundle usb.ids, pci.ids Brendan Tildesley
2022-03-23  2:14     ` bug#54069: [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest Maxim Cournoyer
2022-03-10  9:31   ` [bug#54069] [PATCH v3 6/7] gnu: libosinfo: Use this-package-input Brendan Tildesley
2022-03-10  9:31   ` [bug#54069] [PATCH v3 7/7] gnu: libpciaccess: Use hwdata for pci.ids Brendan Tildesley
2022-03-22 22:02     ` [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87zgmduso6.fsf@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=54069@debbugs.gnu.org \
    --cc=john.kehayias@protonmail.com \
    --cc=mail@brendan.scot \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.