Subject: bug#60798: closed (Re: [bug#60798] [PATCH v2 3/3] gnu: greetd: Use new-style inputs.)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 09 Feb 2023 10:32:02 +0000

Your bug report

#60798: [PATCH] gnu: greetd: Update to 0.9.0.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
60798: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60798
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#60798] [PATCH v2 3/3] gnu: greetd: Use new-style inputs.
From: Jelle Licht <[email-masked]>
To: [email-masked]
Cc: Felix Lechner <[email-masked]>
Date: Thu, 09 Feb 2023 11:31:48 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi Felix,

Felix Lechner via Guix-patches via <[email-masked]> writes:

> * gnu/packages/admin.scm (greetd)[inputs]: Use new-style inputs.
> ---
>  gnu/packages/admin.scm | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index d111e4e3d6..af08a1ca18 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -5259,8 +5259,7 @@ (define (scdoc-cmd doc lvl)
>                   (install-file "greetd-ipc.7" man7)
>                   (install-file "agreety.1" man1))))))))
>      (native-inputs
> -     `(("linux-pam" ,linux-pam)
> -       ("scdoc" ,scdoc)))
> +     (list linux-pam scdoc))
>      (synopsis "Minimal and flexible login manager daemon")
>      (description
>       "greetd is a minimal and flexible login manager daemon
> -- 
> 2.38.1

Pushed the v2 series to master, with a slight tweak to the commit
message. Thanks!

Subject: [PATCH] gnu: greetd: Update to 0.9.0.
From: Felix Lechner <[email-masked]>
To: [email-masked]
Cc: Felix Lechner <[email-masked]>
Date: Fri, 13 Jan 2023 14:08:59 -0800
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/admin.scm (greetd): Update to 0.9.0.
Use new style native-inputs.
* gnu/packages/crates-io.scm (rust-nix-0.26): New variable.
---
 gnu/packages/admin.scm     |  9 ++++-----
 gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 9efedda74a..af08a1ca18 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -5199,7 +5199,7 @@ (define-public udpcast
 (define-public greetd
   (package
     (name "greetd")
-    (version "0.8.0")
+    (version "0.9.0")
     (home-page "https://git.sr.ht/~kennylevinsen/greetd")
     (source (origin
               (method git-fetch)
@@ -5208,11 +5208,11 @@ (define-public greetd
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
-               (base32 "0x5c3jkw09kvj2grcxm899y2n6ws8p990cyp9cs0fy6lm4fzlh6v"))))
+               (base32 "1b79lb0vikh5vwpdlyga6zwzm11gpsd7ghp8zb0q2m6mlqlj5by3"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-nix" ,rust-nix-0.19)
+       (("rust-nix" ,rust-nix-0.26)
         ("rust-pam-sys" ,rust-pam-sys-0.5)
         ("rust-rpassword" ,rust-rpassword-5)
         ("rust-users" ,rust-users-0.11)
@@ -5259,8 +5259,7 @@ (define (scdoc-cmd doc lvl)
                  (install-file "greetd-ipc.7" man7)
                  (install-file "agreety.1" man1))))))))
     (native-inputs
-     `(("linux-pam" ,linux-pam)
-       ("scdoc" ,scdoc)))
+     (list linux-pam scdoc))
     (synopsis "Minimal and flexible login manager daemon")
     (description
      "greetd is a minimal and flexible login manager daemon
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1203d10b67..21b6d4c077 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -35384,17 +35384,17 @@ (define-public rust-nitrokey-test-state-0.1
 nitrokey-test crate.")
     (license license:gpl3+)))
 
-(define-public rust-nix-0.24
+(define-public rust-nix-0.26
   (package
     (name "rust-nix")
-    (version "0.24.2")
+    (version "0.26.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "nix" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1z35n1bhzslr7zawy2c0fl90jjy9l5b3lnsidls3908vfk0xnp0r"))))
+        (base32 "155610n6bp37sqg7p0qihzi0jnvqkpqc40nyik89frbc6lfqv9a6"))))
     (build-system cargo-build-system)
     (arguments
      (list #:skip-build? #t
@@ -35402,7 +35402,7 @@ (define-public rust-nix-0.24
            `(("rust-bitflags" ,rust-bitflags-1)
              ("rust-cfg-if" ,rust-cfg-if-1)
              ("rust-libc" ,rust-libc-0.2)
-             ("rust-memoffset" ,rust-memoffset-0.6))))
+             ("rust-memoffset" ,rust-memoffset-0.7))))
     (home-page "https://github.com/nix-rust/nix")
     (synopsis "Rust friendly bindings to *nix APIs")
     (description
@@ -35411,6 +35411,26 @@ (define-public rust-nix-0.24
 while still providing platform specific APIs.")
     (license license:expat)))
 
+(define-public rust-nix-0.24
+  (package
+    (inherit rust-nix-0.26)
+    (name "rust-nix")
+    (version "0.24.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "nix" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1z35n1bhzslr7zawy2c0fl90jjy9l5b3lnsidls3908vfk0xnp0r"))))
+    (arguments
+     (list #:skip-build? #t
+           #:cargo-inputs
+           `(("rust-bitflags" ,rust-bitflags-1)
+             ("rust-cfg-if" ,rust-cfg-if-1)
+             ("rust-libc" ,rust-libc-0.2)
+             ("rust-memoffset" ,rust-memoffset-0.6))))))
+
 (define-public rust-nix-0.23
   (package
     (inherit rust-nix-0.24)

base-commit: 0f85081ed1d99be57d3544e0307e7fa9ca043be9
-- 
2.38.1