From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 8CsYEp9KxWTvygAASxT56A (envelope-from ) for ; Sat, 29 Jul 2023 19:21:35 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id wGMQEp9KxWReJgEAauVa8A (envelope-from ) for ; Sat, 29 Jul 2023 19:21:35 +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 F0D3E4DD8E for ; Sat, 29 Jul 2023 19:21:34 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=LrXXvbpF; 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=1690651295; 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=M0zR9RRKI7vHrhvQ1xovBJBaxpNEKyYBhU2VImV+mLE=; b=JBMAXBszVvMXidDELeFvffPJDgPSOX3Vnq4wc2FPF9C5JvhIZQnVYFOC6yOL7THSXcTe2J DSwiJTSI1UbqHtg7vIQKbbq90DmFmBUa21N5pQYjQgC5JdiY2Sk6+bvTZEdXJigmEdwZmm 4iRauFSeGI/0X3oVqcJjKHvIg9TQOt5SKs0CwjYH/fj4+QFyW1TtLN4fMg2EfXZH8xIcND C4YelRggFSaS6H39J0qSP4cbkR7TyfihyY87Vgs4xt4fDvdCQ+B7eX96TIHJKwY2nWGFYv 4qJEXGHGnql0DHBKc397HkUSgROACyGDiFX6a05ERLWOwQNxo6hHvIy971o6EQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=LrXXvbpF; 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-Seal: i=1; s=key1; d=yhetil.org; t=1690651295; a=rsa-sha256; cv=none; b=BHAVqXLNGxiBriKtl5LleNcsq6mjlc9G0n6NDyUrXuCLyoFnY13UQ0v2k5g/k2WCXlx8tR kQa2csZqbqk++fZuNUsSSrobMwFz7hJi0LTGLNWHTXivHkb1xNACGpndwm15lEVIEB5MNa b3IWcpJXv7QoSx2430fvZNEMZQOGxbPQk1BHRQ908QeSfZ2Yj0iBCUqbmQXzrUyddvYsKH +HGnGi0iw+WrVSC2masjGambHlyPF/NJIDUZSrQUKOEt9fxREU6lkV7GvW+VT0oF5gjiRx ulmRn4wRSo6vjZlZtyZORRQcXZeiNtWtoosZWTMf39Q9iboR6kmM/7TPNiNr4w== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPnPF-0007U2-3M; Sat, 29 Jul 2023 13:07:05 -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 1qPnPE-0007Sy-Hx for guix-patches@gnu.org; Sat, 29 Jul 2023 13:07: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 1qPnPC-0006LH-Hu for guix-patches@gnu.org; Sat, 29 Jul 2023 13:07:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qPnPC-0005jI-74 for guix-patches@gnu.org; Sat, 29 Jul 2023 13:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64938] [elogind-updates PATCH 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: Sat, 29 Jul 2023 17:07:02 +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.169065038821973 (code B ref 64938); Sat, 29 Jul 2023 17:07:02 +0000 Received: (at 64938) by debbugs.gnu.org; 29 Jul 2023 17:06:28 +0000 Received: from localhost ([127.0.0.1]:48967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPnOd-0005iL-T3 for submit@debbugs.gnu.org; Sat, 29 Jul 2023 13:06:28 -0400 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]:48156) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPnOb-0005i6-Rq for 64938@debbugs.gnu.org; Sat, 29 Jul 2023 13:06:26 -0400 Received: by mail-qv1-xf2d.google.com with SMTP id 6a1803df08f44-63d0bf91362so15015356d6.0 for <64938@debbugs.gnu.org>; Sat, 29 Jul 2023 10:06:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690650380; x=1691255180; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=M0zR9RRKI7vHrhvQ1xovBJBaxpNEKyYBhU2VImV+mLE=; b=LrXXvbpFOVq+f4DpUKlXoAHsaxnAauteHDvdkSnJKmps7hy3oIfivYDSbwQ+SXZyol 0lWMFJXjtn/00d2NS+Yixe0zCCFJW0ovhsSG7o4CKfwX3FeNqYvoRtWGIgHT96pneZtB mc7tQbnc8D5/E2TgPjY/kCSxqmSE1udRCiz6AKS24ncu7QGQc8iNJcV6KiyZxjANPjS1 U59LL24l6EkD4jlELeZntVUR3lF0+iW+X3rszC4+pCLNIEEISfFvFGle2MUJQbgHrrn1 A22705isGXsAFs46Fs+4ky2wsBXXTrcuBnPbQkWvRbDleBV8E6PSCv3Re+wgOaNeM2oz VaJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690650380; x=1691255180; 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=M0zR9RRKI7vHrhvQ1xovBJBaxpNEKyYBhU2VImV+mLE=; b=UHjWCguFEBicvcGgq1HovS8ywDc3uOFkfVA5fJTARX64uyVna5mTpoT7bSJxc6tPWa LOaOkawtP+oUqgrqJ0F+H4k484g5XBdlHrmH66CUm5RsSUK8noXDj4HheD9ZL7G9olKA XNsxIMqNeSyeqJ/FYMH21q00xt36ziVk22bWONOYXCaMDwz3AmVEZ5TnEEPCxmQ9ldgH yYHM7zF3+yh8k+2aNd9MQ17LtMLy8OoRlZxHP97ZtfUJklcsQ0AcjM9JABYd0S9Q6jpl CdPFIWXKswCVNrK8g3eWiXL9zbWVqt0PeVNyqb6XYlwouCXLXHCRK6nfkCw2m3w+/S6O JrUQ== X-Gm-Message-State: ABy/qLaapy9Byuv0tTfh50BuT5Yy62PBBk+kXtqf1zj7z43vdh6snuvV o/rrO9x8o5/zMzBiGeJQ8XOlU6GiVR8= X-Google-Smtp-Source: APBJJlHJv1JMIt1TsKXitdWWvqFIoOs8nbc2YCjxI6SNU6NTLK3ozPhAKZzjhDFGvu4UvtWJ/KDHsA== X-Received: by 2002:a0c:dd0b:0:b0:63c:efa5:2860 with SMTP id u11-20020a0cdd0b000000b0063cefa52860mr4200051qvk.25.1690650379887; Sat, 29 Jul 2023 10:06:19 -0700 (PDT) Received: from localhost.localdomain (dsl-205-236-230-150.b2b2c.ca. [205.236.230.150]) by smtp.gmail.com with ESMTPSA id a17-20020a0c8bd1000000b0063c6c7f4b92sm2185544qvc.1.2023.07.29.10.06.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 10:06:19 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 29 Jul 2023 13:05:32 -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-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: 4.86 X-Migadu-Queue-Id: F0D3E4DD8E X-Migadu-Spam-Score: 4.86 X-Migadu-Scanner: mx0.migadu.com X-TUID: bM/V5hweHgnz * gnu/packages/freedesktop.scm (elogind): Re-indent package. [native-inputs]: Remove labels. --- 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 3bfc8b33ae..8a894b7e1e 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: 7dd076ed33a1e19c05a421f20ab55aa7a94c39eb -- 2.41.0