Received: (at 75283) by debbugs.gnu.org; 6 Jan 2025 19:43:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 06 14:43:24 2025
Received: from localhost ([127.0.0.1]:40179 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tUt0W-0006zZ-7h
for submit <at> debbugs.gnu.org; Mon, 06 Jan 2025 14:43:24 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:57539
helo=email.rimm.ee)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tUt0T-0006z7-6K
for 75283 <at> debbugs.gnu.org; Mon, 06 Jan 2025 14:43:22 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1736192588;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=GF5s+B8mJJthu+X6fIna+zS+ZGDdBCAHQjCN37MieZc=;
b=BPMVnfo8DgpMxkbCZOvDDCS6czWwrd4GGLpPsJYlRxh6cNR2e6LFwh9bp7XNV8ee/nv4TL
sNBdXzNEXFx8tsGg2oI31x9cYgMyQChMsCscHpStYp/FK/Fp8+DXtfsLZcd3T5J5NPDVBQ
+QN+8DLnC5TlXj9DeXyKpggd54jdrrI4q0S4rPoSRkRmbvkZNHkznfPvLpijFF94E2Xdwd
sV+q8BqFPz7xxoJNjJU59lElnlFHAN4O8Zq2hx7Ao0L+F7p5tPd+HZzV3JBaUK3r8xnXPo
/7UIwHA4fURpGT6hLWSUS0yb+uyMl9ayUDptZVGQcumL4WqGBQddQY+JCyZ6Ig==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 020e0142
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO);
Mon, 6 Jan 2025 19:43:08 +0000 (UTC)
Date: Mon, 6 Jan 2025 20:42:11 +0100
From: Herman Rimm <herman@HIDDEN>
To: Efraim Flashner <efraim@HIDDEN>
Subject: Re: [bug#75283] [PATCH rust-team] gnu: rust-xremap: Use output for
each feature.
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>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 75283
Cc: 75283 <at> debbugs.gnu.org
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: -1.0 (-)
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
guix-patches@HIDDEN:bug#75283; Package guix-patches.
Full text available.Received: (at 75283) by debbugs.gnu.org; 5 Jan 2025 08:57:16 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jan 05 03:57:16 2025 Received: from localhost ([127.0.0.1]:59811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tUMRf-0005Yc-NN for submit <at> debbugs.gnu.org; Sun, 05 Jan 2025 03:57:16 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:48391) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <efraim.flashner@HIDDEN>) id 1tUMRd-0005YP-9s for 75283 <at> debbugs.gnu.org; Sun, 05 Jan 2025 03:57:14 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-436ce2ab251so10522135e9.1 for <75283 <at> debbugs.gnu.org>; Sun, 05 Jan 2025 00:57:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736067432; x=1736672232; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=vpzLn6PBZzwtVqdzL+mCVbMqQb5gyxs/w6ayz9b0bmg=; b=S5rkNZh6cIgohhIHCq3EbS31DeEfxszhjJgb8UQMVINh4w2uySmdaUyJ68c23H99CG KY3GgucdSezXsvqGyA9Xig3bF50fQpMtAQeavwGsnisj5qvcgDHw8AZaNeM6n74u6meX glA9OJzxZDDyT7wcZ5o0K1zBGR4unCX76KcnSlSBGNZJaFDQ74bywZvO8F5A8JeHWs5p t4jL3uPN0KRPQh/FyV0JZOBwqVTavSIfB1ZbK7Ho2dH3mr8gbC4Bkn9D2HDga0qACuWi uSaab7Ppo+PcsrNYl7y97CkXL5F5ck/RE0AnXuPUX3tn/5MUlmwlQjQn6s1erUKiJIs3 dMjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736067432; x=1736672232; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vpzLn6PBZzwtVqdzL+mCVbMqQb5gyxs/w6ayz9b0bmg=; b=j/QU9bxedj34fTx7Kfy9QahvOkzZ9y+1y2ecOzSiSTWBEZmQP8CiEZZ2mcr/Le2qnh JY7l68iur1ufD2JtZ/tfodEc11zrSX8LWvCAxS4vwFW4uv50WdbAyXbFy/axAFZiZm41 fjPCEiANhe9Txcs613XhP/MNfKksD2no3BMnhZafA3w5uTiN0bmXW5zbwXx2HXxwaWnP l2EK5Kpkaeidj0Zy/ctQxswu/dUnwcE5wyvrYoquJiiJVly3HgENu8ShACM45j6gNeeg K2Bt5+3c+iw3UE8cgGAwf6SLFe2AjcySeyC2FHlOn/D1AT+cIeTAGAy2I/Erwr2ppB/D 7ahw== X-Gm-Message-State: AOJu0Yx32dqtWWcmiOnBLQLwr6Hah7Y9UFt4eAW5YasfJX0FXQQoGzhz YnLK5iTdFsQjJ/cYRRLD2MbDpGVVtI0KhGuU/yCoFEhmUyjnEUDe X-Gm-Gg: ASbGncuK6oQLGDBItXhNh6xoF0L5B2IbjgeJqRbMt5TpVwTsfGsTy19Y0ejZibZReaq 6QjluWKjFX3nRtOVdZmGazz9XlKZjbC/xupHG3jtti8Gc/DZsYGA2Tnz94ZQfXhSWMiCa6GhMAF 8G6njoqL8rj8R884GWXYXoQ7arnK9/WU92zi+AmPInKngkvupP1tb/1j/58C2nMBBf1iANZc8Rx vnf/A6dcOSxG54tRSCK69Uv1DDFpziQDwX5gYx/Jf43deKWWmrxkFgt X-Google-Smtp-Source: AGHT+IGTCYHZwaNLNJUeXVpnX22zY6CPtvjVGchrjVRCrW9wKBMEMj5Xx58jrQrtLvuweD55chaEow== X-Received: by 2002:a05:600c:350b:b0:434:f131:1e6d with SMTP id 5b1f17b1804b1-43668643203mr581934625e9.10.1736067430056; Sun, 05 Jan 2025 00:57:10 -0800 (PST) Received: from localhost ([141.226.10.168]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436611ea423sm540489335e9.2.2025.01.05.00.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jan 2025 00:57:09 -0800 (PST) Date: Sun, 5 Jan 2025 10:56:46 +0200 From: Efraim Flashner <efraim@HIDDEN> To: Herman Rimm <herman@HIDDEN> Subject: Re: [bug#75283] [PATCH rust-team] gnu: rust-xremap: Use output for each feature. 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> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 75283 Cc: 75283 <at> debbugs.gnu.org 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.8 (/) --+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--
guix-patches@HIDDEN:bug#75283; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 2 Jan 2025 13:07:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Jan 02 08:07:21 2025
Received: from localhost ([127.0.0.1]:43086 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tTKv2-0007Vc-Od
for submit <at> debbugs.gnu.org; Thu, 02 Jan 2025 08:07:21 -0500
Received: from lists.gnu.org ([2001:470:142::17]:53828)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tTKv0-0007VM-2W
for submit <at> debbugs.gnu.org; Thu, 02 Jan 2025 08:07:19 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <herman@HIDDEN>) id 1tTKut-0002FM-U1
for guix-patches@HIDDEN; Thu, 02 Jan 2025 08:07:11 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]
helo=email.rimm.ee)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256)
(Exim 4.90_1) (envelope-from <herman@HIDDEN>) id 1tTKur-0002lq-8a
for guix-patches@HIDDEN; Thu, 02 Jan 2025 08:07:11 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1735823217;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=o+pKyShB6fP9V4rCdWK9VZfWnYdd6uJbuSu4510XFSQ=;
b=dAs4dxBFML34GrREWHvu2n5NOUghZn0Jx/RWekTz2HOLRx+qoPiZggZa+w6PaYMwEleo1X
IPzZ97NRgJVk9c1M1fLiRDADugacN4Qjs3ua1iJ2NN6bnymTl3crKdxsQtXKfeyaQxpJFH
Zhnef+0amsmzYvOceg0nQUgWoTaPX7Qw8W2nLIYmQaSd0emVj0vbqHvA00dw57Q5eaen73
xgdKvjxnjT6Mxb4GXKolZi2oS9VDF9TUqnNT2irSnU0PFxJmS7QebPTEPxu514Tbf6z28R
E7bJbvvymzyzAmTImv7VqHIf9HfE9N1q32mRxYHW9CFWGa2Bv66ZOgQAK3pipw==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 0d3f22dd
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <guix-patches@HIDDEN>; Thu, 2 Jan 2025 13:06:57 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH rust-team] gnu: rust-xremap: Use output for each feature.
Date: Thu, 2 Jan 2025 14:06:09 +0100
Message-ID: <940b18daf5a018d28047b31ff0585893530e5c2a.1735823152.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
MIME-Version: 1.0
X-Debbugs-Cc: Efraim Flashner <efraim@HIDDEN>
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-Debbugs-Envelope-To: submit
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
Herman Rimm <herman@HIDDEN>:efraim@HIDDEN, guix-patches@HIDDEN.
Full text available.efraim@HIDDEN, guix-patches@HIDDEN:bug#75283; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.