From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id gFBcBd4Ex2Q8FwEASxT56A (envelope-from ) for ; Mon, 31 Jul 2023 02:48:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id sB9UBN4Ex2TW/wAAG6o9tA (envelope-from ) for ; Mon, 31 Jul 2023 02:48:30 +0200 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 73A2C4C440 for ; Mon, 31 Jul 2023 02:48:29 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="LT1/OBXz"; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1690764509; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=bwe7XWHHBlQfVAakHwEcDzesw+JmNfQNlXh+klwsxQ0=; b=hSa7ZLLWyWSLCWfSVHHiLItorcTzORO7rilCjw+lUgtLLyOlLdkr4OoniyQ+Hu2TMADnB+ X8xUAb30gkweAphDMYNKKTUKZ+pAxfEMYLWOLAMneZSbbAZCoNiQb5lMQ7i9pJhh9ZqJzT L1tBbmLRkUIQxCv8ISz2PmIIkOAA7T/xhzGUfnCcttuqY6UY0HAqges88TTBdBYw5mc32g 7lxg1oOzDKv+Ht6ie0Aqvi7TIChYf6JZ5ulxArf3T8xAYsbyWoUTtdaYElbOlpuaNYa2a4 +YG8ak89p7pHyg32CxR4xuX9v1zV8c3oWTANLzqJfO8RMzxKRZknzPqtpcMhBg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1690764509; a=rsa-sha256; cv=none; b=QNURSb5QjzN8bL9t7z1xFEHDgrOqJ28UGc3skuKwlPSRDWa+MWCABOQJheHUS8kWGFTBtp NG8ju1/+J5JSApCOnCUARvu83tzqNPxwLvJe4ZD9sEeJlSddZo5LJwG9Yq6/RbgfRMvOpF sFmK5iaVAAA8moir3UPtkjfoH9PkF4W8tQGtqWqtNsTUQACA3sLmRLQS+EQhFbQk7r2M9M z959PWk3Oa+j5g/9CovINL0gGRff9ra/tzEhaKjr1Jb1YDDQGYy1/QlCJb0a63vRACI2hl k5w/pTONSs85h8mcqgJeor1u4QKHIhOgpR/fA3l4iCAW9SLIzCpKJzJQpSkLBw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="LT1/OBXz"; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qQH50-0007QR-RE; Sun, 30 Jul 2023 20:48:10 -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 ) id 1qQH4s-0007Pf-2N for guix-patches@gnu.org; Sun, 30 Jul 2023 20:48:04 -0400 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 1qQH4r-0003yU-Qs for guix-patches@gnu.org; Sun, 30 Jul 2023 20:48:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qQH4r-0000DV-Mp for guix-patches@gnu.org; Sun, 30 Jul 2023 20:48:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64938] [elogind-updates PATCH v2 1/2] gnu: elogind: Drop input labels and fix indentation. References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Jul 2023 00:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 64938@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 64938-submit@debbugs.gnu.org id=B64938.1690764452630 (code B ref 64938); Mon, 31 Jul 2023 00:48:01 +0000 Received: (at 64938) by debbugs.gnu.org; 31 Jul 2023 00:47:32 +0000 Received: from localhost ([127.0.0.1]:51430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQH4N-0000A4-TJ for submit@debbugs.gnu.org; Sun, 30 Jul 2023 20:47:32 -0400 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]:44146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQH4M-00009q-G6 for 64938@debbugs.gnu.org; Sun, 30 Jul 2023 20:47:31 -0400 Received: by mail-qk1-x731.google.com with SMTP id af79cd13be357-76af2cb7404so273119285a.0 for <64938@debbugs.gnu.org>; Sun, 30 Jul 2023 17:47:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690764444; x=1691369244; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bwe7XWHHBlQfVAakHwEcDzesw+JmNfQNlXh+klwsxQ0=; b=LT1/OBXza0gNzl5gIX40e9ZUixYVadbsYadoymOzUhvuON7JIDW/INptKzkG5A7T4D OjArBsMwBiSmKHv8um79EP0R2HjtEr8OjwKcV1vAaOOcFTOgLDvVv+l5h5QetSRinW1E Of3bg5xgsDtaf10UFxaLAAOfoDp0PcuJtt8jRI7ql61M6ZoSmraRy5fecKkTKWgzLVo+ dOlC9uuJMK6y+hjvAZfPpOjaBb5DIXQce6zqd4uPK5gyqEEMS66nak7T5XHUHVpeiiZh Fefv3xEBtQFGZAcVHfhajR6jSbHLsXbLiJ6NBdJ2Eo/jdrPByYOz18hHbsOjcHK+emwg bktg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690764444; x=1691369244; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bwe7XWHHBlQfVAakHwEcDzesw+JmNfQNlXh+klwsxQ0=; b=lBUuCi1uUHCnPVV6OV1N8iEfQEc/UB2F/g6elyVdENYvvT28hVWh8f1sU8UasfdxvE FX0kNOjWmIUpmg8bPPJ7ubqiUxgcg7yXkBYDfxJq7MaJhs/JOk6zLp5WeR9JLNU0yXYx 4G7BK87feJISerIw78I0dzhfdNKz+OrggjPZ0gfuHzqku5F2LY5UoNntlPlu3NmFqEIy iVbeMhAPQxqLr2zDSE+vbTvfcylWcrpi5kJVFVr+aZ2Dr2y6n3wRKKoaNFsb2H7v+FjC QMb/j6PzhWMzmNhlvnRdi/whXRh+dM5GHMvMbgyszc0BI0fc6eFl4+7eV3lsYb3mF3K1 DpbA== X-Gm-Message-State: ABy/qLYhWxU+UVgq8z+jRpi3SikE8WlUOgpFBechDYgRw+7g4U8H9PML WZYhJq5NUfLsqONzFx82kpuwTtNMSp8= X-Google-Smtp-Source: APBJJlH96oaahDfRy7bRlxwlaSnJzxtyLIrjbAJhiyFA0Jfb9LA8uYhKpvBVHktJw0qlIK1kfJFH7w== X-Received: by 2002:a05:620a:4727:b0:75e:bf51:29a6 with SMTP id bs39-20020a05620a472700b0075ebf5129a6mr9473551qkb.65.1690764444451; Sun, 30 Jul 2023 17:47:24 -0700 (PDT) Received: from localhost.localdomain (dsl-205-236-230-150.b2b2c.ca. [205.236.230.150]) by smtp.gmail.com with ESMTPSA id c12-20020a05620a11ac00b0075b2af4a076sm452963qkk.16.2023.07.30.17.47.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jul 2023 17:47:23 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 30 Jul 2023 20:46:47 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.55 X-Spam-Score: -4.55 X-Migadu-Queue-Id: 73A2C4C440 X-Migadu-Scanner: mx1.migadu.com X-TUID: 0WpJCrnYlTJ+ * gnu/packages/freedesktop.scm (elogind): Re-indent package. [native-inputs]: Remove labels. --- (no changes since v1) gnu/packages/freedesktop.scm | 54 ++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 112ae5afeb..60d8dfe9fd 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -663,14 +663,14 @@ (define-public elogind (libexec (string-append out "/libexec/elogind")) (dbuspolicy (string-append out "/etc/dbus-1/system.d")) #$@(if (not (target-riscv64?)) - #~((kexec-tools #$(this-package-input "kexec-tools"))) - #~()) + #~((kexec-tools #$(this-package-input "kexec-tools"))) + #~()) (shadow #$(this-package-input "shadow")) (shepherd #$(this-package-input "shepherd")) (halt-path (string-append shepherd "/sbin/halt")) #$@(if (not (target-riscv64?)) - #~((kexec-path (string-append kexec-tools "/sbin/kexec"))) - #~()) + #~((kexec-path (string-append kexec-tools "/sbin/kexec"))) + #~()) (nologin-path (string-append shadow "/sbin/nologin")) (poweroff-path (string-append shepherd "/sbin/shutdown")) (reboot-path (string-append shepherd "/sbin/reboot"))) @@ -683,8 +683,8 @@ (define-public elogind (string-append "-Dcpp_link_args=-Wl,-rpath=" libexec) (string-append "-Dhalt-path=" halt-path) #$@(if (not (target-riscv64?)) - #~((string-append "-Dkexec-path=" kexec-path)) - #~()) + #~((string-append "-Dkexec-path=" kexec-path)) + #~()) (string-append "-Dpoweroff-path=" poweroff-path) (string-append "-Dreboot-path=" reboot-path) (string-append "-Dnologin-path=" nologin-path) @@ -754,29 +754,29 @@ (define-public elogind (substitute* "src/login/elogind.c" (("\"/run/elogind.pid\"") "\"/run/systemd/elogind.pid\""))))))) (native-inputs - `(("docbook-xml" ,docbook-xml-4.5) - ("docbook-xml-4.2" ,docbook-xml-4.2) - ("docbook-xsl" ,docbook-xsl) - ("gettext" ,gettext-minimal) - ("gperf" ,gperf) - ("libxml2" ,libxml2) ;for XML_CATALOG_FILES - ("m4" ,m4) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("xsltproc" ,libxslt))) + (list docbook-xml-4.5 + docbook-xml-4.2 + docbook-xsl + gettext-minimal + gperf + libxml2 ;for XML_CATALOG_FILES + m4 + pkg-config + python + libxslt)) (inputs (append - (if (not (target-riscv64?)) - (list kexec-tools) - '()) - (list linux-pam - libcap - shadow ; for 'nologin' - shepherd ; for 'halt' and 'reboot', invoked - ; when pressing the power button - dbus - eudev - acl))) ; to add individual users to ACLs on /dev nodes + (if (not (target-riscv64?)) + (list kexec-tools) + '()) + (list linux-pam + libcap + shadow ; for 'nologin' + shepherd ; for 'halt' and 'reboot', invoked + ; when pressing the power button + dbus + eudev + acl))) ; to add individual users to ACLs on /dev nodes (home-page "https://github.com/elogind/elogind") (synopsis "User, seat, and session management service") (description "Elogind is the systemd project's \"logind\" service, base-commit: a27d172ee66472a255754bf88ae8fb4ce73ec9ad -- 2.41.0