From patchwork Sat Feb 26 04:32:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37458 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 61F3427BBEA; Sat, 26 Feb 2022 04:34:39 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 9140127BBE9 for ; Sat, 26 Feb 2022 04:34:38 +0000 (GMT) Received: from localhost ([::1]:36906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNomz-0002Y5-MH for patchwork@mira.cbaines.net; Fri, 25 Feb 2022 23:34:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNomR-00027B-0Y for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60175) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNomQ-00083h-C5 for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nNomQ-0005XD-9Y for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 1/4] 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: Sat, 26 Feb 2022 04:34: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 Cc: John Kehayias , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164584998821156 (code B ref 54069); Sat, 26 Feb 2022 04:34:02 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 04:33:08 +0000 Received: from localhost ([127.0.0.1]:54062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNolY-0005V9-A6 for submit@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:08 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:46916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNolV-0005UV-VN for 54069@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:07 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (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-101.mailbox.org (Postfix) with ESMTPS id 4K5DK74ngrz9sSc; Sat, 26 Feb 2022 05:32:59 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645849978; h=from:from: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; bh=ZHRXsluTMAREtph1WiKdD24JGxv0QdYzv69RND/TwqI=; b=rAsWWuxF/6YIZGv0SKFY9HZzrppVmJU2bSidrfrMaMsKlXBNfkihfnlB3MzkQ+CNYMJ0RS w0MGgWxWlZ2mXaPkCTKDwHQo+xRrkoDgtIQ8Vy9I/Ur9DSBoKDw/c/vmYRShveOgRG9tN4 auY7QTtSY1aqZhvJhIjFEMYfpYvup4LNSoBNu9uhrE8kD4t53z4sVbzyPMLIsj/6Wv5JCD iLm6/l7ZTlUKVEXIgbVh2Df8NLrHfXRVVW3MGbExmEKypx0ZPvBEgHIosTHfWqYoI8bB+t OGg+ZC0ZYDADe8v4lR3W2qMPNCbiG5bmrWWmkeEq1OLB4eqBeZ1X/9eOF3RTyQ== Date: Sat, 26 Feb 2022 15:32:35 +1100 Message-Id: <20220226043238.2657-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 | 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 ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,11 +22,14 @@ ;;; along with GNU Guix. If not, see . (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) #: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.") + (license (list license:gpl2+ + license:expat)))) ;XFree86 1.0 + (define-public pciutils (package (name "pciutils")