GNU logs - #75283, boring messages

Message sent to efraim@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#75283] [PATCH rust-team] gnu: rust-xremap: Use output for each feature.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 02 Jan 2025 13:08:01 +0000
Resent-Message-ID: <handler.75283.B.173582324128873 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 75283 <at> debbugs.gnu.org
Cc: Efraim Flashner <efraim@HIDDEN>
From: Herman Rimm <herman@HIDDEN>
Date: Thu,  2 Jan 2025 14:06:09 +0100
Message-ID: <940b18daf5a018d28047b31ff0585893530e5c2a.1735823152.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@HIDDEN;
 helo=email.rimm.ee
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
 SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
 TVD_RCVD_IP=0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

* gnu/packages/rust-apps.scm (output-features): Add procedure.
(rust-xremap)[outputs]: Add.
[arguments]: Remove features, add modules and output-features phases.
(xremap-gnome, xremap-kde, xremap-wlroots, xremap-hyprland, xremap-sway,
xremap-x11): Deprecate.

Change-Id: I9cf6a27f908a0fa42e89daba12fba3615d05ad4e
---
 gnu/packages/rust-apps.scm | 79 +++++++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 2182daa2f30..074c1f56408 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -28,7 +28,7 @@
 ;;; Copyright © 2023, 2024 Jaeme Sifat <jaeme@HIDDEN>
 ;;; Copyright © 2023 Steve George <steve@HIDDEN>
 ;;; Copyright © 2024 Troy Figiel <troy@HIDDEN>
-;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
+;;; Copyright © 2024-2025 Herman Rimm <herman@HIDDEN>
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2024 Suhail Singh <suhail@HIDDEN>
 ;;; Copyright © 2024 Jordan Moore <lockbox@HIDDEN>
