diff mbox series

[bug#64228,core-updates,v4] gnu: hwdata: Update to 0.374.

Message ID a2c141cebb9b601bf0a909d30302439de1d8001b.1695815303.git.hako@ultrarare.space
State New
Headers show
Series [bug#64228,core-updates,v4] gnu: hwdata: Update to 0.374. | expand

Commit Message

Hilton Chain Sept. 27, 2023, 11:50 a.m. UTC 
* 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.
---
 gnu/packages/graphics.scm       |  2 +-
 gnu/packages/kde-plasma.scm     |  2 +-
 gnu/packages/pciutils.scm       | 18 ++++--------------
 gnu/packages/virtualization.scm |  3 +--
 gnu/packages/wm.scm             |  2 +-
 5 files changed, 8 insertions(+), 19 deletions(-)


base-commit: 70b0f2b9134b2db286f707835394798de039c277

Comments

Maxim Cournoyer Jan. 22, 2024, 4:31 a.m. UTC | #1 
Hi,

Hilton Chain <hako@ultrarare.space> writes:

> * 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.

I'll submit this to core-updates soon (queued locally).

Closing!
diff mbox series

Patch

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 8edc93f702..387b047353 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1092,7 +1092,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 11586a6ce2..2a7221e1ad 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -1301,7 +1301,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..d2a352eb6b 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.374")                   ;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"))))
+                "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 @@  (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 f5bdedd45e..13ab906ed7 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1250,8 +1250,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 aaff618248..8080f7368f 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1667,7 +1667,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