gnu: hwdata: Update to 0.374.

* gnu/packages/pciutils.scm (hwdata): Update to 0.374.
[arguments]: Don't modify #:phases.
[outputs]: Keep only "out" for pkg-config file.
(pciutils)[native-inputs]: Replace hwdata to "out" output.
* gnu/packages/graphics.scm (mangohub)[inputs]: Likewise.
* gnu/packages/kde-plasma.scm (kwin)[inputs]: Likewise.
* gnu/packages/virtualization.scm (libosinfo)[native-inputs]: Likewise.
* gnu/packages/wm.scm (wlroots)[native-inputs]: Likewise.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Hilton Chain 2023-09-27 19:50:13 +08:00 committed by Ludovic Courtès
parent aff6b2ac11
commit 8fc1b0ccc8
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
5 changed files with 9 additions and 19 deletions

View file

@ -1110,7 +1110,7 @@ (define-public mangohud
(inputs (inputs
(list dbus (list dbus
glslang glslang
`(,hwdata "pci") hwdata
imgui-1.86 imgui-1.86
libx11 libx11
mesa mesa

View file

@ -1460,7 +1460,8 @@ (define-public kwin
eudev eudev
fontconfig fontconfig
freetype freetype
`(,hwdata "pnp")
hwdata
plasma-activities plasma-activities
kcmutils kcmutils
kcompletion kcompletion

View file

@ -39,7 +39,7 @@ (define-module (gnu packages pciutils)
(define-public hwdata (define-public hwdata
(package (package
(name "hwdata") (name "hwdata")
(version "0.365") ;updated monthly (version "0.374") ;updated monthly
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -48,25 +48,15 @@ (define-public hwdata
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"00gqx24dyy9l98ygnvx8i087xq8pl9d2393h4d2cm4d5nnvr51d4")))) "1fcmg06lfzqrpq4z4gp12qpk7rd3s0phz4qyhq39ks43r1vxiy26"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "iab" "oui" "pci" "pnp" "usb"))
(arguments (arguments
;; Tests require pciutils, python, podman. Disable to avoid recursive dep. ;; Tests require pciutils, python, podman. Disable to avoid recursive dep.
(list (list
#:tests? #f #:tests? #f
;; Do not cross-compile, since the package only contains data. ;; Do not cross-compile, since the package only contains data.
#:target #f #:target #f
#:configure-flags #~(list (string-append "--datadir=" #$output "/share")) #: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") (home-page "https://github.com/vcrhonek/hwdata")
(synopsis "Hardware identification and configuration data") (synopsis "Hardware identification and configuration data")
(description "@code{hwdata} contains various hardware identification and (description "@code{hwdata} contains various hardware identification and
@ -159,7 +149,7 @@ (define-public pciutils
;; No test suite. ;; No test suite.
#:tests? #f)) #:tests? #f))
(native-inputs (native-inputs
(list `(,hwdata "pci") pkg-config which)) (list hwdata pkg-config which))
(inputs (inputs
`(,@(if (not (target-hurd?)) `(,@(if (not (target-hurd?))
`(("kmod" ,kmod)) `(("kmod" ,kmod))

View file

@ -1330,8 +1330,7 @@ (define-public libosinfo
(list `(,glib "bin") ;glib-mkenums, etc. (list `(,glib "bin") ;glib-mkenums, etc.
gobject-introspection gobject-introspection
gtk-doc/stable gtk-doc/stable
`(,hwdata "pci") hwdata
`(,hwdata "usb")
vala vala
intltool intltool
pkg-config)) pkg-config))

View file

@ -1771,7 +1771,7 @@ (define-public wlroots
xorg-server-xwayland)) xorg-server-xwayland))
(native-inputs (native-inputs
(cons* (cons*
`(,hwdata "pnp") hwdata
pkg-config pkg-config
wayland wayland
(if (%current-target-system) (if (%current-target-system)