[PATCH] gnu: greetd: Update to 0.9.0.

  • Done
  • quality assurance status badge
Details
2 participants
  • Felix Lechner
  • Jelle Licht
Owner
unassigned
Submitted by
Felix Lechner
Severity
normal
F
F
Felix Lechner wrote on 13 Jan 2023 23:08
(address . guix-patches@gnu.org)(name . Felix Lechner)(address . felix.lechner@lease-up.com)
20230113220859.32326-1-felix.lechner@lease-up.com
* 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(-)

Toggle diff (102 lines)
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
F
F
Felix Lechner wrote on 17 Jan 2023 19:19
[PATCH v2 1/3] gnu: rust-nix-0.26: New variable.
(address . 60798@debbugs.gnu.org)(name . Felix Lechner)(address . felix.lechner@lease-up.com)
20230117181932.15222-1-felix.lechner@lease-up.com
* gnu/packages/crates-io.scm (rust-nix-0.26): New variable.
---
gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)

Toggle diff (65 lines)
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: ecda67a577570f412b103e5dd8ed1a44193a9c11
--
2.38.1
F
F
Felix Lechner wrote on 17 Jan 2023 19:19
[PATCH v2 2/3] gnu: greetd: Update to 0.9.0.
(address . 60798@debbugs.gnu.org)(name . Felix Lechner)(address . felix.lechner@lease-up.com)
20230117181932.15222-2-felix.lechner@lease-up.com
* gnu/packages/admin.scm (greetd): Update to 0.9.0.
---
gnu/packages/admin.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (29 lines)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 9efedda74a..d111e4e3d6 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)
--
2.38.1
F
F
Felix Lechner wrote on 17 Jan 2023 19:19
[PATCH v2 3/3] gnu: greetd: Use new-style inputs.
(address . 60798@debbugs.gnu.org)(name . Felix Lechner)(address . felix.lechner@lease-up.com)
20230117181932.15222-3-felix.lechner@lease-up.com
* gnu/packages/admin.scm (greetd)[inputs]: Use new-style inputs.
---
gnu/packages/admin.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
J
J
Jelle Licht wrote on 9 Feb 2023 11:31
(address . 60798-done@debbugs.gnu.org)(name . Felix Lechner)(address . felix.lechner@lease-up.com)
87edqzjfjf.fsf@fsfe.org
Hi Felix,

Felix Lechner via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (22 lines)
> * 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!
Closed
?