From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id EN0oF+RCcmfMWQEA62LTzQ:P1 (envelope-from ) for ; Mon, 30 Dec 2024 06:51:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id EN0oF+RCcmfMWQEA62LTzQ (envelope-from ) for ; Mon, 30 Dec 2024 07:51:16 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=oXJYGOr3; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735541476; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=KkrmbdYje9RTpYICr7/SM7OzrsbOZsmGPv/5GviQe7E=; b=VSbX0X931+LPkOyaFoPrH75Eq8hGt+bTQkv6wu3SUvOULxSimo8j8oeNv3sUuaNFEz52rI 2YwTXcEn7WdHYRPeIAPhDftyCzHgq5269MTduPxIN9Sgye9OwN55y7yquUxqxCc9b2K0iN fdOW5RM9KnqjftM94NvVk+amo87IVBCX76bopB0BAs927LcYz9+OcmHi9I16N4O/9v8JUw JOiVxkNdnXsAZ2w1jGpqo4UBPiXh6vS4OrDPT7OTfGI5X/z4jeBjePm+pgbR+Wk80Bruo6 SWQMTq1ScONDA36Jb1vxNoo7R7PZONx57WD4YLSap9IHkd8EUKPpaDgqvEa/aA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=oXJYGOr3; 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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735541476; a=rsa-sha256; cv=none; b=BtP7BYfN3T5Tia7XnVuW7/VyNo/FlXQKdEC+OjNvyTT1p/8ye5BFvh/FG14sBNZcRkC15Q qWYeZVVPIgajMnvW+W0ZgXN2+8m7Ave1i8UYkO7rtJ5GMO87UesICHr8szSbSk44IzYD1w 7oFyG1+tQ39ToqH0bDnlHsoFcwNOf/OdJpB6haxluxuGVCEdMQpFHFaoysem/wgM4E7yat KTvHrbNlwbN/sa11Cc0DyrCjDD33nDnP0AZHfkOWBISJmSJnzQYWDL3guwIqcyIthomuE4 Z/Kcgg2MANTpDQ01U6Ykwf6ciP/g6rC9Se0uEd8UpChekHx7Uov5Xgyj0jbpIg== 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 29DBA18BFC for ; Mon, 30 Dec 2024 07:51:16 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tS9cF-0003gP-QZ; Mon, 30 Dec 2024 01:51:03 -0500 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 1tS9cE-0003gE-LN for guix-patches@gnu.org; Mon, 30 Dec 2024 01:51:02 -0500 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 1tS9cE-000231-Cn for guix-patches@gnu.org; Mon, 30 Dec 2024 01:51:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=KkrmbdYje9RTpYICr7/SM7OzrsbOZsmGPv/5GviQe7E=; b=oXJYGOr3P3tvHkMItwoYLYBX8wyPUiVQBg3csdWiTCFX2qEZu4v086OdYIbSi7FhB1fp6ySS2MZ5acES1kw4OmkreEjgFDi8DXaOg5dHKvmEiaDUwuXonDZGteLDGAagSCbeCOS/GmS4Tw54fXVRTt6vQcUCR2Ka5ASM6R6e1bpz2LVDNuTwypas6A8WL2mHVc9MzA7Mu1X3hr22nGJNy/1vcJsun0xGCLnsbo7MgcsS1HimUQPsI/4LN8gEnp3VicfbHNkc3iTDezNKiuy9BpkKdNM9OmWz/TPXlDcXX01cejWmcK7GDv6UxS/UEXzdoKna/4/EDG2esA74XKNGvw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tS9cE-0006li-8M for guix-patches@gnu.org; Mon, 30 Dec 2024 01:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75159] [PATCH v1 3/5] gnu: Add corectrl. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Dec 2024 06:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75159 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ashvith Shetty Cc: 75159@debbugs.gnu.org Received: via spool by 75159-submit@debbugs.gnu.org id=B75159.173554143025958 (code B ref 75159); Mon, 30 Dec 2024 06:51:02 +0000 Received: (at 75159) by debbugs.gnu.org; 30 Dec 2024 06:50:30 +0000 Received: from localhost ([127.0.0.1]:57115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tS9bh-0006kc-7h for submit@debbugs.gnu.org; Mon, 30 Dec 2024 01:50:29 -0500 Received: from smtp81.cstnet.cn ([159.226.251.81]:39924 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tS9bX-0006go-Ss for 75159@debbugs.gnu.org; Mon, 30 Dec 2024 01:50:28 -0500 Received: from m (unknown [107.174.64.25]) by APP-03 (Coremail) with SMTP id rQCowAAH7jCcQnJnqKi9BA--.25651S2; Mon, 30 Dec 2024 14:50:08 +0800 (CST) From: Zheng Junjie In-Reply-To: <20241228153020.20233-4-ashvith@noreply.codeberg.org> (Ashvith Shetty's message of "Sat, 28 Dec 2024 21:00:05 +0530") References: <20241228153020.20233-1-ashvith@noreply.codeberg.org> <20241228153020.20233-4-ashvith@noreply.codeberg.org> User-Agent: mu4e 1.12.7; emacs 30.0.92 Date: Mon, 30 Dec 2024 14:50:00 +0800 Message-ID: <87cyh9u0kn.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: rQCowAAH7jCcQnJnqKi9BA--.25651S2 X-Coremail-Antispam: 1UD129KBjvJXoW3Xr1ktFy8ZF43JrWfCr48Zwb_yoWxGFykp3 4fur13Cr48Grn8Jws2qwnFga13u392qFWjg3ZrW34Skw45KFW0yrWxKa15ZF1fCr1rJw47 Wan2gryDJFyUZrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvmb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I 8E87Iv6xkF7I0E14v26rxl6s0DM2vj62AExVA0xI801c8C04v26x02cVCv0xWle2I262IY c4CY6c8Ij28IcVAaY2xG8wASzI0EjI02j7AqF2xKxwAqx4xG64xvF2IEw4CE5I8CrVC2j2 WlYx0E2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkE bVWUJVW8JwACjcxG0xvEwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJV W8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF 1VAFwI0_Jrv_JF1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6x IIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvE x4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnU UI43ZEXa7IUeqFAtUUUUU== X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -8.97 X-Spam-Score: -8.97 X-Migadu-Queue-Id: 29DBA18BFC X-TUID: vwfI/vvcJNBe --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ashvith Shetty writes: > * gnu/packages/pciutils.scm (corectrl): New variable. > * gnu/packages/patches/corectrl-polkit-install-dir.patch: > New file. > > Change-Id: I726c6cbfb6530abd8284f36e10a1e1f7a0fc4661 > --- > .../patches/corectrl-polkit-install-dir.patch | 21 +++++ > gnu/packages/pciutils.scm | 83 ++++++++++++++++++- > 2 files changed, 103 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/corectrl-polkit-install-dir.patch > > diff --git a/gnu/packages/patches/corectrl-polkit-install-dir.patch b/gnu= /packages/patches/corectrl-polkit-install-dir.patch you forget add this patch to gnu/local.mk(dist_patch_DATA). You can also mention a pr upstream that allows custom POLKIT_POLICY_INSTALL_DIR. > new file mode 100644 > index 0000000000..586e096cf4 > --- /dev/null > +++ b/gnu/packages/patches/corectrl-polkit-install-dir.patch > @@ -0,0 +1,21 @@ > +diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt > +index c262086..523ea97 100644 > +--- a/src/helper/CMakeLists.txt > ++++ b/src/helper/CMakeLists.txt > +@@ -26,15 +26,7 @@ message("D-Bus files will be installed into ${DBUS_DA= TADIR_PREFIX_DIR}/dbus-1") > +=20 > + # Find polkit > + pkg_check_modules(POLKIT REQUIRED polkit-gobject-1) > +-execute_process( > +- COMMAND pkg-config --variable=3Dpolicydir polkit-gobject-1 > +- RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT > +- OUTPUT_VARIABLE POLKIT_POLICY_INSTALL_DIR > +- OUTPUT_STRIP_TRAILING_WHITESPACE > +-) > +-if(NOT POLKIT_POLICY_INSTALL_DIR_RESULT EQUAL "0") > +- message(FATAL_ERROR "Failed to retrieve Polkit `policydir` variable u= sing pkg-config") > +-endif() > ++option(POLKIT_POLICY_INSTALL_DIR "Polkit policy directory") > +=20 > + list(APPEND HELPER_COMPILE_DEFINITIONS > + SPDLOG_ACTIVE_LEVEL=3DSPDLOG_LEVEL_TRACE > diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm > index 08f1634113..1ae568a8eb 100644 > --- a/gnu/packages/pciutils.scm > +++ b/gnu/packages/pciutils.scm > @@ -6,6 +6,7 @@ > ;;; Copyright =C2=A9 2020, 2023, 2024 Janneke Nieuwenhuizen > ;;; Copyright =C2=A9 2022 Brendan Tildesley > ;;; Copyright =C2=A9 2022 Marius Bakke > +;;; Copyright =C2=A9 2024 Ashvith Shetty > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -30,11 +31,23 @@ (define-module (gnu packages pciutils) > #:use-module (guix utils) > #:use-module (guix git-download) > #:use-module (guix build-system gnu) > + #:use-module (guix build-system qt) > #:use-module (gnu packages) > + #:use-module (gnu packages base) > + #:use-module (gnu packages check) > #:use-module (gnu packages compression) > + #:use-module (gnu packages crypto) > + #:use-module (gnu packages gcc) > + #:use-module (gnu packages gl) > + #:use-module (gnu packages logging) > + #:use-module (gnu packages maths) > + #:use-module (gnu packages polkit) > #:use-module (gnu packages pkg-config) > + #:use-module (gnu packages glib) > #:use-module (gnu packages linux) > - #:use-module (gnu packages base)) > + #:use-module (gnu packages qt) > + #:use-module (gnu packages vulkan) > + #:use-module (gnu packages xml)) >=20=20 > (define-public hwdata > (package > @@ -173,3 +186,71 @@ (define-public pciutils > of operating systems. This includes the @command{lspci} and @command{se= tpci} > commands.") > (license license:gpl2+))) > + > +;; corectrl also requires the helper service. > +;; See corectrl-helper-service-type. > +;; > +;; Please read the setup instructions from: > +;; https://gitlab.com/corectrl/corectrl/-/wikis/Installation > +;; and > +;; https://gitlab.com/corectrl/corectrl/-/wikis/Setup > +;; > +;; corectrl also requires CONFIG_NETLINK_DIAG to be set to > +;; either 'y' or 'm' - 'm' is the default in Guix. In that case,=20 > +;; the kernel module has to be loaded. > +;; > +;; To allow rootless corectrl, add user to the "corectrl" group. > + > +(define-public corectrl i think this package should go to gnu/packages/admin.scm, because this package is "control with ease your computer hardware using application profiles". > + (package > + (name "corectrl") > + (version "1.4.3") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://gitlab.com/corectrl/corectrl") > + (commit (string-append "v" version)))) > + (sha256 > + (base32 "0qpc04xxzv4jbqqlraqriipix4ph7bm1hfiry807jjp668i9n25d")) > + (file-name (git-file-name name version)) > + (patches (search-patches "corectrl-polkit-install-dir.patch")))) > + (build-system qt-build-system) > + (arguments > + (list > + #:qtbase qtbase-5 > + #:tests? #t please remove it, tests should not be forced. > + #:configure-flags #~(list "-DINSTALL_DBUS_FILES_IN_PREFIX=3Dtrue" > + (string-append "-DPOLKIT_POLICY_INSTALL_= DIR=3D" > + #$output > + "/share/polkit-1/actions") > + (string-append "-DWITH_PCI_IDS_PATH=3D" > + (search-input-file > + %build-inputs > + "/share/hwdata/pci.ids")= )))) please not use %build-inputs. It's an outdated thing. use (string-append "-DWITH_PCI_IDS_PATH=3D" #$(this-package-input "hwdata") "/share/hwdata/pci.ids") > + (native-inputs (list pkg-config gcc-13)) please add comments for why need gcc-13. > + (propagated-inputs (list mesa-utils vulkan-tools util-linux)) why propagated them? It's easy to conflict in profiles, maybe should use wr= ap-program. > + (inputs (list dbus > + botan > + catch2-3 > + hwdata > + polkit > + procps > + pugixml > + qtcharts-5 > + qtdeclarative-5 > + qtquickcontrols2-5 > + qtsvg-5 > + qttools-5 qttools-5 should go to native-inputs. > + quazip > + spdlog > + trompeloeil > + units > + zlib)) > + (home-page "https://gitlab.com/corectrl/corectrl") > + (synopsis "Profile based system control utility") > + (description > + "CoreCtrl is a Free and Open Source GNU/Linux application that allo= ws=20 > +you to control with ease your computer hardware using application profil= es.=20 > +It aims to be flexible, comfortable and accessible to regular users.") > + (license (list license:gpl3)))) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmdyQpgACgkQO1qpk+Gi 3/BHZQ//S6Y4vP2HRYezzMaG7Yx8SOq5v4Q1dYsx4zimYweHUNDFdNTSVF3bkpV2 qGvHYsHhxOdE7kM/gg4FD8aQblBp8jruItk2QK2b56ixcS8Da3GQGuy5Rk5y4rBQ /3Ymrb8Rl4i0anqyDhv2TmIkNwUcIzMyySyu6SG0kQXdW5XNXexxzEHlr59DHGdS 3OFCt7luMQjwiQWNUCnlTtk9GKwWM5FEen2t2w0TgrMTAAfxN59oDsozQzIm4hLa F5AOLdxnvPbdPeMhUvQ1gOng/0eEtHBTK3OIugBiX/z7wwrCJ1fqjFLxxvuGt96s jVz0u8kHkaqGetWuJ7skLgJhpp14CWAHeAAIxeG1mCfQKuW1rgfkETzI2TSqBmBc toLNc03XEKV1FwHEuMbPLnlMdFHvdsl3ZzzriArQl9KHYvYXQsyqRZL97N0AkePW Hzwzeo2ExTV4Yvn9/t7r/rHQgl7Q24AH+QJJ7K1wlxg/+0Ufqu03UJ9iPlbOU/ih zafr/w1+GW+HGASnXY/g70KkDoCUXRQlPOg4XcGyJRyfcJ4BVCIyjp/ZJ1xJjmGF UsFz5hMSVCDQylQQuzdMY829iFdbiYleoDLg6KoYy/S2UccEDeVA74voqZN8ftP+ deXrtnRLwqLZzIw/5bNX0tcB5CVZCMfALCisHOiWxE9QWslwsE0= =23Pw -----END PGP SIGNATURE----- --=-=-=--