From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id ILCaMJeGo2S5VgEASxT56A (envelope-from ) for ; Tue, 04 Jul 2023 04:40:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CBmfMJeGo2SCGQEA9RJhRA (envelope-from ) for ; Tue, 04 Jul 2023 04:40:23 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4F228366CF for ; Tue, 4 Jul 2023 04:40:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGVxW-0000wP-Hn; Mon, 03 Jul 2023 22:40:06 -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 1qGVxT-0000p6-Q4 for guix-patches@gnu.org; Mon, 03 Jul 2023 22:40:04 -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 1qGVxS-0007ZW-HU for guix-patches@gnu.org; Mon, 03 Jul 2023 22:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGVxS-00063J-4y for guix-patches@gnu.org; Mon, 03 Jul 2023 22:40:02 -0400 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 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: + 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 From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688438423; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=n7krY5cJ/AYn1AvGOSuJWsHDAfLahBLM5UxZetr7Mfg=; b=Y0lRmci+zmxfuNUT6B949z9kCsK+CqUE+95CATtE6MUYQN3sTtqZctUJPZ0qYDa/WCAkfs Qi/z9yUxYT1hJJ49laYDerMEuS4VQrR1qEB6V7rzZf6IaXdfORY+mSDzGCL310xEZxtdjp DKvXvjSbZhKFnK9QMNO0/AbuCeC5gmnCnDX9N0F4feoTBiJ9FLHT4Xloqqw1sDu9htkhx8 pYSVoXqDzOvrGZ3smq0FLECs+fWg7iuJ3EwUo4pgrFfW8Y0Z1ML8J8qgBqQb5vYSpq3F9k bzizDooQ9t1BtFgVbvHCBaGIHZS5yObSYy2RR2zCKPxRI3wd24+eUD4kxpl7Yg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=Q8QT6s0S; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1688438423; a=rsa-sha256; cv=none; b=mbvscfMJaTKFviK/HgZc5i0m8sBvb54AYzLtNvSCZl9PXjxtuCscrXvVsXDLaPpmHcmTFS /hyYDSQzVSi6CTFwJCUGzLihFA6bXWtGUwbG0Gv4KPn3PhdcYhmOlhIqkmoB1jyjx8/By+ D34+a4UdJaFSBBJwCc1pNm4X2S48WWSOwtIPW9HKWqh4wwI6lPhSShpaPIxg2l45UirH8u 69iE+wCE4h5sv2zK1CnytNLZwggR9uUeawUdK6vS7mzKl0+MeG62QJ/Qi9H0+o/fkEkJqU uk++xeksgtjLzzADSJWaFjb8SDScX4bCU9yUy6W8wawha8n2Y/BCyNrbLH4Exg== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.26 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=Q8QT6s0S; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 4F228366CF X-Spam-Score: -3.26 X-TUID: frV5/XQ9VX2N 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