[bug#68742] [PATCH] gnu: river: add river.desktop on wayland-sessions

all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed

* [bug#68742] [PATCH] gnu: river: add river.desktop on wayland-sessions
@ 2024-01-26 17:09 Erik Eduardo
  2024-01-29 16:41 ` Ekaitz Zarraga
                   ` (4 more replies)
  0 siblings, 5 replies; 9+ messages in thread
From: Erik Eduardo @ 2024-01-26 17:09 UTC (permalink / raw)
  To: 68742; +Cc: Erik Eduardo, Ekaitz Zarraga

From: Erik Eduardo <erikeah@protonmail.com>

This patch will allow to login from login managers or display managers
to River.

Changes:

  - Creates a directory at share named wayland-sessions
  - Install a desktop file from repo inside share/wayland-sessions

This is my first patch, please be patient and give me feedback, I will
do my best.

Change-Id: Iea8999cf97bedc8fb7ede4dd22b8f0f9529d2fa1
---
 gnu/packages/zig-xyz.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 200b5c9940..ca73c6bad8 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -52,7 +52,16 @@ (define-public river
     (build-system zig-build-system)
     (arguments
      (list
-      #:zig-build-flags #~(list "-Dxwayland")   ;experimental xwayland support
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'install 'install-extra-files
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let* ((out (assoc-ref outputs "out"))
+                              (wayland-sessions (string-append out
+                                                 "/share/wayland-sessions")))
+                         (mkdir-p wayland-sessions)
+                         (install-file "contrib/river.desktop"
+                                       wayland-sessions)))))
+      #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
       #:zig-release-type "safe"))
     (native-inputs (list libevdev
                          libxkbcommon

base-commit: 2266754382bce43789976aec65181cb5085c8bc4
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [bug#68742] [PATCH] gnu: river: add river.desktop on wayland-sessions
  2024-01-26 17:09 [bug#68742] [PATCH] gnu: river: add river.desktop on wayland-sessions Erik Eduardo
@ 2024-01-29 16:41 ` Ekaitz Zarraga
  2024-01-31  8:32 ` [bug#68742] [PATCH] gnu: river: Add river.desktop file Erik Eduardo
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 9+ messages in thread
From: Ekaitz Zarraga @ 2024-01-29 16:41 UTC (permalink / raw)
  To: Erik Eduardo, 68742; +Cc: Erik Eduardo

Hi

On 2024-01-26 18:09, Erik Eduardo wrote:
> From: Erik Eduardo <erikeah@protonmail.com>
> 
> This patch will allow to login from login managers or display managers
> to River.
> 
> Changes:
> 
>    - Creates a directory at share named wayland-sessions
>    - Install a desktop file from repo inside share/wayland-sessions
> 
> This is my first patch, please be patient and give me feedback, I will
> do my best.
> 
> Change-Id: Iea8999cf97bedc8fb7ede4dd22b8f0f9529d2fa1
> ---
>   gnu/packages/zig-xyz.scm | 11 ++++++++++-
>   1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
> index 200b5c9940..ca73c6bad8 100644
> --- a/gnu/packages/zig-xyz.scm
> +++ b/gnu/packages/zig-xyz.scm
> @@ -52,7 +52,16 @@ (define-public river
>       (build-system zig-build-system)
>       (arguments
>        (list
> -      #:zig-build-flags #~(list "-Dxwayland")   ;experimental xwayland support
> +      #:phases #~(modify-phases %standard-phases
> +                   (add-after 'install 'install-extra-files
> +                     (lambda* (#:key outputs #:allow-other-keys)
> +                       (let* ((out (assoc-ref outputs "out"))
> +                              (wayland-sessions (string-append out
> +                                                 "/share/wayland-sessions")))
> +                         (mkdir-p wayland-sessions)
> +                         (install-file "contrib/river.desktop"
> +                                       wayland-sessions)))))
> +      #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
>         #:zig-release-type "safe"))
>       (native-inputs (list libevdev
>                            libxkbcommon
> 
> base-commit: 2266754382bce43789976aec65181cb5085c8bc4


Looks good to me, but guix commits follow changelog format:

https://www.gnu.org/prep/standards/standards.html#Change-Logs

The rest of it looks ok. Please resend with the message fixed and I'll 
take a further look.

Thanks a lot for contributing to Guix.

Ekaitz




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#68742] [PATCH] gnu: river: Add river.desktop file.
  2024-01-26 17:09 [bug#68742] [PATCH] gnu: river: add river.desktop on wayland-sessions Erik Eduardo
  2024-01-29 16:41 ` Ekaitz Zarraga
@ 2024-01-31  8:32 ` Erik Eduardo
  2024-02-08 17:32 ` [bug#68742] [PATCH v3] " Erik Eduardo
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 9+ messages in thread
From: Erik Eduardo @ 2024-01-31  8:32 UTC (permalink / raw)
  To: 68742; +Cc: Erik Eduardo, Ekaitz Zarraga

From: Erik Eduardo <erikeah@protonmail.com>

* gnu/packages/zig-xyz.scm (river)[arguments]: Add 'install-extra-files
  phase after 'install phase to install the river.desktop file inside
  share/wayland-sessions directory.

Change-Id: I19fbcfa09a6b06ed602ec4be1b06cc6e2cd2a9a1
---
 gnu/packages/zig-xyz.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 200b5c9940..ca73c6bad8 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -52,7 +52,16 @@ (define-public river
     (build-system zig-build-system)
     (arguments
      (list
-      #:zig-build-flags #~(list "-Dxwayland")   ;experimental xwayland support
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'install 'install-extra-files
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let* ((out (assoc-ref outputs "out"))
+                              (wayland-sessions (string-append out
+                                                 "/share/wayland-sessions")))
+                         (mkdir-p wayland-sessions)
+                         (install-file "contrib/river.desktop"
+                                       wayland-sessions)))))
+      #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
       #:zig-release-type "safe"))
     (native-inputs (list libevdev
                          libxkbcommon

base-commit: 66dd088d3c3404f5cbe2d4d4c5e8f93d184703b0
-- 
2.41.0

Thanks a lot for the welcoming! Here it's the patch with commit message fixed.





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [bug#68742] [PATCH v3] gnu: river: Add river.desktop file.
  2024-01-26 17:09 [bug#68742] [PATCH] gnu: river: add river.desktop on wayland-sessions Erik Eduardo
  2024-01-29 16:41 ` Ekaitz Zarraga
  2024-01-31  8:32 ` [bug#68742] [PATCH] gnu: river: Add river.desktop file Erik Eduardo
@ 2024-02-08 17:32 ` Erik Eduardo
  2024-02-08 19:08   ` Ekaitz Zarraga
  2024-02-09 14:13   ` Ekaitz Zarraga
  2024-02-14 12:19 ` [bug#68742] [PATCH v4] " Erik Eduardo
  2024-02-14 12:31 ` [bug#68742] QA review for 68742 Ekaitz Zarraga
  4 siblings, 2 replies; 9+ messages in thread
From: Erik Eduardo @ 2024-02-08 17:32 UTC (permalink / raw)
  To: 68742; +Cc: Erik Eduardo, Ekaitz Zarraga

* gnu/packages/zig-xyz.scm (river)[arguments]: Add
  'install-wayland-session phase after 'install phase to install the
  river.desktop file inside share/wayland-sessions directory

Change-Id: I19fbcfa09a6b06ed602ec4be1b06cc6e2cd2a9a1
---
 gnu/packages/zig-xyz.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 200b5c9940..8343555660 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -52,7 +52,16 @@ (define-public river
     (build-system zig-build-system)
     (arguments
      (list
-      #:zig-build-flags #~(list "-Dxwayland")   ;experimental xwayland support
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'install 'install-wayland-session
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let* ((out (assoc-ref outputs "out"))
+                              (wayland-sessions (string-append out
+                                                 "/share/wayland-sessions")))
+                         (mkdir-p wayland-sessions)
+                         (install-file "contrib/river.desktop"
+                                       wayland-sessions)))))
+      #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
       #:zig-release-type "safe"))
     (native-inputs (list libevdev
                          libxkbcommon

base-commit: cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [bug#68742] [PATCH v3] gnu: river: Add river.desktop file.
  2024-02-08 17:32 ` [bug#68742] [PATCH v3] " Erik Eduardo
@ 2024-02-08 19:08   ` Ekaitz Zarraga
  2024-02-09 14:13   ` Ekaitz Zarraga
  1 sibling, 0 replies; 9+ messages in thread
From: Ekaitz Zarraga @ 2024-02-08 19:08 UTC (permalink / raw)
  To: Erik Eduardo, 68742

Hi,

On 2024-02-08 18:32, Erik Eduardo wrote:
> * gnu/packages/zig-xyz.scm (river)[arguments]: Add
>    'install-wayland-session phase after 'install phase to install the
>    river.desktop file inside share/wayland-sessions directory
> 
> Change-Id: I19fbcfa09a6b06ed602ec4be1b06cc6e2cd2a9a1
> ---
>   gnu/packages/zig-xyz.scm | 11 ++++++++++-
>   1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
> index 200b5c9940..8343555660 100644
> --- a/gnu/packages/zig-xyz.scm
> +++ b/gnu/packages/zig-xyz.scm
> @@ -52,7 +52,16 @@ (define-public river
>       (build-system zig-build-system)
>       (arguments
>        (list
> -      #:zig-build-flags #~(list "-Dxwayland")   ;experimental xwayland support
> +      #:phases #~(modify-phases %standard-phases
> +                   (add-after 'install 'install-wayland-session
> +                     (lambda* (#:key outputs #:allow-other-keys)
> +                       (let* ((out (assoc-ref outputs "out"))
> +                              (wayland-sessions (string-append out
> +                                                 "/share/wayland-sessions")))
> +                         (mkdir-p wayland-sessions)
> +                         (install-file "contrib/river.desktop"
> +                                       wayland-sessions)))))
> +      #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
>         #:zig-release-type "safe"))
>       (native-inputs (list libevdev
>                            libxkbcommon
> 
> base-commit: cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d


Looks good to me. But I don't have commit access.

If I get access I'll push. Also if someone wants to push this, I'll be 
grateful.

Let's hope it is pushed soon.

Thanks!





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#68742] [PATCH v3] gnu: river: Add river.desktop file.
  2024-02-08 17:32 ` [bug#68742] [PATCH v3] " Erik Eduardo
  2024-02-08 19:08   ` Ekaitz Zarraga
@ 2024-02-09 14:13   ` Ekaitz Zarraga
  1 sibling, 0 replies; 9+ messages in thread
From: Ekaitz Zarraga @ 2024-02-09 14:13 UTC (permalink / raw)
  To: Erik Eduardo, 68742; +Cc: Erik Eduardo

On 2024-02-08 18:32, Erik Eduardo wrote:
> * gnu/packages/zig-xyz.scm (river)[arguments]: Add
>    'install-wayland-session phase after 'install phase to install the
>    river.desktop file inside share/wayland-sessions directory
> 
> Change-Id: I19fbcfa09a6b06ed602ec4be1b06cc6e2cd2a9a1
> ---
>   gnu/packages/zig-xyz.scm | 11 ++++++++++-
>   1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
> index 200b5c9940..8343555660 100644
> --- a/gnu/packages/zig-xyz.scm
> +++ b/gnu/packages/zig-xyz.scm
> @@ -52,7 +52,16 @@ (define-public river
>       (build-system zig-build-system)
>       (arguments
>        (list
> -      #:zig-build-flags #~(list "-Dxwayland")   ;experimental xwayland support
> +      #:phases #~(modify-phases %standard-phases
> +                   (add-after 'install 'install-wayland-session
> +                     (lambda* (#:key outputs #:allow-other-keys)
> +                       (let* ((out (assoc-ref outputs "out"))
> +                              (wayland-sessions (string-append out
> +                                                 "/share/wayland-sessions")))
> +                         (mkdir-p wayland-sessions)
> +                         (install-file "contrib/river.desktop"
> +                                       wayland-sessions)))))
> +      #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
>         #:zig-release-type "safe"))
>       (native-inputs (list libevdev
>                            libxkbcommon
> 
> base-commit: cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d

Oh Erik!
But we are missing something very important here!

Add your copyright header to the top of the file, the rest of us feel 
alone there in the top. We need some company.

You can also use `#$output` instead of `(assoc-ref outputs "out")`, 
which might be cool to use, as you are already using a gexp in the 
phases for example.

Please send a new version and I'll mark it as reviewed (now I learned 
how to do it :) )

Best,
Ekaitz




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#68742] [PATCH v4] gnu: river: Add river.desktop file.
  2024-01-26 17:09 [bug#68742] [PATCH] gnu: river: add river.desktop on wayland-sessions Erik Eduardo
                   ` (2 preceding siblings ...)
  2024-02-08 17:32 ` [bug#68742] [PATCH v3] " Erik Eduardo
@ 2024-02-14 12:19 ` Erik Eduardo
  2024-02-14 12:31 ` [bug#68742] QA review for 68742 Ekaitz Zarraga
  4 siblings, 0 replies; 9+ messages in thread
From: Erik Eduardo @ 2024-02-14 12:19 UTC (permalink / raw)
  To: 68742; +Cc: Erik Eduardo, Ekaitz Zarraga

* gnu/packages/zig-xyz.scm (river)[arguments]: Add
  'install-wayland-session phase after 'install phase to install the
  river.desktop file inside share/wayland-sessions directory

Change-Id: I19fbcfa09a6b06ed602ec4be1b06cc6e2cd2a9a1
---
 gnu/packages/zig-xyz.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 200b5c9940..0e2053b931 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2022 Maya Tomasek <maya.tomasek@disroot.org>
 ;;; Copyright © 2023 Ekaitz Zarraga <ekaitz@elenq.tech>
 ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com>
+;;; Copyright © 2024 Erik Eduardo <erik@erikeduardo.xyz>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -52,7 +53,16 @@ (define-public river
     (build-system zig-build-system)
     (arguments
      (list
-      #:zig-build-flags #~(list "-Dxwayland")   ;experimental xwayland support
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'install 'install-wayland-session
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let* ((out (assoc-ref outputs "out"))
+                              (wayland-sessions (string-append out
+                                                 "/share/wayland-sessions")))
+                         (mkdir-p wayland-sessions)
+                         (install-file "contrib/river.desktop"
+                                       wayland-sessions)))))
+      #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
       #:zig-release-type "safe"))
     (native-inputs (list libevdev
                          libxkbcommon

base-commit: cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [bug#68742] QA review for 68742
  2024-01-26 17:09 [bug#68742] [PATCH] gnu: river: add river.desktop on wayland-sessions Erik Eduardo
                   ` (3 preceding siblings ...)
  2024-02-14 12:19 ` [bug#68742] [PATCH v4] " Erik Eduardo
@ 2024-02-14 12:31 ` Ekaitz Zarraga
  2024-02-14 13:33   ` Christopher Baines
  4 siblings, 1 reply; 9+ messages in thread
From: Ekaitz Zarraga @ 2024-02-14 12:31 UTC (permalink / raw)
  To: control, 68742

user guix
usertag 68742 + reviewed-looks-good
thanks

Guix QA review form submission:
It's a simple addition. I think it's ok.
I linted, and I also built, and things the author expected work.

Items marked as checked: Lint warnings, Package builds, Commit messages




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#68742] QA review for 68742
  2024-02-14 12:31 ` [bug#68742] QA review for 68742 Ekaitz Zarraga
@ 2024-02-14 13:33   ` Christopher Baines
  0 siblings, 0 replies; 9+ messages in thread
From: Christopher Baines @ 2024-02-14 13:33 UTC (permalink / raw)
  To: Ekaitz Zarraga, Erik Eduardo; +Cc: 68742-done, 68742

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]


Ekaitz Zarraga <ekaitz@elenq.tech> writes:

> user guix
> usertag 68742 + reviewed-looks-good
> thanks
>
> Guix QA review form submission:
> It's a simple addition. I think it's ok.
> I linted, and I also built, and things the author expected work.
>
> Items marked as checked: Lint warnings, Package builds, Commit messages

Thanks both, I've tweaked the indentation a little and pushed this to
master as 8d4c3032416c69f883d074f4f6d7bcc9741be75c.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2024-02-14 13:35 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-26 17:09 [bug#68742] [PATCH] gnu: river: add river.desktop on wayland-sessions Erik Eduardo
2024-01-29 16:41 ` Ekaitz Zarraga
2024-01-31  8:32 ` [bug#68742] [PATCH] gnu: river: Add river.desktop file Erik Eduardo
2024-02-08 17:32 ` [bug#68742] [PATCH v3] " Erik Eduardo
2024-02-08 19:08   ` Ekaitz Zarraga
2024-02-09 14:13   ` Ekaitz Zarraga
2024-02-14 12:19 ` [bug#68742] [PATCH v4] " Erik Eduardo
2024-02-14 12:31 ` [bug#68742] QA review for 68742 Ekaitz Zarraga
2024-02-14 13:33   ` Christopher Baines

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.