From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0J6nG+guFGGhjQAAgWs5BA (envelope-from ) for ; Wed, 11 Aug 2021 22:11:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 4B80F+guFGG3IQAAbx9fmQ (envelope-from ) for ; Wed, 11 Aug 2021 20:11:20 +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 3FD1D15ADA for ; Wed, 11 Aug 2021 22:11:19 +0200 (CEST) Received: from localhost ([::1]:51370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDuZK-0004Pf-1A for larch@yhetil.org; Wed, 11 Aug 2021 16:11:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDuZ5-0004Ot-Jw for guix-patches@gnu.org; Wed, 11 Aug 2021 16:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDuZ4-0001Sm-8Q for guix-patches@gnu.org; Wed, 11 Aug 2021 16:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mDuZ4-0001cJ-0N for guix-patches@gnu.org; Wed, 11 Aug 2021 16:11: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: Wed, 11 Aug 2021 20:11:01 +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.16287126596202 (code B ref 49969); Wed, 11 Aug 2021 20:11:01 +0000 Received: (at 49969) by debbugs.gnu.org; 11 Aug 2021 20:10:59 +0000 Received: from localhost ([127.0.0.1]:36697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDuYu-0001br-TG for submit@debbugs.gnu.org; Wed, 11 Aug 2021 16:10:58 -0400 Received: from mail-ej1-f41.google.com ([209.85.218.41]:42815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDuYs-0001bb-Kl for 49969@debbugs.gnu.org; Wed, 11 Aug 2021 16:10:51 -0400 Received: by mail-ej1-f41.google.com with SMTP id e19so6635096ejs.9 for <49969@debbugs.gnu.org>; Wed, 11 Aug 2021 13:10:50 -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=Zwh7Vq/uY/0clqVX5DDuKNqzLTh+8XiCTfmEcW9RryI=; b=Dxj7x8w/VATlM9aRvxw6PUrgLXbGNZIm9oVowVswIkr6IiauvGrkk/Ib7HCvUU/o0j osb7SQ20stwHmH7pdVI8OGAxSaCHFrpsCw9efx9kElFfHY/lIumlWDM6/IGq2cguvPl/ GFEHiWFTjIoPoDwnpZThCHalEtUmz/+qlaxVN1eNNbjqxpQzsuZA14Z3qpxWopGk2n+p O2L2Vnt7Zlcb5JIxd1VcZWhFmjsz+gbSHJ7jTpFIZTWikgY6NPOzowKuHmh6UT0/CkSL HuHH8eAmgl6zscpFU001ies9Q5y6cwQ7y06+vGN1mmUOKCZfgRBBRYY2rSbcmvDuVeom I/Vg== 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=Zwh7Vq/uY/0clqVX5DDuKNqzLTh+8XiCTfmEcW9RryI=; b=YSSR/fHWZSxkDRfQ/mrGpy+9nES2XtzN/GxVpJJrZiijcn4nuKU/SimxH5tl/W80v3 C22gsjawuyZxQeb6YKKyv6gYfVmRmjguSzSx3LVFXr4mmcubXGygmW3Qf0S/5srTRwMi kS4adY4TNDxpTdk06nj8TYcod53osFuAo35Ypg4QoO6cFPe+xugT8EE0z9dl4qpVqALC 1u7cdSMnia+1lu3uUFlp2DuM2JZDiCuVzKjBhlaB66eGj0sUEJkoDbnl3thytgGTy+KM cFIVHsYUydm6F9fCtCpawQv242EJduqBxk4wvWO/hyutIizkX5i01SbL7Pw5ILlVX+ln gp2A== X-Gm-Message-State: AOAM5336bFf5+ipdNBNfSB68hv18xuZHN0OrE2hI572OsZIh4/Ucm7ef W1Jw1ViwoVb8oLEMKa8cCaIVR3B7aAeWTA== X-Google-Smtp-Source: ABdhPJwyB7YAqWhtd7wdMQ5Cdiw83WKrkyzFzXz2ioiNelh9dseW+Rb37zURTX/fp+pYQlrMp4gL1Q== X-Received: by 2002:a17:906:9616:: with SMTP id s22mr282294ejx.136.1628712644103; Wed, 11 Aug 2021 13:10:44 -0700 (PDT) Received: from nomad-lp1 ([31.142.104.228]) by smtp.gmail.com with ESMTPSA id ck3sm118574edb.80.2021.08.11.13.10.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 13:10:43 -0700 (PDT) References: <20210810193626.9186-1-mail@muradm.net> <20210810200756.9581-3-mail@muradm.net> <87im0c1app.fsf@yoctocell.xyz> User-agent: mu4e 1.4.15; emacs 28.0.50 From: muradm In-reply-to: <87im0c1app.fsf@yoctocell.xyz> Date: Wed, 11 Aug 2021 23:10:40 +0300 Message-ID: <87k0kr68u7.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=1628712680; 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=Zwh7Vq/uY/0clqVX5DDuKNqzLTh+8XiCTfmEcW9RryI=; b=OhUHpM8mEeGDCVbZSDl26bbAq916txgZGrC80KDgS/e6/6dqP6wRS6Kk59b+Epta1+JwQ2 GOk3U1tqI2L12/q6A3K4sGdtGOd4D+ktJPF6BjIBiZdCiEViDZFyqUadTdGSnGPY+UaRu9 wL3GyF/al3GQUWLriN4/alRF+6rdUaxEMZpAImilbXLy4AeUw7Xgi5vszTCQ/hKVlEwQvE Rr1LK0gXZlumTEEgdnnmwyBzvPQQucmHer79iFbzLgsRla47p58EvkU4JOLAa40TO+GJaG CkBTOd7AxR8VPhVt0Dj3b1A+/nJSnyQnZXM9SGDlRcThcMSW0arcqQhJ+2Vo9g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628712680; a=rsa-sha256; cv=none; b=TCa58Q0DUCsC9hAxiywolKBpDPaD4Rx80LQztmJ8fQ37BFQj7yE+jFUZSavZHLehoS0wlQ gtaq27k8avf3fFP1VGNTUaokq0yOWpFurKJtKaKoGJuvOUwbyJ9lZHq5d8IDidMKU/prKJ NdI3sn7jri7fivsoLTdJ9V7dEyPVTV2c8Rhld/CJi5NdwbALx7PM2OkKDoA6neJv3yczlZ ODDmq5MedrpPIvskXvil98TpK+YmmSWTKj45AzZffESTjFMIWL3Z1CUMB8Iusz0x/vYHhx XpDl/99HNBNbT62ygZryB2jgWBkmgbBVPlyq/s19GFAM17RZbjQCmKq9+jcEPA== 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="Dxj7x8w/"; 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="Dxj7x8w/"; 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: 3FD1D15ADA X-Spam-Score: -1.41 X-Migadu-Scanner: scn0.migadu.com X-TUID: jkBhYiph4P9L 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=20 >> ++++++++++++++++++++++++++++++++++++ >> 1 file changed, 80 insertions(+) >> >> diff --git a/gnu/packages/freedesktop.scm=20 >> 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=20 >> >> ;;; Copyright =C2=A9 2021 Brendan Tildesley >> ;;; Copyright =C2=A9 2021 pineapples >> +;;; 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=20 >> universal seat management library that >> allows applications to use whatever seat management is=20 >> 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=20 >> "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 #: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=20 >> "/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-fi= le=E2=80=99 on the=20 > directory. > Didn't work for me, without it I get: In procedure copy-file: No such file or directory >> + (with-directory-excursion "man" >> + (system "scdoc < greetd-1.scd > greetd.1") >> + (system "scdoc < greetd-5.scd > greetd.5") >> + (system "scdoc < greetd-ipc-7.scd >=20 >> greetd-ipc.7") >> + (system "scdoc < agreety-1.scd > 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=20 > (with-directory-excursion "man" > =E2=80=A6) form, and remove the "man" prefix? > Refactored, scdoc moved to 'build-man-pages after 'build, install=20 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 "/greetd")) (agreety-bin (string-append release=20 "/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 >> + #t)))))) > > Phases don=E2=80=99t need to return #t once the =E2=80=98core-updates=E2= =80=99 branch=20 > gets > merged. > Left over, i was using this to fail package build, noted for next=20 update, thanks >> + (native-inputs >> + `(("linux-pam" ,linux-pam) >> + ("scdoc" ,scdoc))) >> + (synopsis >> + "greetd is a minimal and flexible login manager daemon >> +that makes no assumptions about what you want to launch.") > > The synosis is a bit long, maybe > > Minimal and flexible login manager daemon > Noted for next update, thanks >> + (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 refer= ring to=20 > desktop > environment, window manager, or something else? As description says anything, it is from official documentation.=20 Launches any thing, could be DE, WM, Emacs, top etc. literally any thing :)