From patchwork Sat Dec 28 10:44:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashvith Shetty X-Patchwork-Id: 35891 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 3DEAD27BBEB; Sat, 28 Dec 2024 10:47:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 F367727BBE2 for ; Sat, 28 Dec 2024 10:47:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRULv-0000pF-GH; Sat, 28 Dec 2024 05:47:27 -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 1tRULX-0000lG-IH for guix-patches@gnu.org; Sat, 28 Dec 2024 05:47:08 -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 1tRULV-00006a-P7 for guix-patches@gnu.org; Sat, 28 Dec 2024 05:47: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:References:In-Reply-To:Date:From:To:Subject; bh=d1zFBlMbx1yN0TZ+lKIKYdRGRtpZ1YIPEpxzpiRW/Y4=; b=vUhU+dcL+DzjdegIo8xaeyJx3sP7LDWT7KU3rvjk+XY+JjVMnyj4XwvNhy+kC9w2eQORfQKGPK49yAeV3fKWOzlxdMnxe1mV/m2fP+chkGzUofLmuhgraRh1zbXLUnQFbPJUBU+w+ElH3N38YOKkVYrrP0U+etVzXln2MI0B9Aht0q1mJ0nLEvIYRXFALVHI2beJDei7dcKZmT9DDLnOGMi8k4H07EtYZjEfKSFEV43GSC341rzY4wJiK8+0Ke3bG3jXJizuqTwbO8smEHOmQNCh5FwfJSD3lFVD422uOMS8tRty2J56MsVI0Bd01XOYy5dw6dXGW+VTR68QGRzCFw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRULV-0005QB-Ir for guix-patches@gnu.org; Sat, 28 Dec 2024 05:47:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75159] [PATCH v0 2/4] gnu: Add trompeloeil. Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Dec 2024 10:47:01 +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: 75159@debbugs.gnu.org Cc: Ashvith Shetty Received: via spool by 75159-submit@debbugs.gnu.org id=B75159.173538276920733 (code B ref 75159); Sat, 28 Dec 2024 10:47:01 +0000 Received: (at 75159) by debbugs.gnu.org; 28 Dec 2024 10:46:09 +0000 Received: from localhost ([127.0.0.1]:48874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUKf-0005OL-2g for submit@debbugs.gnu.org; Sat, 28 Dec 2024 05:46:09 -0500 Received: from mail-pl1-f176.google.com ([209.85.214.176]:53476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUKc-0005OD-NH for 75159@debbugs.gnu.org; Sat, 28 Dec 2024 05:46:08 -0500 Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-215770613dbso71513825ad.2 for <75159@debbugs.gnu.org>; Sat, 28 Dec 2024 02:46:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735382706; x=1735987506; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d1zFBlMbx1yN0TZ+lKIKYdRGRtpZ1YIPEpxzpiRW/Y4=; b=azbNnWtVaANAwVi7cly7xCQd1KPKJtLIqE3l93VBlIinH8AvYpBRZ9WIdQ56wkgONd kDx+gH/9UbZmWafYtaPJHHgpUezYkcRqyUBPVQSoJCHpH/f3r9lQUI6Kf1I35IBHMG9D 9H/ZIdl+bUHGXraDZv3sPOweW6kPnhR0zj4wdQ1XQafuXJ0nwFPE54dl62iEenxvpnuZ ZjaUKhVIN/6DLaSwFHMPRc1fUAEMyJZutUAQcC8b72ShBNCAfqIIrMPsliO3cMSrMazO +tODQqkiufm05l/xTiTBeNKzpzrRmyxW+emgtkSk6XbkVVunkODUiSf8Jbwv3JXjYFLm 55fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735382706; x=1735987506; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d1zFBlMbx1yN0TZ+lKIKYdRGRtpZ1YIPEpxzpiRW/Y4=; b=ibnIDOlMbGCaaaeXG3vEE9v9bCLRtKsE6Ah8H2R2KX49TSSfmedMgWbdB1Xmgmux6r Jn8j/B3nxsegpcRZzOz8dyOMnDkKeEIKDYjBujkuLLY6/w4ltLZQinQdor8Ltf9a502f 9FroswqHBerUJOin6grVn7S2X/JzPCI/BWP+iLRbb/eutSiCff+wASld0th39afZLTrz m8bv3xePwEhDzuhS9PwAZVOl6TJZxtsKBOj3RgY/QVUuuQ/py5D/489ccmlWaGoBFo2N vP3tALW6d4FgC8gUB+9nBB6YxmmXg+1WKwL1GMRbFmv2kOPiUOh+vMp6mQigfO/p0DzR 6ttA== X-Gm-Message-State: AOJu0YxLthnERPj1/uFLNS4rP2l7sGpVq8sSF/TrtfOPjXAgdGOk3bNu uD5cg5kTJQFmcnFEy1dtChP63sW+Ih2pR2wRAh367EJjntT8uu/l0JT7H0s/ X-Gm-Gg: ASbGncuypbrZ/Z9qGTYbITqKKuiPRqXM4T7vy52jr+L5vxnS5nGeD+hgvXGaItz9yNL bOHPTj0v3AgQZUuHMw1G7+9og+ZsZ4a13T9cNUu93GvG1GjltudxPP6nmemV9qLvbysXJUOFLie YxkFG/HyQv1xMiwhPwCmqHX7yjYo6osUGs5hqgb3KUqBLeLBT6r1Ae0IyOZkvxIuiYELYySWc2e qnHtfj5OLUcrza1WjnDfEEivyBpvNziJFGds7Bcn3j5lsGD3aNreECh+EXgU/pgutECa1eSUre9 dLerpKj1YA== X-Google-Smtp-Source: AGHT+IFUbtAOMkNDSlBiAvUEnzGQY9hK+QVLW6uy3xGESnwVLZAD90XsYb01ydoCisJCH57gI4HFGQ== X-Received: by 2002:a17:903:98e:b0:215:9bc2:42ec with SMTP id d9443c01a7336-219e6f24eecmr421655705ad.47.1735382705675; Sat, 28 Dec 2024 02:45:05 -0800 (PST) Received: from localhost.localdomain ([2401:4900:8813:846d:3ba6:3078:1833:5938]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-21a267dc09bsm18645425ad.169.2024.12.28.02.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Dec 2024 02:45:05 -0800 (PST) From: Ashvith Shetty X-Google-Original-From: Ashvith Shetty Date: Sat, 28 Dec 2024 16:14:04 +0530 Message-ID: <20241228104424.4001-2-ashvith@noreply.codeberg.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241228104424.4001-1-ashvith@noreply.codeberg.org> References: <20241228104424.4001-1-ashvith@noreply.codeberg.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/check.scm (trompeloeil): New variable. Change-Id: I44d83ff4230a1c836bedc124acb1a40742f17021 --- gnu/packages/check.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index dd32800870..6afd7fefb5 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -3805,6 +3805,29 @@ (define-public toml-test tests. The output format is JSON.") (license license:expat))) +(define-public trompeloeil + (package + (name "trompeloeil") + (version "49") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rollbear/trompeloeil") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m4bfzcj033qfk3sihbikrhk9krsdbsqk79nsambnsnqqcgc2903")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f)) + (home-page "https://github.com/rollbear/trompeloeil") + (synopsis "Header only C++14 mocking framework") + (description + "A thread-safe header-only mocking framework for C++11/14 using the Boost Software License 1.0") + (license license:boost1.0))) + (define-public unittest-cpp (package (name "unittest-cpp") From patchwork Sat Dec 28 10:44:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashvith Shetty X-Patchwork-Id: 35892 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 82F3727BBEB; Sat, 28 Dec 2024 10:47:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 DB6CE27BBE2 for ; Sat, 28 Dec 2024 10:47:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRUM1-0000tD-0S; Sat, 28 Dec 2024 05:47:33 -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 1tRULW-0000lE-Vn for guix-patches@gnu.org; Sat, 28 Dec 2024 05:47:08 -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 1tRULW-00006b-CV for guix-patches@gnu.org; Sat, 28 Dec 2024 05:47: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:References:In-Reply-To:Date:From:To:Subject; bh=bfCSkjmnJoYLR44qO8PR4lmW+aukWsEgPIgxya+3CaE=; b=dt4F/q14GFtTLAM+ViDEogC9bQWIFCSQR9/Vy3Oo2cQw4XdCR4ePtDo1SS6AL9It1FUe00kI1/mIsODb8W0SJeHOw5dsJLXVRuK2lW0pTToa9gnM3BLFuNvN0ElH3nyA0o/90V9UTkpZWeHARmT48buTa1SxFznGwNFPDfn/pP+wQY45oVcdq/YBNwSfNasVvXqU0OO6NwPwXvEIuxMksNC5zLQIvNxjiHspd+/Ec4KCB2dZBKI2agyjW+19LCKXlw9MDFjPjfr8Nrkce+kkyvi4fqRfWo/sBi3jHOqWjbpVohNz+znEHFedTYvuEKGzUz4iROWArT1/G2gUI44HnQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRULW-0005QI-3o for guix-patches@gnu.org; Sat, 28 Dec 2024 05:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75159] [PATCH v0 3/4] gnu: Add corectrl. Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Dec 2024 10:47: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: 75159@debbugs.gnu.org Cc: Ashvith Shetty Received: via spool by 75159-submit@debbugs.gnu.org id=B75159.173538278820770 (code B ref 75159); Sat, 28 Dec 2024 10:47:02 +0000 Received: (at 75159) by debbugs.gnu.org; 28 Dec 2024 10:46:28 +0000 Received: from localhost ([127.0.0.1]:48877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUKx-0005Ot-EE for submit@debbugs.gnu.org; Sat, 28 Dec 2024 05:46:27 -0500 Received: from mail-pj1-f48.google.com ([209.85.216.48]:60786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRUKu-0005Ol-MW for 75159@debbugs.gnu.org; Sat, 28 Dec 2024 05:46:25 -0500 Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2ef748105deso7683878a91.1 for <75159@debbugs.gnu.org>; Sat, 28 Dec 2024 02:46:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735382724; x=1735987524; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bfCSkjmnJoYLR44qO8PR4lmW+aukWsEgPIgxya+3CaE=; b=T5fKVwuNxGkTQ5rpwIObbQ7/uKvScXpWrQeovnlzHc6z8wTUT6YZhNLJfo4nJv7Ttu Xy+zavkvkoLY3Dxf6ms+lJ8seWqSboKi2kZK39DRpMm0Ubfd9LTKY+xpn+ykjV/kFHsM sfwjTjNbh5RrqDgLD0HWPrzmhh6Q7NKAHvjiHLkb3TylBpnKfCGN4Lrh9sRWmRXDUeXV eujBNW07S1DpHytspaGDpcFeZAQG9cplcZqpmS5yky/9sDOaTwzrcyRA0y5h5XZuqL5f 5JHJv09SAIUCkjqvuRv4qb9ES4rCyXki40CsQapc48Q4g6iTMoRuZ/UTC1ouW4yUOGQM SQJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735382724; x=1735987524; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bfCSkjmnJoYLR44qO8PR4lmW+aukWsEgPIgxya+3CaE=; b=r5L0yk+8jr/HUpY8zvf0xk9CqB9VbLaaL0/J8m8tdRNn0z8wdwBQ3x5+gd2lsfuwIc uK74Z3LgKaDJNKY+mL4yEnQlB8prQOnydHCSPo+w3AxJECAQind0OIf5GqfaUj+ostHD utBmUq0KdyqM1q0fHlVDW/vtw4d746Oscgo4OmMdoaK13DzedbKzHXf3lYcYnMeYwHIQ qIWq8RPst4LmHrWh6I5MdEFDOWKo4QVKYl9izYJ6y7B9U6z80mIjqRld5+Ec8qsHogxm WC0kfYfFSK5d80HL2GgMkjiSLGXS2SLPIpGliuvVPx8yGfVIYqZz8nWZePq4R1puVTa2 zp3A== X-Gm-Message-State: AOJu0YyN98U8n35PS4WrAyrJpWGM9V5biE1R6CSiR0gCiVgJTxL/EjBw 24ZMsIEvw2w+8VTx1TGIBJp9bH7V9Uw/ggMomXw81NdIJjtf7ozIOgJlbNGH X-Gm-Gg: ASbGncstqlElKs6Qu0OfDodj0j65Bs/MiLy17HGDHLVFDJxrnP/4QlYElF52EEGslCn l0YrI+nfzkiC8Sj35vYfZL4inuhFqxXenn9XWAxAcE2DQ5/aTu/RH2AN6v4doXgXftk4AuNzawf 5FmQrmItYuMJ0pZoi3olW5aU03bb952XOacueR/fERBvWQEiqiEG9KjkTGjkMsZ1s1fwKp5deLd 0Fr+KC+aoEq6OTKiQNkvF9QYZ4TpCh3rS4C9dzuPn6SiGCZLQm+DaxGudZLr1ZAqnl+ejcBS2vv jyAwDD+Fqg== X-Google-Smtp-Source: AGHT+IE4gl9Hee1lz/Uxk+p/JCAKA1XJ1iEj7IfKVzmIkzsxWG/LWUdzcAsw2cfXngceOw4wicymVw== X-Received: by 2002:a17:90b:2dc2:b0:2ee:acb4:fecd with SMTP id 98e67ed59e1d1-2f452e044damr43996398a91.9.1735382723620; Sat, 28 Dec 2024 02:45:23 -0800 (PST) Received: from localhost.localdomain ([2401:4900:8813:846d:3ba6:3078:1833:5938]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-21a267dc09bsm18645425ad.169.2024.12.28.02.45.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Dec 2024 02:45:23 -0800 (PST) From: Ashvith Shetty X-Google-Original-From: Ashvith Shetty Date: Sat, 28 Dec 2024 16:14:05 +0530 Message-ID: <20241228104424.4001-3-ashvith@noreply.codeberg.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241228104424.4001-1-ashvith@noreply.codeberg.org> References: <20241228104424.4001-1-ashvith@noreply.codeberg.org> MIME-Version: 1.0 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+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 (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 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_DATADIR_PREFIX_DIR}/dbus-1") + + # Find polkit + pkg_check_modules(POLKIT REQUIRED polkit-gobject-1) +-execute_process( +- COMMAND pkg-config --variable=policydir 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 using pkg-config") +-endif() ++option(POLKIT_POLICY_INSTALL_DIR "Polkit policy directory") + + list(APPEND HELPER_COMPILE_DEFINITIONS + SPDLOG_ACTIVE_LEVEL=SPDLOG_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 © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2022 Brendan Tildesley ;;; Copyright © 2022 Marius Bakke +;;; Copyright © 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)) (define-public hwdata (package @@ -173,3 +186,71 @@ (define-public pciutils of operating systems. This includes the @command{lspci} and @command{setpci} 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, +;; the kernel module has to be loaded. +;; +;; To allow rootless corectrl, add user to the "corectrl" group. + +(define-public corectrl + (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 + #:configure-flags #~(list "-DINSTALL_DBUS_FILES_IN_PREFIX=true" + (string-append "-DPOLKIT_POLICY_INSTALL_DIR=" + #$output + "/share/polkit-1/actions") + (string-append "-DWITH_PCI_IDS_PATH=" + (search-input-file + %build-inputs + "/share/hwdata/pci.ids"))))) + (native-inputs (list pkg-config gcc-13)) + (propagated-inputs (list mesa-utils vulkan-tools util-linux)) + (inputs (list dbus + botan + catch2-3 + hwdata + polkit + procps + pugixml + qtcharts-5 + qtdeclarative-5 + qtquickcontrols2-5 + qtsvg-5 + qttools-5 + 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 allows +you to control with ease your computer hardware using application profiles. +It aims to be flexible, comfortable and accessible to regular users.") + (license (list license:gpl3)))) From patchwork Sat Dec 28 10:44:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashvith Shetty X-Patchwork-Id: 35890 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 7600D27BBEB; Sat, 28 Dec 2024 10:47:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 C6A5427BBE2 for ; Sat, 28 Dec 2024 10:47:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tRULo-0000oM-Fy; Sat, 28 Dec 2024 05:47:22 -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 1tRULY-0000lI-6o for guix-patches@gnu.org; Sat, 28 Dec 2024 05:47:10 -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 1tRULW-00006n-Qn for guix-patches@gnu.org; Sat, 28 Dec 2024 05:47:03 -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:References:In-Reply-To:Date:From:To:Subject; bh=LoUqcOMCDx+A0CxzBKpc6aVQ4qiaIiWEmb0mXOlNkpc=; b=kW0jvQDD6RNtF6SogvnJo1F6yCH9aUz+V71gYeVZGQPUeV/JiQzpJiLI+tLRF0FxLdu+KROtkx8YupFvxyfiPkceFFLw1R1xtSxFy68BUCXZ/fOABQ+txb0TZiwLi1GOTtUbD9/W0qQAp5cIDovOv88jUeObPDSLmtVqlA3Da4lf4gVhb2BJFf4pPVKoqXasbLTte1qUYdsNULTF509lBWCLpoPutfa7Il0DRQltM1kxp/TNnM256PedEQ8TyObc4OYy+tdRBisrrtFumEPwoCnUykVxgmd0wsvZ4S6XJV3/OnfXPIevc8Rex7KwDKrXfjdYjyvVHePgQWOxjkYGZQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tRULW-0005QQ-L3 for guix-patches@gnu.org; Sat, 28 Dec 2024 05:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75159] [PATCH v0 4/4] services: Add corectrl-helper-service-type. Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Dec 2024 10:47: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: 75159@debbugs.gnu.org Cc: Ashvith Shetty Received: via spool by 75159-submit@debbugs.gnu.org id=B75159.173538281120822 (code B ref 75159); Sat, 28 Dec 2024 10:47:02 +0000 Received: (at 75159) by debbugs.gnu.org; 28 Dec 2024 10:46:51 +0000 Received: from localhost ([127.0.0.1]:48880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRULL-0005Pm-2g for submit@debbugs.gnu.org; Sat, 28 Dec 2024 05:46:51 -0500 Received: from mail-pl1-f169.google.com ([209.85.214.169]:61606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tRULJ-0005Pe-E5 for 75159@debbugs.gnu.org; Sat, 28 Dec 2024 05:46:50 -0500 Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2166022c5caso86761125ad.2 for <75159@debbugs.gnu.org>; Sat, 28 Dec 2024 02:46:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735382748; x=1735987548; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LoUqcOMCDx+A0CxzBKpc6aVQ4qiaIiWEmb0mXOlNkpc=; b=TYVq3AQj29DWdOUhrA+PVtx/kQ+hpbfDZorzhhP9BopjuvwxIN0/oSUUGCwCHh58Mr rXlLqdLeAyXRIxW5nJX6/lAExWJEgs+1m7qQUy6Jy3vHUI21LiWGkWB0nf2NFNSigYwJ ra2obn0/9Oy9waiiyckFNL7xvOlAgldx/EoQOY2UODt360rIGW3jLDfIlEsoYwyyR0UT kN/605Gv6qSwgOnCL9Nf1ir4w5T1VG09aK1/80McDmD36wcxaK78CVDLSh/6LpS4rEgr qudM6SbD6yj2n33UMVmM+F6VN66kPxw3tqwxwBjQIRboqg1xrSQGytC8bW3zOW/MXh1c 3BGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735382748; x=1735987548; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LoUqcOMCDx+A0CxzBKpc6aVQ4qiaIiWEmb0mXOlNkpc=; b=TZ9Ki5ptbFnrkFO4mdXbKH76yFt08reYCrD/Kj4+5aYW9I7po0a+zYBn2ZSUGfKmnR d3DSCdnxv58lWAmLWyeUa4hZUF4euQuVnZ7ZbfTDOXm1mUNttooGLuqPWv6x3jAC7SaQ YqNXa81/fKQyEbaELQbnba4N+Oum7HySCsMENBzIIqzSJqM152djFQvurHRHJyUYGmTI EMSwfvYJhYowNjfEmquJ2PdPoRgph98SO+UQZGsAhx7wtUmh69/6ZIF/zpFDwufOyb9x Iktjpm/PU63KGJl8FAXVEcp5TYho8R++XS6XwwFksjxHW54R874RtzLx6/rMaAxjtjfa LumA== X-Gm-Message-State: AOJu0Yz238WsKHGU7UUgHglZ6L+157yhqrPXmMh7BFxH/EqOlSo6+VBG DjeFgtUmSMcPBTZLmJI3icQ89w9b8kXIYjMX+XK78i8RxsY//Sc/Fb4gIBi9 X-Gm-Gg: ASbGncs4hZUbdV2qxnZhBCfaiqTQViyeSlOmXlJuXRpGNdu+oCdfZ33Q6tO2ha7eP0g HGztDHrsUhv8/JxaiNUX0gNQ7t3fAdKVA9dFLHweanzoDBhCOfeiq+SdSd10aiItzAe+S+emOuy 0lZSG3v9Sn0ZVq3XOyiXDxLMDw2/CLdVKCtNJ0hlkKktAmcOghiwDB0PcsmmHR1LRka562RRGGv iSr4nQCrN8UhvAFkXRdb6JC1GyMMgUv1AhP0iE8XUT43ekJkohz6vRE0saRz9tIKEhdiEFR1I/A t5YmzV6oPA== X-Google-Smtp-Source: AGHT+IE2iQfNieSrVJ28OnX30uYj5fgyMVKN0YGcngEZwYr/+MQhESNGY3tTILAijfXfqs+662isTg== X-Received: by 2002:a17:903:2310:b0:215:a190:ba10 with SMTP id d9443c01a7336-219e6ea23d7mr384952495ad.15.1735382748490; Sat, 28 Dec 2024 02:45:48 -0800 (PST) Received: from localhost.localdomain ([2401:4900:8813:846d:3ba6:3078:1833:5938]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-21a267dc09bsm18645425ad.169.2024.12.28.02.45.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Dec 2024 02:45:48 -0800 (PST) From: Ashvith Shetty X-Google-Original-From: Ashvith Shetty Date: Sat, 28 Dec 2024 16:14:06 +0530 Message-ID: <20241228104424.4001-4-ashvith@noreply.codeberg.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241228104424.4001-1-ashvith@noreply.codeberg.org> References: <20241228104424.4001-1-ashvith@noreply.codeberg.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/pciutils.scm: New file. (corectrl-helper-service-type): new variable. * gnu/local.mk: Add them. * doc/guix.texi (Miscellaneous Services): Document it. Change-Id: I1dbeb927100a9a488909ff1950ec7e50d3797c29 --- doc/guix.texi | 15 ++++++++++++++ gnu/local.mk | 1 + gnu/services/pciutils.scm | 43 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 gnu/services/pciutils.scm diff --git a/doc/guix.texi b/doc/guix.texi index da4d2f5ebc..a36d3cc0f1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -42550,6 +42550,21 @@ empty list means that no type is specified. @end deftp +@cindex corectrl-helper +@subsubheading CoreCtrl Helper Service + +The @code{(gnu services pciutils)} module provides a DBus service for +interacting with system hardware resources, such as CPU and GPU, +enabling advanced control and management through the CoreCtrl application. + +@defvar corectrl-helper-service-type +The service type for @command{corectrl}, which provides a helper service. + +@lisp +(service corectrl-helper-service-type) +@end lisp +@end defvar + @c %end of fragment @node Privileged Programs diff --git a/gnu/local.mk b/gnu/local.mk index 84160f407a..5ebdb72624 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -751,6 +751,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/nix.scm \ %D%/services/nfs.scm \ %D%/services/pam-mount.scm \ + %D%/services/pciutils.scm \ %D%/services/science.scm \ %D%/services/security.scm \ %D%/services/security-token.scm \ diff --git a/gnu/services/pciutils.scm b/gnu/services/pciutils.scm new file mode 100644 index 0000000000..cfd310b584 --- /dev/null +++ b/gnu/services/pciutils.scm @@ -0,0 +1,43 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2024 Ashvith Shetty +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu services pciutils) + #:use-module (gnu packages pciutils) + #:use-module (gnu services) + #:use-module (gnu services configuration) + #:use-module (gnu services dbus) + #:use-module (guix gexp) + #:export (corectrl-helper-configuration + corectrl-helper-configuration? + corectrl-helper-service-type)) + +(define-configuration corectrl-helper-configuration + (corectrl (file-like corectrl) "The corectrl package")) + +(define (corectrl-helper-dbus-service config) + (list (corectrl-helper-configuration-corectrl config))) + +(define corectrl-helper-service-type + (service-type (name 'corectrl-helper) + (extensions (list (service-extension dbus-root-service-type + corectrl-helper-dbus-service) + (service-extension polkit-service-type + corectrl-helper-dbus-service))) + (default-value (corectrl-helper-configuration)) + ;; TODO: Improve the description. + (description "Run corectrl-helper, an essential service for the corectrl application.")))