From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id RqeWMoltHmFt9AAAgWs5BA (envelope-from ) for ; Thu, 19 Aug 2021 16:41:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id CDesLYltHmEJUQAA1q6Kng (envelope-from ) for ; Thu, 19 Aug 2021 14:41:13 +0000 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 6D21316EE1 for ; Thu, 19 Aug 2021 16:41:13 +0200 (CEST) Received: from localhost ([::1]:51204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGjEG-0007tM-Ha for larch@yhetil.org; Thu, 19 Aug 2021 10:41:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGjD8-0006W5-SF for guix-patches@gnu.org; Thu, 19 Aug 2021 10:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49025) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mGjD8-0005tb-IG for guix-patches@gnu.org; Thu, 19 Aug 2021 10:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mGjD8-0000Ku-F4 for guix-patches@gnu.org; Thu, 19 Aug 2021 10:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49969] [PATCH v4 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, 19 Aug 2021 14:40:02 +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.16293839731184 (code B ref 49969); Thu, 19 Aug 2021 14:40:02 +0000 Received: (at 49969) by debbugs.gnu.org; 19 Aug 2021 14:39:33 +0000 Received: from localhost ([127.0.0.1]:60551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mGjCZ-0000IW-Ft for submit@debbugs.gnu.org; Thu, 19 Aug 2021 10:39:32 -0400 Received: from mail-ej1-f44.google.com ([209.85.218.44]:37782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mGjCV-0000Hh-8j for 49969@debbugs.gnu.org; Thu, 19 Aug 2021 10:39:25 -0400 Received: by mail-ej1-f44.google.com with SMTP id h9so13442173ejs.4 for <49969@debbugs.gnu.org>; Thu, 19 Aug 2021 07:39:23 -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=iKIEPRgsK/zmp47VzGKwZKvsHQHZQ4+FxLcUWNU5T9A=; b=1mz/agn36BSOP3irCIwVLa5y2/CpPJGYmWH5eGJ+iQduMhAqhl+GtnA9b4dH5+v8pS DN3gQTaXK1cGFb6bKrLgwwsDXzDgSLSV7+yj/xhTQsF+EnI5jmTWoEpMuMDMwIZYctqD BHbNL7LaGYX4uvNBF611h3zWQeesq4BlwHyIONjCPYPI4XlPn5fmyTRJxvmDYLTXFsbM medscKoenQxy4U8SJZYI1V+glWFyGJO4+T+HvCNXUabp3M1gdyDDv47pDwJlwR+8v+9+ 3eL5ku/lXL77kNAkTdCLRDc4Ov33MUeXYambAsTpwBbrHoRriinD3jHJbfCSJqiGxIAe +0ew== 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=iKIEPRgsK/zmp47VzGKwZKvsHQHZQ4+FxLcUWNU5T9A=; b=fqNYjtAxsvDdbfRQX93PED3HJ+0yolFmaMmlAgYVqWzofb6cwM2XqnpcgBIPMqaIfl jolmx5Xaz4EWy3GhT+mYFQ+K7g+cG8+siaXKi/v4GnrEvnoJs6xX86VW0NoDBvY71DWm /4zTR0c6ogLqzurVwx0On3nLALakrwMVTtq8ARGF6KwoZxwVA98ywn2HrnppdxNB2HGT +kOUgoE3HfPP+yMQI6Lmt8blZw4u/LEjfngYVJT7bbqS0siSIoy35uo1Oa8JZeG3Oh1i Rvak1ponVaVwgKkxBGQ25FBgxUNfCQ9f32WBigGJPpZbiFt7w4hyPEfLv84+4qa3NpKP 8OEw== X-Gm-Message-State: AOAM530MaqMdvL0F2OF4F3MpbgCLo+qPlMvaJ2/LjRkvNGLB65PefNJw 81ODzLncOYVWTa4405YHX6LoyxEw+VgxLQ== X-Google-Smtp-Source: ABdhPJyf0rx8eNbFZe4YbRUnxic2xAkAq+xFGsm0gf3T7X6Qg7J7pcs1KjkwBHFiDaNlh7k8SOatuA== X-Received: by 2002:a17:906:b09:: with SMTP id u9mr15681539ejg.496.1629383957344; Thu, 19 Aug 2021 07:39:17 -0700 (PDT) Received: from localhost.localdomain ([188.58.13.35]) by smtp.gmail.com with ESMTPSA id b8sm1825954edv.96.2021.08.19.07.39.16 for <49969@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 07:39:16 -0700 (PDT) From: muradm Date: Thu, 19 Aug 2021 17:38:59 +0300 Message-Id: <20210819143906.6705-3-mail@muradm.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210819143133.6398-1-mail@muradm.net> References: <20210819143133.6398-1-mail@muradm.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629384073; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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=iKIEPRgsK/zmp47VzGKwZKvsHQHZQ4+FxLcUWNU5T9A=; b=SRXoQm18CvvxByzTeL/E7HzAVL5ub7eO/zKdWzqBaX9JxFq7nT6F1SskXupWpSh+q2CPcz gbK4WNF3qhtEF+JJxiIc1Np6Gq4yvQuq9nntckgAyzHvVg0wSVNd61xevPuO+W+DNHN4S+ 9cx4lfnfWJXqP20kq4Lu1RAsqZGYcNhYLAa9v6rO276fIE6saIsaUST0KHmffe79bkp6kY cTnrKsmGjtHGPqnzvoY/iy3y/aG6QzoFHdFZ2aEh9fIczFSMLnoISuvaRbC0msYCQB7GO9 /EZ81FKoyUf45zDSud3rc/Pv7PMOiuYKZPLJPpCmt1ulRi5FJxpjAIuLa9pMvw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629384073; a=rsa-sha256; cv=none; b=OJKiQBZnW5bSiETj9SIeqMgA7/y94RiwcD9+7JFgLoLb6TvFjNAyx4m7teqwBl0ZHcgc0r mEp+woRShIX1S4fRB96gzj6TZjI0CguggdaqijCq04/soPDfcXPWCxOUxOHRQdKFY5E+lI vE0JkOUcASbs9YcDHZdyZ4BoSML3QfMsTF8W/jXWu2STkNipE1p05fvfO+rclK/ZKOSKuX vV6L9+Fhb69X4L65Os0c0JhJoSQdyphXujNv+r4jsUmyIh+22oh+NNAyKIbHjdpcmpMHe6 IHRQ1vZ1DI9EwS3sUTi2OhPAaVcml7/Oc/gWv/c6Duv7oqvakRUe4RDIUHK0Fg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=muradm-net.20150623.gappssmtp.com header.s=20150623 header.b="1mz/agn3"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=muradm-net.20150623.gappssmtp.com header.s=20150623 header.b="1mz/agn3"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 6D21316EE1 X-Spam-Score: -0.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: S8YU63cIhWTI * gnu/packages/freedesktop.scm (greetd): Add greetd 0.7.0 --- gnu/packages/freedesktop.scm | 120 +++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 693a79c738..ba5f6b0f99 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,123 @@ 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 + ;; issue with terminal activation solved by this feature: + ;; https://lists.sr.ht/~kennylevinsen/greetd-devel/patches/24441 + ;; greetd-next builds from head of #24441 + ;; below substitute is provided as workaround for tagged version + (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 greetd-next + (package + (inherit greetd) + (name "greetd") + (version "0.7.0-next") + (source (origin + (method git-fetch) + (uri (git-reference + (url (package-home-page greetd)) + (commit "87e92776543c224676d64316f4519b509c21a0d5"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13dblvhx5vbsx0yqyz2sq1ayffqwadbkn90p52wd5b66ij1z6v1a")))) + (arguments + (substitute-keyword-arguments (package-arguments greetd) + ((#:cargo-inputs inputs) + `(("rust-nix" ,rust-nix-0.19) + ("rust-pam-sys" ,rust-pam-sys-0.5.6) + ("rust-rpassword" ,rust-rpassword-5) + ("rust-users" ,rust-users-0.11) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-tokio" ,rust-tokio-1) + ("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 phases) + `(modify-phases ,phases + (delete 'patch-terminal-switch))))))) + (define-public packagekit (package (name "packagekit") -- 2.32.0