From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id yNmHEil8FWG+fwEAgWs5BA (envelope-from ) for ; Thu, 12 Aug 2021 21:53: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 mp2 with LMTPS id 8LHwDSl8FWGCRAAAB5/wlQ (envelope-from ) for ; Thu, 12 Aug 2021 19:53: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 49B7FB56A for ; Thu, 12 Aug 2021 21:53:12 +0200 (CEST) Received: from localhost ([::1]:49062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEGlK-0003va-TP for larch@yhetil.org; Thu, 12 Aug 2021 15:53:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEGlC-0003vS-QO for guix-patches@gnu.org; Thu, 12 Aug 2021 15:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56634) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEGlC-0007he-JG for guix-patches@gnu.org; Thu, 12 Aug 2021 15:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mEGlC-0007y3-FE for guix-patches@gnu.org; Thu, 12 Aug 2021 15:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49969] [PATCH v2 3/7] 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 19:53: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: Xinglu Chen Cc: 49969@debbugs.gnu.org Received: via spool by 49969-submit@debbugs.gnu.org id=B49969.162879793830575 (code B ref 49969); Thu, 12 Aug 2021 19:53:02 +0000 Received: (at 49969) by debbugs.gnu.org; 12 Aug 2021 19:52:18 +0000 Received: from localhost ([127.0.0.1]:39947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEGkO-0007wu-0L for submit@debbugs.gnu.org; Thu, 12 Aug 2021 15:52:18 -0400 Received: from mail-ed1-f46.google.com ([209.85.208.46]:35448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEGkH-0007wL-Ql for 49969@debbugs.gnu.org; Thu, 12 Aug 2021 15:52:11 -0400 Received: by mail-ed1-f46.google.com with SMTP id dj8so3635926edb.2 for <49969@debbugs.gnu.org>; Thu, 12 Aug 2021 12:52:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=muradm-net.20150623.gappssmtp.com; s=20150623; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=nmjG7UmE7PRsOXZWDAkSICjL8SvES14xpX5bJ0GN+RU=; b=f5cYdaVJJ94W+uXok/kx8rDZTpGw1ULJy1ARCabEgJSJy9N/S6HQHL/774C7Kum6Zc QTNFUSL8at1ln3G0vCSyL1eM9H1j2N9ZTWX/1KqDOP64LMps9fQNv0zju+IShgqKYXLy JKYZtsw5OYGCMcakjmMd+lEFgaDLkgKsxcO4qMI8KKvnaiRAnf6rwL91Q3QtMIV+VPOx XUfUpV/cJvx3KfDDAJa8JhLl62AbNbwtw3oTHnCW0BIOtYnW8MLlrBsDG9zeoimIVEOj 8rplPiwjtpL5l9FJFtWF0kVKoxhqXOOEK0pvqLDHImGLAzrdA/lj/z3U9aX8avop3nex 0CYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=nmjG7UmE7PRsOXZWDAkSICjL8SvES14xpX5bJ0GN+RU=; b=LynfrfeaBMBmfy8mzvJ8NqgemarrQCp3Nl6vkuT9kVT9sYDvcy4hongi3dO/MyrA3t nhaYyCZnGrTU6eweT2qg0towYFSiEXRtu0MLtGKiJqa4PLpkd9TMGS98jlO2+jgs/DlN VLsQhWzi1f/9kSAuMd/Ka+KLnQtvL9mIhiiJjmj6SnIoYHzXtqm8yISpdKCfo9R221Oh tKEx34qtW41XqR3JhbsB5gEpYFKelaCR730F8M8A+UKdKwCmdVFhU6dCdkwECbdVt1G/ F/660SMZYBbFwBPeJ3T0/j6v+DYvRBgYc6x/+q/REtMqMWLqvXYGkb1r0zPTCkZOwulg DZUQ== X-Gm-Message-State: AOAM533BgSVZN//Vr17/FrPFtgIab/1MCo9eimvZuD8pEpDgBaVKlD/P gardcz+gLDNxaZQTXHw+HMIdDtOLApw2Jw== X-Google-Smtp-Source: ABdhPJxwPIF7DUpPOOU9tqekFudo3cEaKRt6hQiCO76EJ76S0cbpa0iRIoJOQmup9+co0sbN2ag6NQ== X-Received: by 2002:aa7:ccc1:: with SMTP id y1mr7446227edt.321.1628797918670; Thu, 12 Aug 2021 12:51:58 -0700 (PDT) Received: from nomad-lp1 ([5.24.104.153]) by smtp.gmail.com with ESMTPSA id jy17sm1171747ejc.112.2021.08.12.12.51.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 12:51:58 -0700 (PDT) References: <20210810193626.9186-1-mail@muradm.net> <20210810200756.9581-3-mail@muradm.net> <87im0c1app.fsf@yoctocell.xyz> <87k0kr68u7.fsf@muradm.net> <8735rej38q.fsf@yoctocell.xyz> User-agent: mu4e 1.4.15; emacs 28.0.50 From: muradm In-reply-to: <8735rej38q.fsf@yoctocell.xyz> Date: Thu, 12 Aug 2021 22:51:55 +0300 Message-ID: <87bl62qw4k.fsf@muradm.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable 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=1628797992; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=nmjG7UmE7PRsOXZWDAkSICjL8SvES14xpX5bJ0GN+RU=; b=Lh/0SJHPjlWPctShOSbI4bDsrUeO+Ft5G+VMb2vTJCERyRU0Mf+VsTTwxzmdjtK34RSlFo zZl0Koipl5pxHPsuY8f88FyXNuZkUhSfE/Qn7ixqw7IYeAOl/nvNu6MBkLxQPq1sDLJoAa 8qqPN438eOBlDrMoUrcZLY4g5jTD7BLJdgR+1GJiVtXbD42JeFTzI0qXCl7IBIscqpy0WY l7zuIZoD/8YR4DZ0/vWfoDohw9bfL5MxU0plDEEh1eWgf+eScRsMr0NBnNtO0TWhSqEOsB 9QwdkWkQrk4Jt/5aqbmPy5NLC1JVv9lsvAs3s/74iVuEnEEfgpMd22zSXIvxxg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628797992; a=rsa-sha256; cv=none; b=ZhZ1zmcoqD2FVvP4C6bAPGA+bsrxGWB3jHquawuJuWYCAWLqz1PNsA76urv9PtiXSdTB1L JNudPRwRASmvMtud2hBHr8bqJMZEI9c4VoZ3MNJxaXVhyKjwPuYjyvWvFDsn6DS1fSq3V3 TvYe9SeXjHmOq1CD5dBhJ4xHLnIhP6cRhBHlgE4pGRROs1rcJLa9jKyaqe/21iYw2ApnCf IQw+gmf2HZnv0Hg+9xo+wzpDyobKI0KE1EKZesuQEZKPfEeVTrFug8g1cjFIOKMGVVDfVK WjvevN/kpja5RUf5KfQ8/t0VWpXdOHqeJCGYj0hfpxvtMaCt99eFTTA2svMyFw== 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=f5cYdaVJ; 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: -1.41 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=muradm-net.20150623.gappssmtp.com header.s=20150623 header.b=f5cYdaVJ; 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: 49B7FB56A X-Spam-Score: -1.41 X-Migadu-Scanner: scn1.migadu.com X-TUID: dI5NJFulPAGt Xinglu Chen writes: > On Wed, Aug 11 2021, muradm wrote: > >> Xinglu Chen writes: >> >>> On Tue, Aug 10 2021, muradm wrote: >>> >>>> * gnu/packages/freedesktop.scm (greetd): Add greetd 0.7.0 >>>> --- >>>> gnu/packages/freedesktop.scm | 80 >>>> ++++++++++++++++++++++++++++++++++++ >>>> 1 file changed, 80 insertions(+) >>>> >>>> diff --git a/gnu/packages/freedesktop.scm >>>> b/gnu/packages/freedesktop.scm >>>> index 693a79c738..631d36e765 100644 >>>> --- a/gnu/packages/freedesktop.scm >>>> +++ b/gnu/packages/freedesktop.scm >>>> @@ -24,6 +24,7 @@ >>>> ;;; Copyright =C2=A9 2020 Raghav Gururajan >>>> >>>> ;;; Copyright =C2=A9 2021 Brendan Tildesley >>>> ;;; Copyright =C2=A9 2021 pineapples=20 >>>> >>>> +;;; Copyright =C2=A9 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,83 @@ 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) >>>> + (replace 'install >>>> + (lambda* (#:key inputs outputs=20 >>>> #: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) >>>> + (mkdir-p man1) >>>> + (mkdir-p man5) >>>> + (mkdir-p man7) >>> >>> No need to =E2=80=98mkdir-p=E2=80=99 if you will call =E2=80=98install-= file=E2=80=99 on the >>> directory. >>> >> >> Didn't work for me, without it I get: >> In procedure copy-file: No such file or directory > > Hmm, weird, the docs for =E2=80=98install-file=E2=80=99 says > > -- Scheme Procedure: install-file FILE DIRECTORY > Create DIRECTORY if it does not exist and copy FILE in=20 > there under > the same name. > Yeah, you are right, there was wrong excursions when i tested, now works as expected, i think i just forgot to delete this=20 comment, thanks. >>>> + (with-directory-excursion "man" >>>> + (system "scdoc < greetd-1.scd > greetd.1") >>>> + (system "scdoc < greetd-5.scd > greetd.5") >>>> + (system "scdoc < greetd-ipc-7.scd > >>>> greetd-ipc.7") >>>> + (system "scdoc < agreety-1.scd >=20 >>>> agreety.1")) >>>> + (install-file "man/greetd.1" man1) >>>> + (install-file "man/greetd.5" man5) >>>> + (install-file "man/greetd-ipc.7" man7) >>>> + (install-file "man/agreety.1" man1) >>> >>> Why not put these four lines inside the >>> (with-directory-excursion "man" >>> =E2=80=A6) form, and remove the "man" prefix? >>> >> >> Refactored, scdoc moved to 'build-man-pages after 'build,=20 >> install >> minimized >> >> (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=20 >> "/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)))))))) >> >> Noted for next update, thanks > > The phases LGTM! > >>>> + (description >>>> + "greetd is a minimal and flexible login manager daemon >>>> +that makes no assumptions about what you want to launch.") >>> >>> =E2=80=9Cwhat you want to launch=E2=80=9D sounds a bit vague, is it ref= erring=20 >>> to >>> desktop >>> environment, window manager, or something else? >> >> As description says anything, it is from official=20 >> documentation. >> Launches any thing, >> could be DE, WM, Emacs, top etc. literally any thing :) > > Ah, OK, then maybe =E2=80=9Cwhat program=E2=80=9D instead of just =E2=80= =9Cwhat=E2=80=9D?=20 > Someone might > try to launch a missile with it ;-) /gnu/store/....-missiles-1.01/bin/launch why not? :D in next update, i will try to put some more sentences from greetd description, it might be more useful may be.