From patchwork Fri Aug 4 16:42:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52492 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 400D527BBE9; Fri, 4 Aug 2023 17:43:22 +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 C184827BBE2 for ; Fri, 4 Aug 2023 17:43:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qRxtH-0000U1-Bk; Fri, 04 Aug 2023 12:43:03 -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 1qRxtF-0000Te-W9 for guix-patches@gnu.org; Fri, 04 Aug 2023 12:43:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qRxtF-000079-OD for guix-patches@gnu.org; Fri, 04 Aug 2023 12:43:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qRxtF-0004ye-KG for guix-patches@gnu.org; Fri, 04 Aug 2023 12:43:01 -0400 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 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 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: + 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 * 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(-) base-commit: 8852e6bb5521edca099d6f346efc92db3244584c 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