From unknown Mon Jun 23 06:03:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64228] [PATCH core-updates] gnu: hwdata: Update to 0.371. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Jun 2023 16:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64228 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64228@debbugs.gnu.org Cc: Hilton Chain X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168745079215760 (code B ref -1); Thu, 22 Jun 2023 16:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Jun 2023 16:19:52 +0000 Received: from localhost ([127.0.0.1]:36559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCN2F-000468-VS for submit@debbugs.gnu.org; Thu, 22 Jun 2023 12:19:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:41006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCN2D-00045x-Dp for submit@debbugs.gnu.org; Thu, 22 Jun 2023 12:19:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCN1t-0005mP-7i for guix-patches@gnu.org; Thu, 22 Jun 2023 12:19:29 -0400 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCN1r-0007IN-1h for guix-patches@gnu.org; Thu, 22 Jun 2023 12:19:28 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1687450572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=GutrDyEXxa9NZR2XVR8C0QgkTAnKq+QvTqk3lKBr0DI=; b=RhWqKhai4bbhLtp7m0D/hoSMQuPqtfEBcBFoonak/c3fs0YJ7X8Y6DEOrQNYsMVDexDC1d DCrXjqkwl5DCyZgm1bLlUUVXMjJvhihSUIXu902UsvV2OyOX5bHXLOss5/4LgZg3yzRMIX ELrRkMDATwO/5CDOL7tQk1gsZR4xryUP5cLf8a7QdlIpCvY9pY2Y4cx2zSizAyDHQyiO9s BlL7beY3PnbMhcVTovrp59qHg1NNj8WafV8XKabpi8VnkJgx3+jI6pK+Yt/ZTediinJqqC m6bzJj1/rg6OQr4Sxj+9t9uT3ngtkhLmlWB8GEVf+HhYDGFwhEl3voR3Z792eQ== Date: Fri, 23 Jun 2023 00:19:04 +0800 Message-Id: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@ultrarare.space> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: + Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spam-Level: * Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) hwdata along with a pkg-config file are installed to "out", other outputs are unnecessary then. * gnu/packages/pciutils.scm (hwdata): Update to 0.371. [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 3a65b96919..f5b740e3cb 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..67feba88ec 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.371") ;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")))) + "1b7n640vcjl36c7xj458z9j0ph84nb8hclnmlb9w56xkzfgbbbkc")))) (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 860e804452..09d095f5a2 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: f25529b08e356f89ca7cecc44295085531a8faba -- 2.40.1 From unknown Mon Jun 23 06:03:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64228] [PATCH v2] gnu: hwdata: Update to 0.372. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 02:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64228 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64228@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 64228-submit@debbugs.gnu.org id=B64228.168843840123255 (code B ref 64228); Tue, 04 Jul 2023 02:40:02 +0000 Received: (at 64228) by debbugs.gnu.org; 4 Jul 2023 02:40:01 +0000 Received: from localhost ([127.0.0.1]:34793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGVxQ-00062z-IY for submit@debbugs.gnu.org; Mon, 03 Jul 2023 22:40:01 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:35814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGVxN-00062m-CF for 64228@debbugs.gnu.org; Mon, 03 Jul 2023 22:39:59 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1688438177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n7krY5cJ/AYn1AvGOSuJWsHDAfLahBLM5UxZetr7Mfg=; b=Q8QT6s0SOPNpM8I0DUMigz3/aPFNU2kpwfCv83VKdS2XCnAsVQvo09Tq6+FEljqHFvGNVq G5Y60TE0VJ2vDPjKkmwY1e8x/gYGsFnHhB6EdI3gGf87uei/9BUpfZKYKobSEExggMDLTk TtaIHcvmq+6BTMfdULe7x7UlkoXtc3ZE/c6tAduYYkql2rOoM7rWtDcXQWYuh0oTrewy/z F0xaoMuOQzaewNX3WSJpFg1S64ldkqb1Ad18Zgq7aKXBGQB0eP1yrYxdqB02gmOf97gYvI ndFNpBDcvHTzPdKE4IDMddjw3UQtiq8DJ3CMhO1arnsMc+FQHCXSEMdaAj7HIg== Date: Tue, 4 Jul 2023 10:39:47 +0800 Message-Id: In-Reply-To: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@ultrarare.space> References: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@ultrarare.space> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: + Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spam-Level: * X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Mon Jun 23 06:03:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64228] [PATCH v3 core-updates] gnu: hwdata: Update to 0.373. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Aug 2023 16:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64228 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64228@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 64228-submit@debbugs.gnu.org id=B64228.169116735619098 (code B ref 64228); Fri, 04 Aug 2023 16:43:01 +0000 Received: (at 64228) by debbugs.gnu.org; 4 Aug 2023 16:42:36 +0000 Received: from localhost ([127.0.0.1]:54647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRxsq-0004xy-9m for submit@debbugs.gnu.org; Fri, 04 Aug 2023 12:42:36 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:39678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRxso-0004xm-5s for 64228@debbugs.gnu.org; Fri, 04 Aug 2023 12:42:35 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691167346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U4tsgycBbdfXFvlxeZtgBrZONl6/Y3liiXLi5GfPldw=; b=zHzY2PUOGXcSnb7zXUGcMMYzMA6AYAELKuYDxK9CffWS9rU46ql0XEOWZG2aaYDNqM6A1D Ql8Yv8IiG8Oy6VneSY/n7a5rHBXETxoVfEhisPeTCmjGD1R2/ZGhywiYoCqFddk+AnnDtI 1q1uHRE2HSwVHNyX27Mn3/wXGZJssduR39f/ZXyJ3zacbPELb3pxJnKdH+jL6sbRGBd2S6 FisRPBUb6FKrGmu+Ld+P5HvLFcTI0FzznvcPj1ZvPS9S/MAWn4JtFe1UDOng44UwY/PhQa 9nfjISbDkbXF3ML828L7vPA1ksUwGPzFokLInwTVj/96hfbXZ7JfS8xazVsmAQ== Date: Sat, 5 Aug 2023 00:42:01 +0800 Message-ID: In-Reply-To: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@ultrarare.space> References: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@ultrarare.space> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spam-Level: * X-Spamd-Bar: + X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/pciutils.scm (hwdata): Update to 0.373. [arguments]: Don't modify <#:phases>. [outputs]: Keep only "out" for pkg-config file. * 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 da49f23f1f..0a737524d2 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1091,7 +1091,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 974c35e9cc..1612e0833d 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..10eafa7680 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.373") ;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")))) + "00ivyzwc1qsbkqizjqll4s436y7s64cqjx0azvnjrqfq5dsnhxi9")))) (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 9556fbc61e..1ffafadfbd 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1248,8 +1248,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 f2c050408e..6245f76788 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1644,7 +1644,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: 8852e6bb5521edca099d6f346efc92db3244584c -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 04 12:46:03 2023 Received: (at control) by debbugs.gnu.org; 4 Aug 2023 16:46:03 +0000 Received: from localhost ([127.0.0.1]:54655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRxwB-00054P-Kw for submit@debbugs.gnu.org; Fri, 04 Aug 2023 12:46:03 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:38018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRxw9-00053j-R4 for control@debbugs.gnu.org; Fri, 04 Aug 2023 12:46:02 -0400 Date: Sat, 05 Aug 2023 00:45:48 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691167556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=zxOCBHNmEY4akhilN2FdgjXRgmSx2uo+i7zTBNJ8Efc=; b=Ek0mdAEkxRLGMX1Qw00iqsJ88BAN3Q8dCTydBRpmakcYwNzngN8G8l5Onvw+PTL9/jTNX6 LLvgnkTlC5MG/i9mgyJPFKDnsHwXXvLFhlT2nLRizhsbfSrn9ymmNjl42cAWnZi5+91eqh +jvhYs6XP2Esh2QKTefJTap7pl1FkLan6g4Sl9JfDUlVFUBEgCjnqHGkIEv3wyQPKkMPFi dKPkwEjmY1NYdhf8iV82MKuIztzVt1MMUkAreb4sp+JIMrECy5ei5hDm8Gs+XrtEWi3FmV RXcNrfkB3tBdzUML0fU0mHnjPBtzM6PYquqTuSMLU5lzvTdN4q9aM55t58DrXQ== Message-ID: <87350ykb7n.wl-hako@ultrarare.space> From: Hilton Chain To: control@debbugs.gnu.org Subject: Re: [PATCH v3 core-updates] gnu: hwdata: Update to 0.373. In-Reply-To: References: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@ultrarare.space> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) retitle 64228 [PATCH core-updates] gnu: hwdata: Update to 0.373. thanks From unknown Mon Jun 23 06:03:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64228] [PATCH core-updates v4] gnu: hwdata: Update to 0.374. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Wed, 27 Sep 2023 11:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64228 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64228@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 64228-submit@debbugs.gnu.org id=B64228.169581585029620 (code B ref 64228); Wed, 27 Sep 2023 11:58:01 +0000 Received: (at 64228) by debbugs.gnu.org; 27 Sep 2023 11:57:30 +0000 Received: from localhost ([127.0.0.1]:50799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlTAO-0007hS-MR for submit@debbugs.gnu.org; Wed, 27 Sep 2023 07:57:30 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:43002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlTAM-0007hK-6N for 64228@debbugs.gnu.org; Wed, 27 Sep 2023 07:57:19 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1695815720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UeU86a6LbqB2Y44ukyp1a+2tExUQsn8DWn7ezXj64SA=; b=iKPhFgHMsKuCoV4k3CbkRMIdp+k07V0Rk/aN8eeHiuXx6hwNoMD/TipFKOwFowxxSWbK4p 47/OYPx2MMdxeqcYyecBR15I6GxlEnM1HRER/YCee0S2FaoJvGhuHEWUtzG2eycng35Pe0 DGKyWsWyou1nixvURSCnreF7zfCeuVTQLrPlsOH1Zz+m9v2qObkX/nypNluoHVOJwAWK1j 8v+lY87oal3PMXNA0GJZveU6NPJrM41qPiKhd7sEWGUSILo0eMrdorhPG06xXeikA9q4G0 P83Y0IZuZoy85A1xRED7NtPrrYNBRxT7qCOJhgkVdK89PUkd4HHXXznuBritlQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Wed, 27 Sep 2023 19:50:13 +0800 Message-ID: In-Reply-To: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@ultrarare.space> References: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@ultrarare.space> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: + X-Spam-Level: * X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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(-) 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 base-commit: 70b0f2b9134b2db286f707835394798de039c277 -- 2.41.0 From unknown Mon Jun 23 06:03:27 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Hilton Chain Subject: bug#64228: closed (Re: bug#64228: [PATCH core-updates] gnu: hwdata: Update to 0.373.) Message-ID: References: <87o7de56qj.fsf_-_@gmail.com> <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@ultrarare.space> X-Gnu-PR-Message: they-closed 64228 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 64228@debbugs.gnu.org Date: Mon, 22 Jan 2024 04:32:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1705897922-16557-1" This is a multi-part message in MIME format... ------------=_1705897922-16557-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #64228: [PATCH core-updates] gnu: hwdata: Update to 0.373. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 64228@debbugs.gnu.org. --=20 64228: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D64228 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1705897922-16557-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 64228-done) by debbugs.gnu.org; 22 Jan 2024 04:31:46 +0000 Received: from localhost ([127.0.0.1]:39592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRlyL-0004IS-IN for submit@debbugs.gnu.org; Sun, 21 Jan 2024 23:31:45 -0500 Received: from mail-qt1-x834.google.com ([2607:f8b0:4864:20::834]:42397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRlyJ-0004IC-Ns for 64228-done@debbugs.gnu.org; Sun, 21 Jan 2024 23:31:44 -0500 Received: by mail-qt1-x834.google.com with SMTP id d75a77b69052e-429915eefa5so19752631cf.1 for <64228-done@debbugs.gnu.org>; Sun, 21 Jan 2024 20:31:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705897894; x=1706502694; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=OoWyu6Kt0/0w1LMpZSxt2IYIkBEOh5+myEpgYd7u2O8=; b=k79J+rcN/yxYbSC0n2VOvkE5DzcdHKbJU2YqueS6kZgY5U+X0KoZiEbUdRaJDgM2Q8 RRz5lDwTNl5XB3avg5yUqksIbBUQqkV0SysTdw4G3HrGSJ70oqNz2IXx8VHkI//EjCYi IeAh6dU+G5T21sPlqxQa+jA9Rv0QM952y/St+Jz3uC8xz8is05ka8thXI0ZUH0gLhyls YijlWIL32HAXNhAfEsku4XAHvrjIkKCUt/KduZlJwf6haM9u06JlKbwaw7xG2NcNftx2 tvqMLhg3vQJDEhPvg2KnIqSaabGzCbaBrCkTP5dHXrPcOJhy/d3EJ3jUIaXo1Jj6XS6R /a0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705897894; x=1706502694; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=OoWyu6Kt0/0w1LMpZSxt2IYIkBEOh5+myEpgYd7u2O8=; b=FWLp41JXnRschM+ehEfUQhWdibbI2GvuAQmyipfSEo3/3BXWxCQ0cFy7m8T9lFZJeS fxhquQcG0unjEmwfKBMzZqkrtpTf6f78MAQWVdpSZ3pQBU9dURXwajyeIU8VxWXcC+iM TYzoiD/xceTzrVMAoD+wVeJ37hzxkvrj9nHbUJzH49ovaf+4sG++SF54buYBCcgRloUk +cR9SX5YDED1J/lqnCkaBFWDlEh/oGnmAQvt1HxJV7zwSrIOFjqNxzc3PyH8XvbLCHbp DS7oGRZWwC8Uok+KhICHIf8evh5nU84YjTHnKfMFhh9fD7iAETRm1kSfiiIkm1zXMiV0 W3Ag== X-Gm-Message-State: AOJu0Yzr6hUiVqeoEG9Cff2enQW7VEfee+nAzWiSI3v7cRND9tkWhuU7 OYjMedpkJdWxmkg+/0/BUTlb+8zVfMN+aphmfA1n847HvWyQHDcBiOx37tEHYX8= X-Google-Smtp-Source: AGHT+IH/BVtZ+IlI4hXezm1FkJ8lUM2beyKT/yA0USqLlSEkNUtcj5oEPCTBkeESKQJIKgDzjC4j1w== X-Received: by 2002:ac8:4e46:0:b0:429:bdd1:7f3d with SMTP id e6-20020ac84e46000000b00429bdd17f3dmr6987570qtw.8.1705897893823; Sun, 21 Jan 2024 20:31:33 -0800 (PST) Received: from hurd (dsl-10-128-232.b2b2c.ca. [72.10.128.232]) by smtp.gmail.com with ESMTPSA id d13-20020ac8534d000000b00429bc01acc5sm2131746qto.68.2024.01.21.20.31.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 20:31:33 -0800 (PST) From: Maxim Cournoyer To: Hilton Chain Subject: Re: bug#64228: [PATCH core-updates] gnu: hwdata: Update to 0.373. In-Reply-To: (Hilton Chain's message of "Wed, 27 Sep 2023 19:50:13 +0800") References: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@ultrarare.space> Date: Sun, 21 Jan 2024 23:31:32 -0500 Message-ID: <87o7de56qj.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64228-done Cc: 64228-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Hilton Chain 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! -- Thanks, Maxim ------------=_1705897922-16557-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 22 Jun 2023 16:19:52 +0000 Received: from localhost ([127.0.0.1]:36559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCN2F-000468-VS for submit@debbugs.gnu.org; Thu, 22 Jun 2023 12:19:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:41006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCN2D-00045x-Dp for submit@debbugs.gnu.org; Thu, 22 Jun 2023 12:19:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCN1t-0005mP-7i for guix-patches@gnu.org; Thu, 22 Jun 2023 12:19:29 -0400 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qCN1r-0007IN-1h for guix-patches@gnu.org; Thu, 22 Jun 2023 12:19:28 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1687450572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=GutrDyEXxa9NZR2XVR8C0QgkTAnKq+QvTqk3lKBr0DI=; b=RhWqKhai4bbhLtp7m0D/hoSMQuPqtfEBcBFoonak/c3fs0YJ7X8Y6DEOrQNYsMVDexDC1d DCrXjqkwl5DCyZgm1bLlUUVXMjJvhihSUIXu902UsvV2OyOX5bHXLOss5/4LgZg3yzRMIX ELrRkMDATwO/5CDOL7tQk1gsZR4xryUP5cLf8a7QdlIpCvY9pY2Y4cx2zSizAyDHQyiO9s BlL7beY3PnbMhcVTovrp59qHg1NNj8WafV8XKabpi8VnkJgx3+jI6pK+Yt/ZTediinJqqC m6bzJj1/rg6OQr4Sxj+9t9uT3ngtkhLmlWB8GEVf+HhYDGFwhEl3voR3Z792eQ== To: guix-patches@gnu.org Subject: [PATCH core-updates] gnu: hwdata: Update to 0.371. Date: Fri, 23 Jun 2023 00:19:04 +0800 Message-Id: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@ultrarare.space> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: + Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spam-Level: * Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Hilton Chain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) hwdata along with a pkg-config file are installed to "out", other outputs are unnecessary then. * gnu/packages/pciutils.scm (hwdata): Update to 0.371. [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 3a65b96919..f5b740e3cb 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..67feba88ec 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.371") ;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")))) + "1b7n640vcjl36c7xj458z9j0ph84nb8hclnmlb9w56xkzfgbbbkc")))) (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 860e804452..09d095f5a2 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: f25529b08e356f89ca7cecc44295085531a8faba -- 2.40.1 ------------=_1705897922-16557-1--