From patchwork Thu Aug 12 22:04:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 32081 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 9821227BC82; Thu, 12 Aug 2021 23:05:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0B14227BC78 for ; Thu, 12 Aug 2021 23:05:40 +0100 (BST) Received: from localhost ([::1]:44036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEIpX-0001Yn-3X for patchwork@mira.cbaines.net; Thu, 12 Aug 2021 18:05:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEIoy-0000Tv-CZ for guix-patches@gnu.org; Thu, 12 Aug 2021 18:05:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56746) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEIoy-000689-6A for guix-patches@gnu.org; Thu, 12 Aug 2021 18:05:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mEIoy-0002w5-16 for guix-patches@gnu.org; Thu, 12 Aug 2021 18:05:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49969] [PATCH 03/10] gnu: freedesktop: Add greetd 0.7.0 Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Aug 2021 22:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49969 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49969@debbugs.gnu.org Received: via spool by 49969-submit@debbugs.gnu.org id=B49969.162880588711134 (code B ref 49969); Thu, 12 Aug 2021 22:05:03 +0000 Received: (at 49969) by debbugs.gnu.org; 12 Aug 2021 22:04:47 +0000 Received: from localhost ([127.0.0.1]:40036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEIoe-0002tL-B3 for submit@debbugs.gnu.org; Thu, 12 Aug 2021 18:04:47 -0400 Received: from mail-ej1-f52.google.com ([209.85.218.52]:39864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEIoX-0002sD-Cc for 49969@debbugs.gnu.org; Thu, 12 Aug 2021 18:04:38 -0400 Received: by mail-ej1-f52.google.com with SMTP id go31so14449311ejc.6 for <49969@debbugs.gnu.org>; Thu, 12 Aug 2021 15:04:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=muradm-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3V8DMCKbRSqdR3wtMv+7Ro3Vrt3PCoHfrpfXzhJ1GgI=; b=grhrcvS0tLAB3HL7AuJ+KYQKrq6qtMvlTehC/+pqo5UKigQVnR6SoMG9nth3XVPHzw sZRJofnlNO9VhQ/NP/m+93aJgAFf5b3mhUoPfWQWXLf88h4KtXzerIockjcibHhlgRF6 rZ86x8JFWtXB9EWZ6CpXY2ZwUaBlaiUcQvLRahnf+6YCyh1VRpZDkI8eatrBUy2xtLqu z7t1Ux22PjStRJSqfkMFfmi2Qlt6eYtFttu9VWrYJESJpJ/MR+9gA9A4PXSPO88cU7yh FUDdKIGvcRfUN4GMBf88nQZIQ4460lbCtuxAcSDpLhcKrTSmdN8oKmWYcN4prTaneLN1 nV7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3V8DMCKbRSqdR3wtMv+7Ro3Vrt3PCoHfrpfXzhJ1GgI=; b=ARV0H3Ky65Q21Zi9H7hFWxYC6eOcfnjkOU6IoTu0+mXYqYo0bgYHWm5IhT2B6m8QJS OG3YpwPUj+P3zm97s2HfLGV4Mhh+JO0V4TNFML9SeOBnT+sjX3SLAYFbr6jp0Xp8xSeH cyv7WVILr/RAacG4bCSx+37L+0ODDnN3m1MPY7FMQaqox+/4O1RQ69ZaTWXiKQ1faHVl vDSFyD2SGzk08OQTYjRLle26R+d6UmZSikBVsofeLIgqhTk67NmlgLadNSx4Zr9UqbuL e/fF1vdMUiav/ohgkzJ4WX4FwpNzx7oPR0N0/SbKkcj/fd0ulNLX50ufJEGkHMsqh/EF 0/9Q== X-Gm-Message-State: AOAM533sdyaH6KKwqRWRy2b22nZVaHACtHuZ3dE7CQqUe4qRarfb+19h +hFL3UkZnytHFoKDzSX/Jg5fqsejJxG3FQ== X-Google-Smtp-Source: ABdhPJyr34SGerVd3NsghbX5ffl98agzRWEeFB+K4sTN+4tkmczZJtgSAkY2EBEzMuCM7n9eDrjjBg== X-Received: by 2002:a17:906:32cf:: with SMTP id k15mr5842332ejk.68.1628805871599; Thu, 12 Aug 2021 15:04:31 -0700 (PDT) Received: from localhost.localdomain ([5.24.104.153]) by smtp.gmail.com with ESMTPSA id o23sm1750302eds.75.2021.08.12.15.04.30 for <49969@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 15:04:31 -0700 (PDT) From: muradm Date: Fri, 13 Aug 2021 01:04:13 +0300 Message-Id: <20210812220420.24118-4-mail@muradm.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210812220022.24025-1-mail@muradm.net> References: <20210812220022.24025-1-mail@muradm.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/freedesktop.scm (greetd): Add greetd 0.7.0 --- gnu/packages/freedesktop.scm | 86 ++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 693a79c738..0be7d0fe4d 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 pineapples +;;; Copyright © 2021 muradm ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) @@ -62,6 +64,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages crates-io) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages databases) #:use-module (gnu packages disk) @@ -862,6 +865,89 @@ that require it. It also provides a universal seat management library that allows applications to use whatever seat management is available.") (license license:expat))) +(define-public greetd + (package + (name "greetd") + (version "0.7.0") + (home-page "https://git.sr.ht/~kennylevinsen/greetd") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0lmwr5ld9x2wlq00i7mjgm9by8zndiq9girj8g93k0kww9zbgr3g")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nix" ,rust-nix-0.17) + ("rust-pam-sys" ,rust-pam-sys-0.5.6) + ("rust-rpassword" ,rust-rpassword-4) + ("rust-users" ,rust-users-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-tokio" ,rust-tokio-0.2) + ("rust-getopts" ,rust-getopts-0.2) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-async-trait" ,rust-async-trait-0.1) + ("rust-enquote" ,rust-enquote-1)) + #:phases + (modify-phases %standard-phases + ;; once https://todo.sr.ht/~kennylevinsen/greetd/25 + ;; is solved, below patch can be removed + (add-after 'unpack 'patch-terminal-switch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "greetd/src/server.rs" + (("switch: true,") + "switch: false,")))) + (delete 'package) + (add-after 'build 'build-man-pages + (lambda* (#:key inputs #:allow-other-keys) + (define (scdoc-cmd doc lvl) + (system (string-append "scdoc < " + doc "-" lvl ".scd > " + doc "." lvl))) + (with-directory-excursion "man" + (scdoc-cmd "greetd" "1") + (scdoc-cmd "greetd" "5") + (scdoc-cmd "greetd-ipc" "7") + (scdoc-cmd "agreety" "1")))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (sbin (string-append out "/sbin")) + (share (string-append out "/share")) + (man (string-append share "/man")) + (man1 (string-append man "/man1")) + (man5 (string-append man "/man5")) + (man7 (string-append man "/man7")) + (release "target/release") + (greetd-bin (string-append release "/greetd")) + (agreety-bin (string-append release "/agreety"))) + (install-file greetd-bin sbin) + (install-file agreety-bin bin) + (with-directory-excursion "man" + (install-file "greetd.1" man1) + (install-file "greetd.5" man5) + (install-file "greetd-ipc.7" man7) + (install-file "agreety.1" man1)))))))) + (native-inputs + `(("linux-pam" ,linux-pam) + ("scdoc" ,scdoc))) + (synopsis "minimal and flexible login manager daemon") + (description + "greetd is a minimal and flexible login manager daemon +that makes no assumptions about what you want to launch. + +If you can run it from your shell in a TTY, greetd can start it. + +If it can be taught to speak a simple JSON-based IPC protocol, +then it can be a greeter.") + (license license:gpl3+))) + (define-public packagekit (package (name "packagekit")