From patchwork Sun Jan 12 12:40:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 36994 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 3189F27BBEA; Sun, 12 Jan 2025 12:49:51 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 A87B527BBE2 for ; Sun, 12 Jan 2025 12:49:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tWxOv-00085t-H3; Sun, 12 Jan 2025 07:49:09 -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 1tWxOp-00084U-WF for guix-patches@gnu.org; Sun, 12 Jan 2025 07:49:04 -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 1tWxOp-0006Nd-NG for guix-patches@gnu.org; Sun, 12 Jan 2025 07:49: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=MIe+DaGvB7sxGgI3rP3uUYuhElLuSohhTF60He3E0LU=; b=PXQUkJOezADtF56YZOqD0LHB9/zgtJ5lp54cjNIAaP2wr2bDdamFhqCPvWilRAOcm7I6Egj0SH5okiu5OVwfvPYD/+LBvFIzW+1wKRNl6npODi3Gw4RZzfa9WXWP3SnrwrBty3TLq/Rdw11tv1iSUu5dAZVsfN7/f3O40nsRbclpL32QYIP2wLSjFXo1V/dp9Lc8TO488lb/GwuyC1/rFI2LvolASj3PmcuvfGJijTwnv/qYinPMGl1raIr/qmTIfCh1vx+FezzdTxRH44pwtTMMSyUDyHMQ3MW0XpybFMTCGgPOC07BABykZKkLuPq6SJwT4/XAyNnUjEOpw0VSkw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tWxOp-0003Fu-Hj for guix-patches@gnu.org; Sun, 12 Jan 2025 07:49:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75503] [PATCH v3 2/3] gnu: kpmcore: Fix missing commands. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Jan 2025 12:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75503 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75503@debbugs.gnu.org Cc: Zheng Junjie , Sughosha Received: via spool by 75503-submit@debbugs.gnu.org id=B75503.173668610812436 (code B ref 75503); Sun, 12 Jan 2025 12:49:03 +0000 Received: (at 75503) by debbugs.gnu.org; 12 Jan 2025 12:48:28 +0000 Received: from localhost ([127.0.0.1]:46389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWxOG-0003ER-4M for submit@debbugs.gnu.org; Sun, 12 Jan 2025 07:48:28 -0500 Received: from layka.disroot.org ([178.21.23.139]:59256) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tWxOD-0003E9-6L for 75503@debbugs.gnu.org; Sun, 12 Jan 2025 07:48:25 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5851A25BA8; Sun, 12 Jan 2025 13:48:24 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ZBedHRoePYp1; Sun, 12 Jan 2025 13:48:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1736686103; bh=2ZiB0sexfroeSi4nFndPYPvMaq6whwPvfmAOss+/2+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aJFhjgFMdm8hWQ0yCeQScKyTvBqlE0xRL2TQ1hy+F+De0bbOe6dTFqclp+TkKMtA2 N/iF2ccWtmuTuWi5lPIebjiYQxMaYWWKGcmynG5TceJHK8myun9ae262qonz4pBGIb KDxdaGYaXNKnEg673iC/Jw0Vi4KigqTveRDNgcCymidFqLm/E34fytTQefqL1naJii 3Lzss2fP2uGDsYAzvHGpRrm3nLPXxBAS5XU0CGvsxgIDIuWVS+QHKiW64HEp4xiZ2s VN4Nvb4H3n4JNEyie1KbSjx4SJuDWIhhUi6q/CxJ3YW3zF3axEF4lxRiUVG7BAAeDo VZJmbOsAv47Kg== Date: Sun, 12 Jan 2025 18:10:16 +0530 Message-ID: <5a255065c2a16f4d606207d809819a2e2e2ec056.1736685616.git.sughosha@disroot.org> In-Reply-To: References: 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha 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/kde.scm (kpmcore)[inputs]: Switch to the old input style; Add coreutils, cryptsetup, eudev, lvm2, mdadm, smartmontools and util-linux. [arguments]<#:phases>: Add patch-trustedprefixes-file phase. Change-Id: I6b205596e2ae5d03010db27b0b41ddb42d4534b5 --- gnu/packages/kde.scm | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index ce64619feb..9481ecd8ea 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -45,6 +45,7 @@ (define-module (gnu packages kde) #:use-module (guix utils) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages algebra) #:use-module (gnu packages apr) #:use-module (gnu packages astronomy) @@ -58,6 +59,7 @@ (define-module (gnu packages kde) #:use-module (gnu packages code) #:use-module (gnu packages cpp) #:use-module (gnu packages compression) + #:use-module (gnu packages cryptsetup) #:use-module (gnu packages curl) #:use-module (gnu packages djvu) #:use-module (gnu packages documentation) @@ -1269,14 +1271,21 @@ (define-public kpmcore (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list kauth - kcoreaddons - ki18n - kwidgetsaddons - polkit-qt6 - qtbase - qca-qt6 - `(,util-linux "lib"))) + `(("coreutils" ,coreutils) + ("cryptsetup" ,cryptsetup) + ("eudev" ,eudev) + ("kauth" ,kauth) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kwidgetsaddons" ,kwidgetsaddons) + ("lvm2" ,lvm2) + ("mdadm" ,mdadm) + ("polkit-qt6" ,polkit-qt6) + ("qtbase" ,qtbase) + ("qca-qt6" ,qca-qt6) + ("smartmontools" ,smartmontools) + ("util-linux" ,util-linux) + ("util-linux:lib" ,util-linux "lib"))) (arguments (list #:phases @@ -1287,7 +1296,24 @@ (define-public kpmcore (("DESTINATION \\$\\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\\}") "DESTINATION share/polkit-1/actions")) (substitute* "src/backend/corebackend.cpp" - (("\\/usr") #$output))))))) + (("\\/usr") #$output)))) + (add-before 'configure 'patch-trustedprefixes-file + (lambda* (#:key inputs #:allow-other-keys) + (call-with-output-file "src/util/trustedprefixes" + (lambda (port) + (map (lambda (prefix) + (display prefix port) + (newline port)) + (list (assoc-ref inputs "coreutils") + (assoc-ref inputs "util-linux") + (assoc-ref inputs "eudev") + (assoc-ref inputs "cryptsetup") + (assoc-ref inputs "lvm2") + (assoc-ref inputs "mdadm") + (assoc-ref inputs "smartmontools") + "/run/current-system/profile" + "/usr" + "/"))))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Library for managing partitions") (description "Library for managing partitions.")