From patchwork Wed Sep 27 11:50:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 54347 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 B9E4927BBE2; Wed, 27 Sep 2023 12:58:09 +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 98FC627BBE9 for ; Wed, 27 Sep 2023 12:58:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlTAs-0005o4-OY; Wed, 27 Sep 2023 07:57: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 1qlTAr-0005nr-DF for guix-patches@gnu.org; Wed, 27 Sep 2023 07:57:49 -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 1qlTAq-0005Fy-6f for guix-patches@gnu.org; Wed, 27 Sep 2023 07:57:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qlTB3-0007iV-N5; Wed, 27 Sep 2023 07:58:01 -0400 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 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 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.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 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