From: Hilton Chain via Guix-patches via <guix-patches@gnu.org>
To: 64228@debbugs.gnu.org
Cc: Hilton Chain <hako@ultrarare.space>
Subject: [bug#64228] [PATCH v2] gnu: hwdata: Update to 0.372.
Date: Tue, 4 Jul 2023 10:39:47 +0800 [thread overview]
Message-ID: <f249af1a9e7dac60f5155e401533b3e6ffef5c58.1688438016.git.hako@ultrarare.space> (raw)
In-Reply-To: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@ultrarare.space>
hwdata along with a pkg-config file are installed to "out", other outputs are
unnecessary then.
* gnu/packages/pciutils.scm (hwdata): Update to 0.372.
[arguments]: Don't modify <#:phases>.
[outputs]: Keep only "out".
* gnu/packages/graphics.scm (mangohub)[inputs]: Replace hwdata to "out" output
* gnu/packages/kde-plasma.scm (kwin)[inputs]: Likewise.
* gnu/packages/virtualization.scm (libosinfo)[native-inputs]: Likewise.
* gnu/packages/wm.scm (wlroots)[native-inputs]: Likewise.
---
gnu/packages/graphics.scm | 2 +-
gnu/packages/kde-plasma.scm | 4 ++--
gnu/packages/pciutils.scm | 18 ++++--------------
gnu/packages/virtualization.scm | 3 +--
gnu/packages/wm.scm | 2 +-
5 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 2a7a86d9a0..0291c894ac 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1090,7 +1090,7 @@ (define-public mangohud
(inputs
(list dbus
glslang
- `(,hwdata "pci")
+ hwdata
imgui-1.86
libx11
mesa
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 2000ec3114..f626508682 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -1169,7 +1169,7 @@ (define-public kwin
(which "Xwayland") b)))
(substitute* '("cmake/modules/Findhwdata.cmake")
(("/usr/share")
- (string-append #$hwdata:pnp "/share")))))
+ (string-append #$hwdata "/share")))))
(add-after 'install 'add-symlinks
(lambda* (#:key outputs #:allow-other-keys)
(let ((kst5 (string-append #$output
@@ -1219,7 +1219,7 @@ (define-public kwin
eudev
fontconfig
freetype
- `(,hwdata "pnp")
+ hwdata
kactivities
kcmutils
kcompletion
diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm
index 140bbd0e90..3b9bb0834d 100644
--- a/gnu/packages/pciutils.scm
+++ b/gnu/packages/pciutils.scm
@@ -39,7 +39,7 @@ (define-module (gnu packages pciutils)
(define-public hwdata
(package
(name "hwdata")
- (version "0.365") ;updated monthly
+ (version "0.372") ;updated monthly
(source (origin
(method git-fetch)
(uri (git-reference
@@ -48,25 +48,15 @@ (define-public hwdata
(file-name (git-file-name name version))
(sha256
(base32
- "00gqx24dyy9l98ygnvx8i087xq8pl9d2393h4d2cm4d5nnvr51d4"))))
+ "0z00wvxbf1l1znp26vcysbz2ymh6agnx2nrx8vg3p38f9gji8baw"))))
(build-system gnu-build-system)
- (outputs '("out" "iab" "oui" "pci" "pnp" "usb"))
(arguments
;; Tests require pciutils, python, podman. Disable to avoid recursive dep.
(list
#:tests? #f
;; Do not cross-compile, since the package only contains data.
#:target #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")))))))
+ #:configure-flags #~(list (string-append "--datadir=" #$output "/share"))))
(home-page "https://github.com/vcrhonek/hwdata")
(synopsis "Hardware identification and configuration data")
(description "@code{hwdata} contains various hardware identification and
@@ -159,7 +149,7 @@ (define-public pciutils
;; No test suite.
#:tests? #f))
(native-inputs
- (list `(,hwdata "pci") pkg-config which))
+ (list hwdata pkg-config which))
(inputs
`(,@(if (not (target-hurd?))
`(("kmod" ,kmod))
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index c88fd31146..7276243ef8 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1197,8 +1197,7 @@ (define-public libosinfo
(list `(,glib "bin") ;glib-mkenums, etc.
gobject-introspection
gtk-doc/stable
- `(,hwdata "pci")
- `(,hwdata "usb")
+ hwdata
vala
intltool
pkg-config))
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 46a1030490..697e6c7083 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1626,7 +1626,7 @@ (define-public wlroots
xorg-server-xwayland))
(native-inputs
(list
- `(,hwdata "pnp")
+ hwdata
pkg-config))
(home-page "https://gitlab.freedesktop.org/wlroots/wlroots/")
(synopsis "Pluggable, composable, unopinionated modules for building a
base-commit: cf7e0267adfc3cb83e477c2aebb61060c3c0cfd6
--
2.40.1
next prev parent reply other threads:[~2023-07-04 2:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-22 16:19 [bug#64228] [PATCH core-updates] gnu: hwdata: Update to 0.371 Hilton Chain via Guix-patches via
2023-07-04 2:39 ` Hilton Chain via Guix-patches via [this message]
2023-08-04 16:42 ` [bug#64228] [PATCH v3 core-updates] gnu: hwdata: Update to 0.373 Hilton Chain via Guix-patches via
2023-09-27 11:50 ` [bug#64228] [PATCH core-updates v4] gnu: hwdata: Update to 0.374 Hilton Chain via Guix-patches via
2024-01-22 4:31 ` bug#64228: [PATCH core-updates] gnu: hwdata: Update to 0.373 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=f249af1a9e7dac60f5155e401533b3e6ffef5c58.1688438016.git.hako@ultrarare.space \
--to=guix-patches@gnu.org \
--cc=64228@debbugs.gnu.org \
--cc=hako@ultrarare.space \
/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.