From patchwork Tue Dec 31 18:09:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashvith Shetty X-Patchwork-Id: 36256 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 96DC327BBE2; Tue, 31 Dec 2024 18:13:36 +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 9AD7827BBEA for ; Tue, 31 Dec 2024 18:13:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSgjo-0002KT-Ul; Tue, 31 Dec 2024 13:13:04 -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 1tSgjm-0002Jg-EY for guix-patches@gnu.org; Tue, 31 Dec 2024 13:13: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 1tSgjm-0004x0-5V for guix-patches@gnu.org; Tue, 31 Dec 2024 13:13: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=5IJa0Kp2bNgA2fQs73yzQnX35hHUPsWC5eNwvj2yuUI=; b=RRRfu4cJt9Oh6/nEsqWwtaSNy6RNccultMvtTOeTLPpkP7SbfmBTVyas5PSg7uvrGu/b5WOhh50/KYbW+NVwpiCg9Tusk1vEIShuHKzMDg8iZS534kmEhGtWpIQ21nP3tekNp0yb8iagn9y7dVR91vdLf2ib0mgJ6iP/tBkc5CojuK8ZsGATOeEHIGrYY0zptfb+ZzAns/FA78dmWnMhMbC2qS4YwKQDbc2530euGmSfj+Y8U1EhECZaJT94GUJYMVMtHZPt5la91FDqm+ryhqucULvtfNY2u7ShH5xYC2ezAr7ryhfAQoP46njMprFWCsL5zwBtTZsee43gDQpNDA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSgjl-0000W8-Ql for guix-patches@gnu.org; Tue, 31 Dec 2024 13:13:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75159] [PATCH v2 1/3] gnu: Add trompeloeil. Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Dec 2024 18:13: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.17356687361904 (code B ref 75159); Tue, 31 Dec 2024 18:13:01 +0000 Received: (at 75159) by debbugs.gnu.org; 31 Dec 2024 18:12:16 +0000 Received: from localhost ([127.0.0.1]:36731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSgj1-0000Ue-R6 for submit@debbugs.gnu.org; Tue, 31 Dec 2024 13:12:16 -0500 Received: from mail-pl1-f178.google.com ([209.85.214.178]:61546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSgiz-0000UR-JN for 75159@debbugs.gnu.org; Tue, 31 Dec 2024 13:12:14 -0500 Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2166022c5caso119659015ad.2 for <75159@debbugs.gnu.org>; Tue, 31 Dec 2024 10:12:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735668668; x=1736273468; 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=5IJa0Kp2bNgA2fQs73yzQnX35hHUPsWC5eNwvj2yuUI=; b=ByC8AupP2lMcixGNFyq/KE+It8OleD8Uy9o48vCLSQms2oxFHpQg4xPKsrcuFIChTM N/eg610kZsMydoaONlOWEhXDwOu0wiX2taAGXtPfYobKRguzxap43xo6yi3YBPfkgz+l F64dcTOj6URuaydUiEjjs7uxWWjD44ZLWXvVe5nVBlz4GUo8SKI2m+q7erYHiQCfVfYQ b4BEU7Fr3/7YZrOQG0IYX6OMJxVWf2lc/3/WunxtxEj7UNI6RsTN8G2XQxA7WtoPiKFL zo0o8gmxHDf05I+ILOhf54srZc9LU5y1WNYI2sgQGIhzUogeKpoBsXPr2GKuHttheIXf l4XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735668668; x=1736273468; 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=5IJa0Kp2bNgA2fQs73yzQnX35hHUPsWC5eNwvj2yuUI=; b=XJbcUSmEMUS5aEVC/Vl+vv18LQk/ZicOyTu9ZeodHXwIXGjqLio6z8MC69aKe/CgQS 2HNP/dZTkVDjGc4+WRkP9I35CM7XQT2OsAtyVXQPjVVQT5oeQYKu25fLvqGsCLY8kzog noLZqehj3O+XNxOi0c1DBsE6mbXlUwqzPLotthOLx8J5djzKq9l/lqCegkkUa4r1gXPH L+Sjp4ErsG9sPOgCY7bsrm5rRN0qphcskSj41JQGkeZyj4UzHr7bTCFo+Cm2stQtzE/s x/8WijIFGlTavF+dSSNQLSFHCzaAF/iWAiqTxr3/luEBDtTdBNxFHsWvrJMXxSobI1Xg gPXw== X-Gm-Message-State: AOJu0YwHciQzTg8J/HTS8XrSUdjBYPT4nseIoQIMwQuAqL/D+8FPoCC9 lWPmKRUOQJtodw3IhofP2LdEoVN0pCRM9DBqsMWMsRg1djyD5tRkRzFEYEba X-Gm-Gg: ASbGncu721LMe4UuHRYImnabIg1yoUeY+VEmvktjFhIj6Btcyoc7hRoQ7J66GYiCjty a7vkBZsM4wPzIrPNy73b/P2Smr11ZlLW1K+vlRsw1wBvJ/UBNoaDUhDa3V1QPVk3WhNPFdKUQGg y3AtxORGXZoqrOblf8ELLjuT5CJQs6ZAW5wZNBcs4cp+gyQu6aTY75vnFOb1iCd456qy0T1T3Io teoVLn7vHpfTCxJ5wDgr9mQ4dSXayDhcz6UjCIWeNhM9U1s3RK1NPXvDqEbIE0nVL3JNzSH57QM 5bFWXg== X-Google-Smtp-Source: AGHT+IGwkAgE9VMALiA3wQbUEaySjLT40mjL2Hj2q4gcAgwMTOOOjFfXlPmZGuGLpdJYdkqeGrrQWQ== X-Received: by 2002:a17:903:2287:b0:216:682f:175 with SMTP id d9443c01a7336-219e6f42c4dmr611880785ad.49.1735668667593; Tue, 31 Dec 2024 10:11:07 -0800 (PST) Received: from localhost.localdomain ([2401:4900:8813:a636:550a:44c0:5ef0:37c9]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-219dc9cde0dsm197634165ad.140.2024.12.31.10.11.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2024 10:11:07 -0800 (PST) From: Ashvith Shetty Date: Tue, 31 Dec 2024 23:39:47 +0530 Message-ID: <20241231181027.28121-3-ashvithshetty10@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241231181027.28121-2-ashvithshetty10@gmail.com> References: <20241231181027.28121-2-ashvithshetty10@gmail.com> 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 From: Ashvith Shetty * gnu/packages/check.scm (trompeloeil): New variable. Change-Id: I442cd0b5e84e8f9956b16b7d9235f67d9f5f693e --- gnu/packages/check.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 5fef10485b..151c6fb5c4 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -52,6 +52,7 @@ ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Navid Afkhami ;;; Copyright © 2024 gemmaro +;;; Copyright © 2024 Ashvith Shetty ;;; ;;; This file is part of GNU Guix. ;;; @@ -3806,6 +3807,36 @@ (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 + #:configure-flags #~(list "-D TROMPELOEIL_BUILD_TESTS=yes") + #:test-target "test/self_test" + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? test-target #:allow-other-keys) + (when tests? + (invoke test-target))))))) + (native-inputs (list catch2-3)) + (home-page "https://github.com/rollbear/trompeloeil") + (synopsis "Header only C++14 mocking framework") + (description + "Trompeloeil is a thread-safe header-only mocking framework for C++11/14.") + (license license:boost1.0))) + (define-public unittest-cpp (package (name "unittest-cpp") From patchwork Tue Dec 31 18:09:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashvith Shetty X-Patchwork-Id: 36255 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 3A18727BBEC; Tue, 31 Dec 2024 18:13:36 +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 7E64F27BBE2 for ; Tue, 31 Dec 2024 18:13:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSgjo-0002KQ-Rx; Tue, 31 Dec 2024 13:13:04 -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 1tSgjm-0002Jo-Os for guix-patches@gnu.org; Tue, 31 Dec 2024 13:13: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 1tSgjm-0004x6-G5 for guix-patches@gnu.org; Tue, 31 Dec 2024 13:13: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=Cy5t6vGrGCZBTEQKgmeEHQaA5ybmzx95dGK2PsJvXMA=; b=EbMSYOQa33tVGEgb9cyut9NveTyTy8bRr8tg8U2TXmPTbZJ7ksVkg54a8xOpXKpvelBZ50JWM8jl8GvkAaoIZpW+V6awN8kf7RMx8Z/5D4csjnEhvqFpnEk8/XM4kVEoxcNo9zSMQPpSs/3Gc9W3BVw74Wa8cd7UBYUV4WcZrX/bVbnhN93CjAJA/vx/9JDtqnycf3cHUaLm7Z4g72mMJsl+y0Do5QhDdV46p+RwKovPM9ZW/h2vWFnFZelrhDzv5/3F4tGdPeyUIGJZRNGIOxZlur9czHdv28PCn8PB+vIqP4aLhedmFxZWsCLCgNo0KaoLnmjJHMkX0HbFFca6vA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSgjm-0000WG-At for guix-patches@gnu.org; Tue, 31 Dec 2024 13:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75159] [PATCH v2 2/3] gnu: Add corectrl. Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Dec 2024 18:13: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.17356687461928 (code B ref 75159); Tue, 31 Dec 2024 18:13:02 +0000 Received: (at 75159) by debbugs.gnu.org; 31 Dec 2024 18:12:26 +0000 Received: from localhost ([127.0.0.1]:36734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSgjB-0000V0-A6 for submit@debbugs.gnu.org; Tue, 31 Dec 2024 13:12:25 -0500 Received: from mail-pl1-f169.google.com ([209.85.214.169]:58721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSgj8-0000Um-Su for 75159@debbugs.gnu.org; Tue, 31 Dec 2024 13:12:24 -0500 Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2165448243fso163625025ad.1 for <75159@debbugs.gnu.org>; Tue, 31 Dec 2024 10:12:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735668676; x=1736273476; 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=Cy5t6vGrGCZBTEQKgmeEHQaA5ybmzx95dGK2PsJvXMA=; b=dD25YA4nyep5Y52S9rfQsCBWMGBBqD5EsFoI7q1QSBjl8bSecOP0UF2M/kV7miKP3W tYADwntgi9VY64eh7aCEzfchGReH1gWAeRTTIMnUqvt54Q+z3JhTolM0LfNFD5gBW6Ms SU0Tgh0RDpOVNkS2LILNlCxenbh4gO8ZfZuzU328366qDSXvuCROCCOlwpJA3arh2BrS fxDAfJZ4IIHpBqiJsEQYCuF301lSWMgbOwc5RxaEUCTctQ9K0Hog9hNOcy10cgD/Ljls qHEx01aSWUPbJXahOPhx1beG0xDcJ1D+VXi/fGUf2R7DESBw3CYKhdx7XA32UGAUrzNj cWOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735668676; x=1736273476; 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=Cy5t6vGrGCZBTEQKgmeEHQaA5ybmzx95dGK2PsJvXMA=; b=Toz194joNkEXWhqz8MdaDbv1M7ynzgWXY6Md8c24051u3QM7cE7syQtGrC8m75Jh7q MYwlNMgGf3Vt13tZIp48nK988wYedxNGcIJ5PpNKa0TxV6g2UwrkChzhpVKg4ppgLgC+ 2tMGNTmzr1Hxfv/zBbVPzNhWaeoXYxE+CsoQMSpKMyuok5lT+akxuRVRHU6ExdFe0fTl cLm/JktJKq5qQIjkJJfGL5o3mEwO1zmQjuoAe0GLqNkvh7B4ApgHBlESrz6zzOox/XiJ y3cIKZcGipgl1nS/iCKeETBMxvnIQ8n5fCxkcLxemCY8gK0f2t/H8zW/j6fY9/ktC7Nd i6ew== X-Gm-Message-State: AOJu0Yw/2EmV6e/siCGbZ2h7k9vypT3lzwr2NcLoHuaQ25lTYIKKxZKp eFUy5QYcPS2haNAc6ktJ5GUjhlCvKBtPfSyLO+gAvK4pjC28WTPetzECcMYW X-Gm-Gg: ASbGncuQsa1ZWUw7JA84SQuscsoDuCVa0zKM9AfXzLJY0azqHylB1oXlDYo8ZgrgEkM qg9mvEesIpX52BpT166A9ouWizTqo9u3DDxDiOvgPw11y9dGqod5NISJa5j8751yHmhfcwk+WTv 23vjeRvHgrKVWEx6NXp/Q8dmrcNOh/516UDe21hNMWuonNb8sDfl4z2aDwHHGAVPeB3XTZs8NQ+ s1SMKojmt5I3xF3e1PCqsxqfl/FQuYr217zAmuQlPKBFJnloTGaAE5qu/IeDzM6H+NAuLmWmwo9 aSKnVg== X-Google-Smtp-Source: AGHT+IHD6RR8J3nEwD+PQlhda4sryaKTpGe5e8yGMHylI32scv8GHjswWb1DnRHkzSXuEb8mnP57kw== X-Received: by 2002:a17:903:11c5:b0:216:69ca:770b with SMTP id d9443c01a7336-219e6e8bb28mr642304135ad.12.1735668676555; Tue, 31 Dec 2024 10:11:16 -0800 (PST) Received: from localhost.localdomain ([2401:4900:8813:a636:550a:44c0:5ef0:37c9]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-219dc9cde0dsm197634165ad.140.2024.12.31.10.11.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2024 10:11:16 -0800 (PST) From: Ashvith Shetty Date: Tue, 31 Dec 2024 23:39:48 +0530 Message-ID: <20241231181027.28121-4-ashvithshetty10@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241231181027.28121-2-ashvithshetty10@gmail.com> References: <20241231181027.28121-2-ashvithshetty10@gmail.com> 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 From: Ashvith Shetty * gnu/packages/admin.scm (corectrl): New variable. * gnu/packages/patches/corectrl-polkit-install-dir.patch: New file. * gnu/local.mk (dist_patch_DATA): Add reference to it. Change-Id: I7b0f85c917eb58d7518d7ee7c5b22ef2debde7d9 --- gnu/local.mk | 2 + gnu/packages/admin.scm | 73 +++++++++++++++++++ .../patches/corectrl-polkit-install-dir.patch | 21 ++++++ 3 files changed, 96 insertions(+) create mode 100644 gnu/packages/patches/corectrl-polkit-install-dir.patch diff --git a/gnu/local.mk b/gnu/local.mk index 02a6fa616e..799a1ce591 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -69,6 +69,7 @@ # Copyright © 2024 Fabio Natali # Copyright © 2024 Noé Lopez # Copyright © 2024 Runciter +# Copyright © 2024 Ashvith Shetty # # This file is part of GNU Guix. # @@ -1121,6 +1122,7 @@ dist_patch_DATA = \ %D%/packages/patches/converseen-hide-non-free-pointers.patch \ %D%/packages/patches/cool-retro-term-wctype.patch \ %D%/packages/patches/coq-autosubst-1.8-remove-deprecated-files.patch \ + %D%/packages/patches/corectrl-polkit-install-dir.patch \ %D%/packages/patches/corefx-mono-5.4.0-patches.patch \ %D%/packages/patches/corefx-mono-pre-5.8.0-patches.patch \ %D%/packages/patches/coreutils-gnulib-tests.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index dce93e4f3a..3759b53d52 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -70,6 +70,7 @@ ;;; Copyright © 2024 Vinicius Monego ;;; Copyright © 2024 nathan ;;; Copyright © 2024 Nikita Domnitskii +;;; Copyright © 2024 Ashvith Shetty ;;; ;;; This file is part of GNU Guix. ;;; @@ -137,6 +138,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) + #:use-module (gnu packages gcc) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -157,10 +159,12 @@ (define-module (gnu packages admin) #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages m4) #:use-module (gnu packages mail) #:use-module (gnu packages man) + #:use-module (gnu packages maths) #:use-module (gnu packages markup) #:use-module (gnu packages mcrypt) #:use-module (gnu packages mpi) @@ -195,6 +199,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) + #:use-module (gnu packages vulkan) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) @@ -6484,3 +6489,71 @@ (define-public sshguard services. It aggregates system logs and blocks repeat offenders using one of several firewall backends.") (license license:isc))) + +(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 + #: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=" + #$(this-package-input "hwdata") + "/share/hwdata/pci.ids")) + #:phases #~(modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs #:allow-other-keys) + (wrap-program (string-append #$output "/bin/corectrl") + (list "PATH" + 'prefix + (map (lambda (binary) + (dirname (search-input-file inputs + (string-append + "bin/" + binary)))) + '("glxinfo" "lscpu" "vulkaninfo"))))))))) + ;; Text formatting only supported since C++20, which is available in gcc-13. + ;; https://en.cppreference.com/w/cpp/compiler_support#cpp_lib_format_201907L + (native-inputs (list pkg-config gcc-13)) + (inputs (list dbus + botan + catch2-3 + hwdata + mesa-utils + polkit + procps + pugixml + qtcharts-5 + qtdeclarative-5 + qtquickcontrols2-5 + qtsvg-5 + qttools-5 + quazip + spdlog + trompeloeil + units + util-linux + vulkan-tools + 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)))) 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 From patchwork Tue Dec 31 18:09:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ashvith Shetty X-Patchwork-Id: 36254 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 0720727BBE9; Tue, 31 Dec 2024 18:13:30 +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=unavailable 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 ED77F27BBE2 for ; Tue, 31 Dec 2024 18:13:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSgjp-0002Ki-6J; Tue, 31 Dec 2024 13:13:05 -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 1tSgjn-0002Jx-B6 for guix-patches@gnu.org; Tue, 31 Dec 2024 13:13:03 -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 1tSgjn-0004xE-2W for guix-patches@gnu.org; Tue, 31 Dec 2024 13:13: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=yQYcsTvpehf9RSF1NwH359cy1sXW/hq+Cyx7zkQA5og=; b=HDqY6hTCA55C/YuclcvcFqPfUXPUrmu3LvZIDsHBLU/PX7yOacFCfC3CUf1aqG/JQTw4Nmm8h+UXlgRzwlXGFtONUB6jNHIjX4+L5T6bUZY3SKogmC2wqIbrqT+Wc2hoEzFJDuNiFfd7XyJDydCkaMfEzUiufIgZQLt0r02OmC6TeCPJjCukrw4hbztFtnJixfHRyNjlcicJgh22fpd/tCpifLfPknNX5sa1S8z0zm6YD3fWcG16iHT4TqvmvXhZPFTNmju9i3hfecYaESRKse61ObXsQ8VzlxAQIVSEiMoe93Xd1tfsHVaGTjKKOpE6vDNQShbwc6o3Q9hOHglz4Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSgjm-0000WN-TT for guix-patches@gnu.org; Tue, 31 Dec 2024 13:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75159] [PATCH v2 3/3] services: Add corectrl-helper-service-type. Resent-From: Ashvith Shetty Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Dec 2024 18:13: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.17356687531950 (code B ref 75159); Tue, 31 Dec 2024 18:13:02 +0000 Received: (at 75159) by debbugs.gnu.org; 31 Dec 2024 18:12:33 +0000 Received: from localhost ([127.0.0.1]:36737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSgjJ-0000VN-25 for submit@debbugs.gnu.org; Tue, 31 Dec 2024 13:12:33 -0500 Received: from mail-pl1-f175.google.com ([209.85.214.175]:52593) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSgjG-0000V2-Tx for 75159@debbugs.gnu.org; Tue, 31 Dec 2024 13:12:31 -0500 Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-21661be2c2dso124479165ad.1 for <75159@debbugs.gnu.org>; Tue, 31 Dec 2024 10:12:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735668684; x=1736273484; 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=yQYcsTvpehf9RSF1NwH359cy1sXW/hq+Cyx7zkQA5og=; b=LnYAJGmmFy60J+a5Whn7Ro5VQVQuDXLYsx6LXWwgPxIzPou0Kda8PFly+9K86bPLiI 8HZBCzyE+N7ggDnndkdESnT/yTNnJTw5B1B+Tp+7o0fUKD7bwedCJEOu39MMHsSkC7FO nWHb0ynn+wvE58AsT8vQ460cI1LHoLN0pg+DsYh0Pfz0OjDKw5+o6OExp/+/3pP1EQLa qFXZjPwdCmoKByxCfY92RwtopzYS9OP1rzLbEm4gLJiMCjjt8uAsqCWopRmZJFWpNdvV SXxfN62u7FDfqjLnlEENVhKdV3sH84QwoRwIL5xfhRlL0/h6ysmxkBTeFfi9/W+5SYaM RioA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735668684; x=1736273484; 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=yQYcsTvpehf9RSF1NwH359cy1sXW/hq+Cyx7zkQA5og=; b=EU4o8fi2NjjmJz0Tyne8+mWTRXTaPlM99VAusdeddNILIx8wYN9VVNTuozgMyQ2TX8 6cVe+1TC9sJarXIXqOEGybKb1M2JAVoADPA8BCQlQJv522AGEn20i6xYHWDz1HZjHW66 isCAOKyVbSpQlXkxVkPFOw28nU4rRGCXYUdtYe17C/9ofO8CgdQT28kVOh8NbgGFSPHe JuPtJzAEPk2pkqneXbRaHKQbYvD3EAENwJUqy3SGyCgXIN2SmsusiMPEscAFtlYmPwQK Xdqxg5i254s5cPAzJYihszNQulZkT2GerfzLfiuMbjLgbKIv0njIwh58JqsjfpOUH++Z GKOw== X-Gm-Message-State: AOJu0YzktHqolIXpiKq5U6Y/akc6+2uS2h5ZZPjJfUEs+08nJbYCVLAP /I9+RqqpTDMs3NuP+a4b/Y7qWf9nr2j+84QW9Mjl1WqNryZ0ebke3TLMpety X-Gm-Gg: ASbGnctOhK9k6VWDw5pTJ2pHTlj58DkRRatfc9E6gtk3PZ3S/zDwtVa+V8x+2kMra+r ViRctw+lCPyMDTfi87Nms4kee//RMQMyzgzPGShBXSA6SgrmAfDjL+nmVWjKG+AbBx8tmBN9LsL 0fQgjE6N24MmDPfTnuLnr6DafWUhcWMVrwqjrIQWu6eXAbIAuUOStncY6x6cpoGJfn+BYLkpUuo gbUVittrGKQix2sXswiLa949i0ZoUmZALjl0unK93VKNuLCMvczhdda90euPXEbo0ocuoRlh7X/ IVVA9g== X-Google-Smtp-Source: AGHT+IEXXJnrsormw1v8JjSclMV8ZMgnxlGdnsvly3hGZrycE7IhD0z05DaeMKAFvRVOsxbm9CbeAA== X-Received: by 2002:a17:903:1cb:b0:215:9894:5679 with SMTP id d9443c01a7336-219e6cc8836mr516343645ad.0.1735668684484; Tue, 31 Dec 2024 10:11:24 -0800 (PST) Received: from localhost.localdomain ([2401:4900:8813:a636:550a:44c0:5ef0:37c9]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-219dc9cde0dsm197634165ad.140.2024.12.31.10.11.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2024 10:11:24 -0800 (PST) From: Ashvith Shetty Date: Tue, 31 Dec 2024 23:39:49 +0530 Message-ID: <20241231181027.28121-5-ashvithshetty10@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241231181027.28121-2-ashvithshetty10@gmail.com> References: <20241231181027.28121-2-ashvithshetty10@gmail.com> 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 From: Ashvith Shetty * gnu/services/admin.scm: New file. (corectrl-helper-service-type): new variable. * gnu/local.mk: Add them. * doc/guix.texi (Miscellaneous Services): Document it. --- doc/guix.texi | 32 ++++++++++++++++++++++++++++++++ gnu/services/admin.scm | 27 ++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 924f13f0f6..9330525c61 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -135,6 +135,7 @@ Copyright @copyright{} 2024 Nigko Yerden@* Copyright @copyright{} 2024 Troy Figiel@* Copyright @copyright{} 2024 Sharlatan Hellseher@* Copyright @copyright{} 2024 45mg@* +Copyright @copyright{} 2024 Ashvith Shetty@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -42590,6 +42591,37 @@ empty list means that no type is specified. @end deftp +@cindex corectrl-helper +@subsubheading CoreCtrl Helper Service + +The @code{(gnu services admin)} 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 + + +@deftp {Data Type} corectrl-helper-configuration +This is the data type representing the configuration of corectrl-helper. + +@table @asis +@item @code{corectrl} (default: @code{corectrl}) (type: package) + +The @command{corectrl} executable to use. +@end table +@end deftp + +For more details, please read the +@uref{https://gitlab.com/corectrl/corectrl/-/wikis/Installation, Installation} +and +@uref{https://gitlab.com/corectrl/corectrl/-/wikis/Setup, Setup} wiki pages. + @c %end of fragment @node Privileged Programs diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index 571af6a04e..42cefdf256 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2023 Giacomo Leidi ;;; Copyright © 2024 Gabriel Wicki ;;; Copyright © 2024 Richard Sent +;;; Copyright © 2024 Ashvith Shetty ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ (define-module (gnu services admin) #:use-module (gnu packages linux) #:use-module (gnu services) #:use-module (gnu services configuration) + #:use-module (gnu services dbus) #:use-module (gnu services mcron) #:use-module (gnu services shepherd) #:use-module (gnu system accounts) @@ -108,7 +110,11 @@ (define-module (gnu services admin) resize-file-system-configuration-cloud-utils resize-file-system-configuration-e2fsprogs resize-file-system-configuration-btrfs-progs - resize-file-system-configuration-bcachefs-tools)) + resize-file-system-configuration-bcachefs-tools + + corectrl-helper-service-type + corectrl-helper-configuration + corectrl-helper-configuration?)) ;;; Commentary: ;;; @@ -679,4 +685,23 @@ (define resize-file-system-service-type (service-extension shepherd-root-service-type (compose list resize-file-system-shepherd-service)))))) +;;; +;;; CoreCtrl helper service. +;;; + +(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)) + (description "Run corectrl-helper, an essential service for the corectrl application."))) + ;;; admin.scm ends here