@@ -113,7 +113,8 @@ (define-module (gnu packages rust-apps)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages webkit)
-  #:use-module (gnu packages xorg))
+  #:use-module (gnu packages xorg)
+  #:use-module (srfi srfi-1))

 (define-public aardvark-dns
   (package
@@ -4244,6 +4245,34 @@ (define-public git-delta
 @command{grep} and a stylized box presentation.")
     (license license:expat)))

+(define* (output-features output #:optional (features (list output)))
+  (define (phase-name prefix)
+    (string->symbol (string-append prefix "-" output)))
+
+  (define set-args
+   `(let loop ((lst    args)
+               (result '()))
+      (match lst
+        (() (reverse result))
+        ((#:outputs outputs rest ...)
+         ;; XXX: Make give output the default.
+         (loop rest (cons* `(("out" . ,(assoc-ref outputs ,output)))
+                           #:outputs result)))
+        ((#:features _ rest ...)
+         (loop rest (cons* ',features #:features result)))
+        ((kw value rest ...)
+         (loop rest (cons* value kw result))))))
+  ;; XXX: Run after previous install-output phase.
+  `((add-after 'install ',(phase-name "build")
+      (lambda args
+        (apply (assoc-ref %standard-phases 'build) ,set-args)))
+    (add-after ',(phase-name "build") ',(phase-name "check")
+      (lambda args
+        (apply (assoc-ref %standard-phases 'check) ,set-args)))
+    (add-after ',(phase-name "check") ',(phase-name "install")
+      (lambda args
+        (apply (assoc-ref %standard-phases 'install) ,set-args)))))
+
 (define-public rust-xremap
   (package
     (name "rust-xremap")
@@ -4257,9 +4286,9 @@ (define-public rust-xremap
         (base32
          "0whvw9bbgjf5znb3025iqkj2aijasg6fcx9q1jy97kb0s4m996q2"))))
     (build-system cargo-build-system)
+    (outputs '("out" "hyprland" "gnome" "kde" "wlroots" "x11"))
     (arguments
-     `(#:features '()
-       #:install-source? #f
+     `(#:install-source? #f
        #:cargo-inputs
        (("rust-anyhow" ,rust-anyhow-1)
         ("rust-clap" ,rust-clap-4)
@@ -4283,8 +4312,13 @@ (define-public rust-xremap
         ("rust-wayland-protocols-wlr" ,rust-wayland-protocols-wlr-0.1)
         ("rust-x11rb" ,rust-x11rb-0.13)
         ("rust-zbus" ,rust-zbus-1))
+       #:modules ((guix build cargo-build-system)
+                  (guix build utils)
+                  (ice-9 match))
        #:phases
        (modify-phases %standard-phases
+         ,@(concatenate (map output-features (drop outputs 1)))
+         ;; XXX: Separately output default xremap and completions?
          (add-after 'install 'install-completions
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -4312,47 +4346,22 @@ (define-public rust-xremap
     (license license:expat)))

 (define-public xremap-gnome
-  (package
-    (inherit rust-xremap)
-    (name "xremap-gnome")
-    (arguments
-     (substitute-keyword-arguments (package-arguments rust-xremap)
-       ((#:features _) '(list "gnome"))))))
+  (deprecated-package "xremap-gnome" rust-xremap))

 (define-public xremap-kde
-  (package
-    (inherit rust-xremap)
-    (name "xremap-kde")
-    (arguments
-     (substitute-keyword-arguments (package-arguments rust-xremap)
-       ((#:features _) '(list "kde"))))))
+  (deprecated-package "xremap-kde" rust-xremap))

 (define-public xremap-wlroots
-  (package
-    (inherit rust-xremap)
-    (name "xremap-wlroots")
-    (arguments
-     (substitute-keyword-arguments (package-arguments rust-xremap)
-       ((#:features _) '(list "wlroots"))))))
+  (deprecated-package "xremap-wlroots" rust-xremap))

 (define-public xremap-hyprland
-  (package
-    (inherit rust-xremap)
-    (name "xremap-hyprland")
-    (arguments
-     (substitute-keyword-arguments (package-arguments rust-xremap)
-       ((#:features _) '(list "hyprland"))))))
+  (deprecated-package "xremap-hyprland" rust-xremap))

 (define-public xremap-sway
-  (deprecated-package "xremap-sway" xremap-wlroots))
+  (deprecated-package "xremap-sway" rust-xremap))

 (define-public xremap-x11
-  (package
-    (inherit rust-xremap)
-    (name "xremap-x11")
-    (arguments
-     (substitute-keyword-arguments (package-arguments rust-xremap)
-       ((#:features _) '(list "x11"))))))
+  (deprecated-package "xremap-x11" rust-xremap))

 (define-public xsv
   (package

base-commit: 5f92f009a19c1a5a8b7df5a7bcb1e1f283a953f8
-- 
2.45.2

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Herman Rimm <herman@HIDDEN>
Subject: bug#75283: Acknowledgement ([PATCH rust-team] gnu: rust-xremap:
 Use output for each feature.)
Message-ID: <handler.75283.B.173582324128873.ack <at> debbugs.gnu.org>
References: <940b18daf5a018d28047b31ff0585893530e5c2a.1735823152.git.herman@HIDDEN>
X-Gnu-PR-Message: ack 75283
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 75283 <at> debbugs.gnu.org
Date: Thu, 02 Jan 2025 13:08:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

As you requested using X-Debbugs-CC, your message was also forwarded to
  Efraim Flashner <efraim@HIDDEN>
(after having been given a bug report number, if it did not have one).

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 75283 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
75283: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75283
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to guix-patches@HIDDEN:

Subject: [bug#75283] [PATCH rust-team] gnu: rust-xremap: Use output for each feature.
Resent-From: Efraim Flashner <efraim@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sun, 05 Jan 2025 08:58:02 +0000
Resent-Message-ID: <handler.75283.B75283.173606743621371 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Herman Rimm <herman@HIDDEN>
Cc: 75283 <at> debbugs.gnu.org
Date: Sun, 5 Jan 2025 10:56:46 +0200
From: Efraim Flashner <efraim@HIDDEN>
Message-ID: <Z3pJTnEc7Yg0544c@3900XT>
Mail-Followup-To: Efraim Flashner <efraim@HIDDEN>,
 Herman Rimm <herman@HIDDEN>, 75283 <at> debbugs.gnu.org
References: <940b18daf5a018d28047b31ff0585893530e5c2a.1735823152.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="+bRc85IO9EAGKvrh"
Content-Disposition: inline
In-Reply-To: <940b18daf5a018d28047b31ff0585893530e5c2a.1735823152.git.herman@HIDDEN>
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

--+bRc85IO9EAGKvrh
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Do we actually need a separate output/package for each desktop type? Or
can we just add in all the features and provide just one package for all
of them?

I compared the outputs of xremap-wlroots and xremap-gnome and the shell
completions are the same between them.

On Thu, Jan 02, 2025 at 02:06:09PM +0100, Herman Rimm wrote:
> * gnu/packages/rust-apps.scm (output-features): Add procedure.
> (rust-xremap)[outputs]: Add.
> [arguments]: Remove features, add modules and output-features phases.
> (xremap-gnome, xremap-kde, xremap-wlroots, xremap-hyprland, xremap-sway,
> xremap-x11): Deprecate.
>=20
> Change-Id: I9cf6a27f908a0fa42e89daba12fba3615d05ad4e
> ---
>  gnu/packages/rust-apps.scm | 79 +++++++++++++++++++++-----------------
>  1 file changed, 44 insertions(+), 35 deletions(-)
>=20

--=20
Efraim Flashner   <efraim@HIDDEN>   =D7=90=D7=A4=D7=A8=D7=99=D7=9D =
=D7=A4=D7=9C=D7=A9=D7=A0=D7=A8
GPG key =3D A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

--+bRc85IO9EAGKvrh
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIyBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmd6SUoACgkQQarn3Mo9
g1E0zg/3TeaQmMxtxkomh3ob46ug2TVQb8YiCp9OZUda1hPNQjN1+9v7crYKduAS
yeMxsQ61UgXMKCOhYNJnX6/wQ8JYUG7OyDg+tyOyZLu9f3BRIf2AAO/qmr2XZRJm
DRB7R0RVgX8mpV88mS9ALc3cCcrjh16/ry5hjUT/7oWfRj7wVcnAZPFJ2obXnwvr
ElCoqJ/kf/hstw4BXiEy1VZEbSDftRo5xT0swgNXrOTHJAHYjWaQ5hk0nnmL06x2
zgM46DXgH2dZ4ul/bHD0vTxc/vRZxPH4tICHJaBjmXddeUrWNpAfYAqT33d8GFXk
4dnLflwXN4REelBbQo6UUiQ/iGzVPdgZD6OTWgjqwQlUzXXrxYdcLg8LvsUIOP9L
z4kH6pwe/jR81lroC8ie7iCld2ETUxM9KEAnWqsL8Z0e2a8xmkVum1uHwTUJqLuY
eYSYOJeCxSQl/NSTuUtA8lKjg+fdvErhoLEKZ1ISQWep+sxiYfgRhpR+HjIbQzvu
6lEcnhv0ZIWU+8/Xx5bCqEuoAkLwqQHP7AM+0o4BQ8kAunjiDfED7p2gkgE1Ivzf
WJJe+wTps3H5Xpw9NdyQ+AI5zGPYmQRar+y8QNoEqOY4TrRIdCWxR//Dw/oD21XI
5I4/m104QD5Wi9ayaLHEw6Q5WBOi7lPA0krdcLLYnheGoOqJig==
=e7Yx
-----END PGP SIGNATURE-----

--+bRc85IO9EAGKvrh--

Message sent to guix-patches@HIDDEN:

Subject: [bug#75283] [PATCH rust-team] gnu: rust-xremap: Use output for each feature.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 06 Jan 2025 19:44:03 +0000
Resent-Message-ID: <handler.75283.B75283.173619260426885 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Efraim Flashner <efraim@HIDDEN>
Cc: 75283 <at> debbugs.gnu.org
Date: Mon, 6 Jan 2025 20:42:11 +0100
From: Herman Rimm <herman@HIDDEN>
Message-ID: <2eezlodw3yan7gpi4cropxwhxi3weedvklvjviiboorgfmmaxk@fyrtzeepv34e>
References: <940b18daf5a018d28047b31ff0585893530e5c2a.1735823152.git.herman@HIDDEN>
 <Z3pJTnEc7Yg0544c@3900XT>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <Z3pJTnEc7Yg0544c@3900XT>
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

Hello,

On Sun, Jan 05, 2025 at 10:56:46AM +0200, Efraim Flashner wrote:
> Do we actually need a separate output/package for each desktop type? Or
> can we just add in all the features and provide just one package for all
> of them?

In .../xremap/src/client/mod.rs, each feature (e.g. wlroots) is used
like:

#[cfg(feature = "wlroots")]
pub fn build_client() -> WMClient { ... }

Enabling multiple features would define multiple build_client in the
module, which would not compile I think.

Cheers,
Herman

Last modified: Sun, 12 Jan 2025 05:45:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.