Hilton Chain <hako@HIDDEN>
to control <at> debbugs.gnu.org
.
Full text available.Received: (at 64228) by debbugs.gnu.org; 4 Aug 2023 16:42:36 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Aug 04 12:42:36 2023 Received: from localhost ([127.0.0.1]:54647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qRxsq-0004xy-9m for submit <at> 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 <hako@HIDDEN>) id 1qRxso-0004xm-5s for 64228 <at> debbugs.gnu.org; Fri, 04 Aug 2023 12:42:35 -0400 From: Hilton Chain <hako@HIDDEN> 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== To: 64228 <at> debbugs.gnu.org Subject: [PATCH v3 core-updates] gnu: hwdata: Update to 0.373. Date: Sat, 5 Aug 2023 00:42:01 +0800 Message-ID: <b0bc9afaee1d2907c53d1360dd39f08884e28c9c.1691167270.git.hako@HIDDEN> In-Reply-To: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@HIDDEN> References: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN X-Spam-Level: * X-Spamd-Bar: + X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64228 Cc: Hilton Chain <hako@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> 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
guix-patches@HIDDEN
:bug#64228
; Package guix-patches
.
Full text available.Received: (at 64228) by debbugs.gnu.org; 4 Jul 2023 02:40:01 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jul 03 22:40:01 2023 Received: from localhost ([127.0.0.1]:34793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qGVxQ-00062z-IY for submit <at> 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 <hako@HIDDEN>) id 1qGVxN-00062m-CF for 64228 <at> debbugs.gnu.org; Mon, 03 Jul 2023 22:39:59 -0400 From: Hilton Chain <hako@HIDDEN> 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== To: 64228 <at> debbugs.gnu.org Subject: [PATCH v2] gnu: hwdata: Update to 0.372. Date: Tue, 4 Jul 2023 10:39:47 +0800 Message-Id: <f249af1a9e7dac60f5155e401533b3e6ffef5c58.1688438016.git.hako@HIDDEN> In-Reply-To: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@HIDDEN> References: <18f5352bca5f53bf7edf6f27a7f38d235c000375.1687450736.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: + Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN X-Spam-Level: * X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64228 Cc: Hilton Chain <hako@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> 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
guix-patches@HIDDEN
:bug#64228
; Package guix-patches
.
Full text available.Received: (at submit) by debbugs.gnu.org; 22 Jun 2023 16:19:52 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jun 22 12:19:52 2023 Received: from localhost ([127.0.0.1]:36559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qCN2F-000468-VS for submit <at> 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 <hako@HIDDEN>) id 1qCN2D-00045x-Dp for submit <at> 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 <hako@HIDDEN>) id 1qCN1t-0005mP-7i for guix-patches@HIDDEN; 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 <hako@HIDDEN>) id 1qCN1r-0007IN-1h for guix-patches@HIDDEN; Thu, 22 Jun 2023 12:19:28 -0400 From: Hilton Chain <hako@HIDDEN> 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@HIDDEN 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@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: + Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN X-Spam-Level: * Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@HIDDEN; 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 <hako@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> 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
Hilton Chain <hako@HIDDEN>
:guix-patches@HIDDEN
.
Full text available.guix-patches@HIDDEN
:bug#64228
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.