From patchwork Wed May 22 09:45:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Goaziou X-Patchwork-Id: 64819 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 21A9027BBE9; Wed, 22 May 2024 11:03:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D260627BBE2 for ; Wed, 22 May 2024 11:03:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9ioL-0001FX-Ey; Wed, 22 May 2024 06:03:05 -0400 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 ) id 1s9ioE-00016M-FM for guix-patches@gnu.org; Wed, 22 May 2024 06:02:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s9ioD-0003Lz-GX for guix-patches@gnu.org; Wed, 22 May 2024 06:02:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s9ioJ-0000oK-4L; Wed, 22 May 2024 06:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71110] [PATCH rust-team 37/37] gnu: rust-xremap: Update to 0.10.0. Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Wed, 22 May 2024 10:03:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71110 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71110@debbugs.gnu.org Cc: Nicolas Goaziou , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 71110-submit@debbugs.gnu.org id=B71110.17163721623084 (code B ref 71110); Wed, 22 May 2024 10:03:03 +0000 Received: (at 71110) by debbugs.gnu.org; 22 May 2024 10:02:42 +0000 Received: from localhost ([127.0.0.1]:54930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9inx-0000ng-Rf for submit@debbugs.gnu.org; Wed, 22 May 2024 06:02:42 -0400 Received: from msg-2.mailo.com ([213.182.54.12]:45282 helo=mailo.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9inp-0000nY-VI for 71110@debbugs.gnu.org; Wed, 22 May 2024 06:02:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=nicolasgoaziou.fr; s=mailo; t=1716372142; bh=rcYFaxb+myKKh+tKCQbUJvvMc/6KLB0yQTl4ImLRbuo=; h=X-EA-Auth:From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Type:Content-Transfer-Encoding; b=LEYoFgyx1lI5v1S8kP+TkukjonAF6NriQeJriFjHKXL8m+2I4r+4dIQm7lswJ6oT9 NVKXTJN9y7WPH/Ai76b1u38F+7YYVgbGTb88aaL/r6fDrcr01Muzya6orsN2W1g5H/ PgUnLsv3zOSbqONJeCaAAGe+ApYEC0kj5ppYDrJE= Received: by b221-2.in.mailobj.net [192.168.90.22] with ESMTP via ip-20.mailobj.net [213.182.54.20] Wed, 22 May 2024 12:02:21 +0200 (CEST) X-EA-Auth: OopiljMnlc3e3uKWaonAvO7mIqcUqh0c2TqAf76VMDqCjByupbfuVZRqEV3KguWnFVtKkWG+4hSjKLwNzZfVqIXru9jJ/PsHFrLXdRqvMPI= Date: Wed, 22 May 2024 11:45:55 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Goaziou X-ACL-Warn: , Nicolas Goaziou via Guix-patches X-Patchwork-Original-From: Nicolas Goaziou via Guix-patches via From: Nicolas Goaziou Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust-apps.scm (rust-xremap): Update to 0.10.0. [arguments]<#:cargo-inputs>: Remove RUST-HYPRLAND and RUST-SWAYIPC. (xremap-hyprland, xremap-sway): Deprecate for XREMAP-WLROOTS. `sway' and `hypr' clients have been dropped upstream. Change-Id: Ib413ac773a18c81dfe292f0c30916047a835574b --- gnu/packages/rust-apps.scm | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 8da7b827e7..04f88e769d 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2020 Leo Famulari ;;; Copyright © 2020 Mark H Weaver ;;; Copyright © 2020 Gabriel Arazas -;;; Copyright © 2020-2023 Nicolas Goaziou +;;; Copyright © 2020-2024 Nicolas Goaziou ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Sharlatan Hellseher @@ -3169,7 +3169,7 @@ (define-public git-delta (define-public rust-xremap (package (name "rust-xremap") - (version "0.8.14") + (version "0.10.0") (source (origin (method url-fetch) @@ -3177,7 +3177,7 @@ (define-public rust-xremap (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1691clzqbwcywz66k0lf5wjz3q5cpbks0l090bfv42idzr5a0ghl")))) + "13pvlc40zha7c9ma30s32x65c8qciqcnsznw43crx3wymlaqc9sn")))) (build-system cargo-build-system) (arguments `(#:features '() @@ -3190,7 +3190,6 @@ (define-public rust-xremap ("rust-env-logger" ,rust-env-logger-0.10) ("rust-evdev" ,rust-evdev-0.12) ("rust-fork" ,rust-fork-0.1) - ("rust-hyprland" ,rust-hyprland-0.3) ("rust-indoc" ,rust-indoc-2) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) @@ -3200,7 +3199,6 @@ (define-public rust-xremap ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-with" ,rust-serde-with-3) ("rust-serde-yaml" ,rust-serde-yaml-0.9) - ("rust-swayipc" ,rust-swayipc-3) ("rust-toml" ,rust-toml-0.8) ("rust-wayland-client" ,rust-wayland-client-0.30) ("rust-wayland-protocols-wlr" ,rust-wayland-protocols-wlr-0.1) @@ -3215,19 +3213,19 @@ (define-public rust-xremap (xremap (string-append out "/bin/xremap"))) (mkdir-p (string-append share "/bash-completion/completions")) (with-output-to-file - (string-append share "/bash-completion/completions/xremap") + (string-append share "/bash-completion/completions/xremap") (lambda _ (invoke xremap "--completions" "bash"))) (mkdir-p (string-append share "/fish/vendor_completions.d")) (with-output-to-file - (string-append share "/fish/vendor_completions.d/xremap.fish") + (string-append share "/fish/vendor_completions.d/xremap.fish") (lambda _ (invoke xremap "--completions" "fish"))) (mkdir-p (string-append share "/zsh/site-functions")) (with-output-to-file - (string-append share "/zsh/site-functions/_xremap") + (string-append share "/zsh/site-functions/_xremap") (lambda _ (invoke xremap "--completions" "zsh"))) (mkdir-p (string-append share "/elvish/lib")) (with-output-to-file - (string-append share "/elvish/lib/xremap") + (string-append share "/elvish/lib/xremap") (lambda _ (invoke xremap "--completions" "elvish"))))))))) (home-page "https://github.com/k0kubun/xremap") (synopsis "Dynamic key remapp for X and Wayland") @@ -3242,22 +3240,6 @@ (define-public xremap-gnome (substitute-keyword-arguments (package-arguments rust-xremap) ((#:features _) '(list "gnome")))))) -(define-public xremap-hyprland - (package - (inherit rust-xremap) - (name "xremap-hyprland") - (arguments - (substitute-keyword-arguments (package-arguments rust-xremap) - ((#:features _) '(list "hypr")))))) - -(define-public xremap-sway - (package - (inherit rust-xremap) - (name "xremap-sway") - (arguments - (substitute-keyword-arguments (package-arguments rust-xremap) - ((#:features _) '(list "sway")))))) - (define-public xremap-wlroots (package (inherit rust-xremap) @@ -3266,6 +3248,12 @@ (define-public xremap-wlroots (substitute-keyword-arguments (package-arguments rust-xremap) ((#:features _) '(list "wlroots")))))) +(define-public xremap-hyprland + (deprecated-package "xremap-hyprland" xremap-wlroots)) + +(define-public xremap-sway + (deprecated-package "xremap-sway" xremap-wlroots)) + (define-public xremap-x11 (package (inherit rust-xremap)