diff options
| author | Hilton Chain <hako@ultrarare.space> | 2023-09-27 19:50:13 +0800 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:41 +0200 |
| commit | 8fc1b0ccc8688e3e6ceae9d7004f95c88d08447a (patch) | |
| tree | 74ca5a8350f1e9d8cb29c2b3edc5bf4bae85f32d | |
| parent | aff6b2ac111834c5d2b2f04021b542563c2d4776 (diff) | |
| download | guix-8fc1b0ccc8688e3e6ceae9d7004f95c88d08447a.tar guix-8fc1b0ccc8688e3e6ceae9d7004f95c88d08447a.tar.gz | |
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>
| -rw-r--r-- | gnu/packages/graphics.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/kde-plasma.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/pciutils.scm | 18 | ||||
| -rw-r--r-- | gnu/packages/virtualization.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/wm.scm | 2 |
5 files changed, 9 insertions, 19 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 6c9d6cded9..8280fe0195 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1110,7 +1110,7 @@ distills complex, animated scenes into a set of baked geometric results.") (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 6451192d68..f936146953 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -1460,7 +1460,8 @@ KDE Frameworks components.") eudev fontconfig freetype - `(,hwdata "pnp") + + hwdata plasma-activities kcmutils kcompletion diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 140bbd0e90..d2a352eb6b 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -39,7 +39,7 @@ (define-public hwdata (package (name "hwdata") - (version "0.365") ;updated monthly + (version "0.374") ;updated monthly (source (origin (method git-fetch) (uri (git-reference @@ -48,25 +48,15 @@ (file-name (git-file-name name version)) (sha256 (base32 - "00gqx24dyy9l98ygnvx8i087xq8pl9d2393h4d2cm4d5nnvr51d4")))) + "1fcmg06lfzqrpq4z4gp12qpk7rd3s0phz4qyhq39ks43r1vxiy26")))) (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 @@ Each database is contained in a specific package output, such as the ;; 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 74dafa2e82..4b2e5eb60b 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1330,8 +1330,7 @@ of one or more RISC-V harts.") (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 f41dd7bea5..efa15883d4 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1771,7 +1771,7 @@ functionality to display information about the most commonly used services.") xorg-server-xwayland)) (native-inputs (cons* - `(,hwdata "pnp") + hwdata pkg-config wayland (if (%current-target-system) |