From patchwork Thu Jun 22 16:19:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51188 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 037D127BBEA; Thu, 22 Jun 2023 17:21:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CC2CB27BBE9 for ; Thu, 22 Jun 2023 17:21:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCN3B-0007YO-CB; Thu, 22 Jun 2023 12:20:52 -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 1qCN2i-00075Z-3k for guix-patches@gnu.org; Thu, 22 Jun 2023 12:20:27 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCN2Q-0000HZ-NQ for guix-patches@gnu.org; Thu, 22 Jun 2023 12:20:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCN2Q-00046u-Ha for guix-patches@gnu.org; Thu, 22 Jun 2023 12:20:02 -0400 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 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 X-Spamd-Bar: + Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: f25529b08e356f89ca7cecc44295085531a8faba 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