[bug#56752] [PATCH 00/27] Add swayr and swayrbar.

[bug#56752] [PATCH 00/27] Add swayr and swayrbar.

[Aleksandr Vityazev]

Hi,

The packages whose dependencies have been updated in this patch series
have not yet been checked. For example, ~73 packages depend on
rust-thiserror-1.

Aleksandr Vityazev (27):
  gnu: Add rust-rt-format-0.3.
  gnu: Add rust-swaybar-types-3.
  gnu: rust-thiserror-impl-1: Update to 1.0.31.
  gnu: rust-thiserror-1: Update to 1.0.31.
  gnu: Add rust-swayipc-types-1.
  gnu: Add rust-swayipc-3.
  gnu: Add rust-windows-aarch64-msvc-0.36.
  gnu: Add rust-windows-i686-gnu-0.36.
  gnu: Add rust-windows-i686-msvc-0.36.
  gnu: Add rust-windows-x86-64-gnu-0.36.
  gnu: Add rust-windows-x86-64-msvc-0.36.
  gnu: Add rust-windows-sys-0.36.
  gnu: Add rust-parking-lot-core-0.9.
  gnu: Add rust-parking-lot-0.12.
  gnu: rust-once-cell-1: Update to 1.13.0.
  gnu: rust-regex-syntax-0.6: Update to 0.6.27.
  gnu: rust-regex-1: Update to 1.6.0.
  gnu: Add rust-peg-runtime-0.8.
  gnu: Add rust-peg-macros-0.8.
  gnu: Add rust-peg-0.8.
  gnu: Add rust-clap-lex-0.2.
  gnu: Add rust-unic-emoji-char-0.9.
  gnu: Add rust-textwrap-0.15.
  gnu: rust-clap-derive-3: Update to 3.2.7.
  gnu: rust-clap-3: Update to 3.2.14.
  gnu: Add swayr.
  gnu: Add swayrbar.

 gnu/packages/crates-io.scm | 526 ++++++++++++++++++++++++++++++++++---
 gnu/packages/rust-apps.scm |  77 ++++++
 2 files changed, 569 insertions(+), 34 deletions(-)

-- 
2.37.1





-- 

Aleksandr Vityazev

[bug#56752] [PATCH 00/27] Add swayr and swayrbar.

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 576 bytes --]

On 24-07-2022 23:01, Aleksandr Vityazev wrote:

>    gnu: Add rust-windows-aarch64-msvc-0.36.
>    gnu: Add rust-windows-i686-gnu-0.36.
>    gnu: Add rust-windows-i686-msvc-0.36.
>    gnu: Add rust-windows-x86-64-gnu-0.36.
>    gnu: Add rust-windows-x86-64-msvc-0.36.

There is already a patch series for adding these: 
<https://debbugs.gnu.org/cgi/bugreport.cgi?bug=56057>. Please also check 
for the other packages whether they already have patches, and remove 
patches that were already submitted previously from this patch series.

Greetings,
Maxime.




[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#56752] [PATCH 01/27] gnu: Add rust-rt-format-0.3.

[Aleksandr Vityazev]

[bug#56752] [PATCH 02/27] gnu: Add rust-swaybar-types-3.

[Aleksandr Vityazev]

[bug#56752] swayr

[Nicolas Graves via Guix-patches via]

Hi!

I will also like to see swayr packaged for guix, and am willing to help.
I did have a working 0.18 version in my dotfiles with almost all
development dependencies also included, but I see this 0.20 attempt.

What would be the best process to eventually package this one? Is there
a reason this thread has not been merged?

I can try and update my 0.18 version to 0.20 and get this version to work
properly in my guix checkout, if that might help.

-- 
Best regards,
Nicolas Graves

[bug#56752] swayr

[kiasoc5 via Guix-patches via]

On Tue, Oct 25 2022, 09:35:16 AM +0200
Nicolas Graves via Guix-patches via <guix-patches@gnu.org> wrote:

> I can try and update my 0.18 version to 0.20 and get this version to
> work properly in my guix checkout, if that might help.
> 

Not a reviewer but aiming for 0.20 should be fine as a user. Latest
swayr is version 0.22 but compared to 0.20 it only has minor fixes and
crate version bumps.

-- 

[bug#56752] swayr

[Andrew Tropin]

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

On 2022-10-25 09:35, Nicolas Graves via Guix-patches via wrote:

> Hi!
>
> I will also like to see swayr packaged for guix, and am willing to help.
> I did have a working 0.18 version in my dotfiles with almost all
> development dependencies also included, but I see this 0.20 attempt.
>
> What would be the best process to eventually package this one? Is there
> a reason this thread has not been merged?
>
> I can try and update my 0.18 version to 0.20 and get this version to work
> properly in my guix checkout, if that might help.

Applied, slightly adjusted and pushed swayr 0.18 and it's dependencies,
thank you for the patches.

If someone willing to update swayr to a newer version please send a
patch series to a separate thread, please.

-- 
Best regards,
Andrew Tropin

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

[bug#56752] swayr

[Andrew Tropin]

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

On 2022-11-28 12:53, Andrew Tropin wrote:

> On 2022-10-25 09:35, Nicolas Graves via Guix-patches via wrote:
>
>> Hi!
>>
>> I will also like to see swayr packaged for guix, and am willing to help.
>> I did have a working 0.18 version in my dotfiles with almost all
>> development dependencies also included, but I see this 0.20 attempt.
>>
>> What would be the best process to eventually package this one? Is there
>> a reason this thread has not been merged?
>>
>> I can try and update my 0.18 version to 0.20 and get this version to work
>> properly in my guix checkout, if that might help.
>
> Applied, slightly adjusted and pushed swayr 0.18 and it's dependencies,
> thank you for the patches.
>
> If someone willing to update swayr to a newer version please send a
> patch series to a separate thread, please.

Oops, by mistake I changed the authorship of 6 last commits to Nicolas
Goaziou instead of Nicolas Graves, reverted them and re-applied with
correct authorship.

-- 
Best regards,
Andrew Tropin

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

[bug#56752] [PATCH 01/10] gnu: rust-thiserror-impl-1: Update to 1.0.37.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-thiserror-impl-1): Update to 1.0.37.
---
 gnu/packages/crates-io.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 420e254fb3..c7b87dd8a2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -58089,16 +58089,14 @@ (define-public rust-thiserror-1
 (define-public rust-thiserror-impl-1
   (package
     (name "rust-thiserror-impl")
-    (version "1.0.26")
+    (version "1.0.37")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "thiserror-impl" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0ia72qiynlws5avb8f1xqlazp4g6bqgzjbwy5vs6nyg7myh6j386"))))
+        (base32 "1fydmpksd14x1mkc24zas01qjssz8q43sbn2ywl6n527dda1fbcq"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.38.0

[bug#56752] [PATCH 02/10] gnu: rust-thiserror-1: Update to 1.0.37.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-thiserror-1): Update to 1.0.37.
---
 gnu/packages/crates-io.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c7b87dd8a2..eb4a0c2c9e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -58061,16 +58061,14 @@ (define-public rust-thin-slice-0.1
 (define-public rust-thiserror-1
   (package
     (name "rust-thiserror")
-    (version "1.0.26")
+    (version "1.0.37")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "thiserror" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1qmz542pq4wmz3p0s4kavsqv09h0x99klkf3k33ydjy1x97rw4ck"))))
+        (base32 "0gky83x4i87gd87w3fknnp920wvk9yycp7dgkf5h3jg364vb7phh"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.38.0

[bug#56752] [PATCH 03/10] gnu: Add rust-textwrap-0.15.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-textwrap-0.15): New variable.
---
 gnu/packages/crates-io.scm | 43 ++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index eb4a0c2c9e..a5a4a41e84 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57982,8 +57982,39 @@ (define-public rust-text-size-1
     (description "This package provides a newtypes for text offsets")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-textwrap-0.15
+  (package
+    (name "rust-textwrap")
+    (version "0.15.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "textwrap" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yw513k61lfiwgqrfvsjw1a5wpvm0azhpjr2kr0jhnq9c56is55i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-hyphenation" ,rust-hyphenation-0.8)
+        ("rust-smawk" ,rust-smawk-0.3)
+        ("rust-terminal-size" ,rust-terminal-size-0.1)
+        ("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1)
+        ("rust-unicode-width" ,rust-unicode-width-0.1))))
+    (home-page
+     "https://github.com/mgeisler/textwrap")
+    (synopsis "Library for word wrapping, indenting, and dedenting strings")
+    (description
+     "Textwrap is a small library for word wrapping, indenting, and dedenting
+strings.  You can use it to format strings (such as help and error messages)
+for display in commandline applications.  It is designed to be efficient and
+handle Unicode characters correctly.")
+    (license license:expat)))
+
 (define-public rust-textwrap-0.12
   (package
+    (inherit rust-textwrap-0.15)
     (name "rust-textwrap")
     (version "0.12.1")
     (source
@@ -57995,22 +58026,12 @@ (define-public rust-textwrap-0.12
        (sha256
         (base32
          "12978qmkl5gcp94lxndpvp9qxq8mxp7hm9xbrw3422dgikchhc10"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-hyphenation" ,rust-hyphenation-0.8)
         ("rust-terminal-size" ,rust-terminal-size-0.1)
-        ("rust-unicode-width" ,rust-unicode-width-0.1))))
-    (home-page
-     "https://github.com/mgeisler/textwrap")
-    (synopsis "Library for word wrapping, indenting, and dedenting strings")
-    (description
-     "Textwrap is a small library for word wrapping, indenting, and dedenting
-strings.  You can use it to format strings (such as help and error messages)
-for display in commandline applications.  It is designed to be efficient and
-handle Unicode characters correctly.")
-    (license license:expat)))
+        ("rust-unicode-width" ,rust-unicode-width-0.1))))))
 
 (define-public rust-textwrap-0.11
   (package
-- 
2.38.0

[bug#56752] [PATCH 04/10] gnu: Add rust-swayipc-types-1.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-swayipc-types-1): New variable.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a5a4a41e84..4f7c9b46ba 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55769,6 +55769,31 @@ (define-public rust-swayipc-command-builder-0.1
 executed by swayipc.")
     (license license:expat)))
 
+(define-public rust-swayipc-types-1
+  (package
+   (name "rust-swayipc-types")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "swayipc-types" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13lj6jyyxg41r9g0b07y8yd7ygy5gih61w5v48bpksvfdzhwwn55"))))
+   (build-system cargo-build-system)
+   (arguments
+    `(#:skip-build? #t
+      #:cargo-inputs
+      (("rust-serde" ,rust-serde-1)
+       ("rust-serde-json" ,rust-serde-json-1)
+       ("rust-thiserror" ,rust-thiserror-1))))
+   (home-page "https://github.com/jaycefayne/swayipc-rs")
+   (synopsis "A library containing Type defintions from sway's IPC interface")
+   (description
+    "This package provides a library containing Type defintions from sway's IPC
+interface")
+   (license license:expat)))
+
 (define-public rust-syn-1
   (package
     (name "rust-syn")
-- 
2.38.0

[bug#56752] [PATCH 05/10] gnu: Add rust-swayipc-3.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-swayipc-3): New variable.
---
 gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4f7c9b46ba..934d2a35ef 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55724,8 +55724,34 @@ (define-public rust-sval-derive-1
     (description "This package provides custom derive for @code{sval}.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-swayipc-3
+  (package
+    (name "rust-swayipc")
+    (version "3.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "swayipc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16pf4r6svf99p73b8dhdannkvhfvmbjb4rx7gifxh8xj53rwy7db"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-swayipc-types" ,rust-swayipc-types-1))))
+    (home-page "https://github.com/jaycefayne/swayipc-rs")
+    (synopsis "Library for controlling sway through its IPC interface")
+    (description
+     "This package provides a library for controlling sway through its IPC
+interface.")
+    (license license:expat)))
+
 (define-public rust-swayipc-2
   (package
+    (inherit rust-swayipc-3)
     (name "rust-swayipc")
     (version "2.7.2")
     (source
@@ -55735,20 +55761,13 @@ (define-public rust-swayipc-2
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "03r15c2sijyrxmpsyjgma4gz7zmdl1g8akjnjkw6hrml91d5dilj"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f                      ; test sync::tests::connect ... FAILED
        #:cargo-inputs
        (("rust-serde" ,rust-serde-1)
         ("rust-async-std" ,rust-async-std-1)
         ("rust-swayipc-command-builder" ,rust-swayipc-command-builder-0.1)
-        ("rust-serde-json" ,rust-serde-json-1))))
-    (home-page "https://github.com/jaycefayne/swayipc-rs")
-    (synopsis "Library for controlling sway through its IPC interface")
-    (description
-     "This package provides a library for controlling sway through its IPC
-interface.")
-    (license license:expat)))
+        ("rust-serde-json" ,rust-serde-json-1))))))
 
 (define-public rust-swayipc-command-builder-0.1
   (package
-- 
2.38.0

[bug#56752] [PATCH 06/10] gnu: Add rust-rt-format-0.3.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rt-format-0.3): New variable.
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 934d2a35ef..863f693b8d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68275,6 +68275,28 @@ (define-public rust-inflections-1
       "High performance inflection transformation library for changing properties of words like the case.")
     (license license:expat)))
 
+(define-public rust-rt-format-0.3
+  (package
+    (name "rust-rt-format")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rt-format" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qjjwh9ny95xck1kp99gi6hfm9glrx54jx8npnj6yccxc7p7q225"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/vstojkovic/rt-format")
+    (synopsis "Fully-runtime equivalent of the format! macro")
+    (description "Fully-runtime equivalent of the format! macro")
+    (license license:asl2.0)))
+
 (define-public rust-rustc-workspace-hack-1
   (package
     (name "rust-rustc-workspace-hack")
-- 
2.38.0

[bug#56752] [PATCH 07/10] gnu: Add rust-clap-lex-0.2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-clap-lex-0.2): New variable.
---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 863f693b8d..cf086b882b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68468,6 +68468,26 @@ (define-public rust-clap-conf-0.1
       "This package provides a library to unify commandline arguments with config files and environment variables.  And make it easier for users to tell your program how to behave across the three main input sources")
     (license license:expat)))
 
+(define-public rust-clap-lex-0.2
+  (package
+    (name "rust-clap-lex")
+    (version "0.2.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "clap_lex" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-6))))
+    (home-page "https://github.com/clap-rs/clap/tree/master/clap_lex")
+    (synopsis "Minimal, flexible command line parser")
+    (description "Minimal, flexible command line parser")
+    (license (list license:expat license:asl2.0))))
+
 (define-public svd2rust
   (package
     (name "svd2rust")
-- 
2.38.0

[bug#56752] [PATCH 08/10] gnu: rust-clap-derive-3: Update to 3.1.18.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-clap-derive-3): Update to 3.1.18.
---
 gnu/packages/crates-io.scm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cf086b882b..fc70f3f7d8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10458,23 +10458,20 @@ (define-public rust-clang-sys-0.11
 (define-public rust-clap-derive-3
   (package
     (name "rust-clap-derive")
-    (version "3.0.0-beta.2")
+    (version "3.1.18")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "clap_derive" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "18cn82jhcha7m0nkpi1a03jx8k7aaq5kxfcxnsqpaa8ih5dp23rp"))))
+        (base32 "0g53w6qkqcc122bqh51jzfg51147il643idvq1czxkr2x5306ci5"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-heck" ,rust-heck-0.3)
-        ("rust-proc-macro-error"
-         ,rust-proc-macro-error-1)
+       (("rust-heck" ,rust-heck-0.4)
+        ("rust-proc-macro-error" ,rust-proc-macro-error-1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))
-- 
2.38.0

[bug#56752] [PATCH 09/10] gnu: rust-clap-3: Update to 3.1.18.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-clap-3): Update to 3.1.18.
---
 gnu/packages/crates-io.scm | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index fc70f3f7d8..20ef816312 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10486,36 +10486,43 @@ (define-public rust-clap-derive-3
 (define-public rust-clap-3
   (package
     (name "rust-clap")
-    (version "3.0.0-beta.2")
+    (version "3.1.18")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "clap" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0hm1kivw6190rxbfqhdr4hqwlrijvwh90i3d9dyyw0d5k0chdlab"))))
+        (base32 "02s4hk9hrmm2s1j7dkbwpyd75mfzx3p8ks2chmp4ccybv95xznyj"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #:cargo-inputs
        (("rust-atty" ,rust-atty-0.2)
+        ("rust-backtrace" ,rust-backtrace-0.3)
         ("rust-bitflags" ,rust-bitflags-1)
         ("rust-clap-derive" ,rust-clap-derive-3)
+        ("rust-clap-lex" ,rust-clap-lex-0.2)
         ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-os-str-bytes" ,rust-os-str-bytes-2)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-regex" ,rust-regex-1)
         ("rust-strsim" ,rust-strsim-0.10)
         ("rust-termcolor" ,rust-termcolor-1)
         ("rust-terminal-size" ,rust-terminal-size-0.1)
-        ("rust-textwrap" ,rust-textwrap-0.12)
-        ("rust-unicode-width" ,rust-unicode-width-0.1)
-        ("rust-vec-map" ,rust-vec-map-0.8)
+        ("rust-textwrap" ,rust-textwrap-0.15)
+        ("rust-unicase" ,rust-unicase-2)
         ("rust-yaml-rust" ,rust-yaml-rust-0.4))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-humantime" ,rust-humantime-2)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-regex" ,rust-regex-1)
-        ("rust-version-sync" ,rust-version-sync-0.8))))
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-shlex" ,rust-shlex-1)
+        ("rust-snapbox" ,rust-snapbox-0.4)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ;; ("rust-trycmd" ,rust-trycmd-0.13)
+       )))
     (home-page "https://clap.rs/")
     (synopsis "Command Line Argument Parser")
     (description
-- 
2.38.0

[bug#56752] [PATCH 10/10] gnu: Add swayr.

[Nicolas Graves via Guix-patches via]

* gnu/packages/rust-apps.scm (swayr): New variable.
---
 gnu/packages/rust-apps.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 693489264d..66b89a6b2a 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1900,6 +1900,43 @@ (define-public swayhide
 terminal won't have to take up any space.")
     (license license:gpl3+)))
 
+(define-public swayr
+  (package
+   (name "swayr")
+   (version "0.18.0")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (crate-uri "swayr" version))
+     (file-name (string-append name "-" version ".tar.gz"))
+     (sha256
+      (base32 "1m443lwbs3lm20kkviw60db56w9i59dm393z1sn6llpfi2xihh3h"))))
+   (build-system cargo-build-system)
+   (arguments
+    `(#:tests? #f
+      #:cargo-inputs
+      (("rust-clap" ,rust-clap-3)
+       ("rust-directories" ,rust-directories-4)
+       ("rust-env-logger" ,rust-env-logger-0.9)
+       ("rust-log" ,rust-log-0.4)
+       ("rust-once-cell" ,rust-once-cell-1)
+       ("rust-rand" ,rust-rand-0.8)
+       ("rust-regex" ,rust-regex-1)
+       ("rust-rt-format" ,rust-rt-format-0.3)
+       ("rust-serde" ,rust-serde-1)
+       ("rust-serde-json" ,rust-serde-json-1)
+       ("rust-swayipc" ,rust-swayipc-3)
+       ("rust-toml" ,rust-toml-0.5))))
+   (home-page "https://sr.ht/~tsdh/swayr/")
+   (synopsis "Window-switcher for the sway window manager")
+   (description
+    "This package provides a last-recently-used window-switcher for the sway
+window manager. Swayr consists of a daemon, and a client. The swayrd daemon
+records window/workspace creations, deletions, and focus changes using sway's
+JSON IPC interface. The swayr client offers subcommands, and sends them to the
+daemon which executes them.")
+   (license license:gpl3+)))
+
 (define-public tealdeer
   (package
     (name "tealdeer")
-- 
2.38.0

[bug#56752] [PATCH 01/10] gnu: rust-thiserror-impl-1: Update to 1.0.37.

[Nicolas Graves via Guix-patches via]

Hi!

I sent a patch series of an earlier version of swayr, with a minimal set
of patches. It should be easier to review.

Hopefully we can have the package in guix soon ;)

-- 
Best regards,
Nicolas Graves

[bug#56752] [PATCH v2 01/10] gnu: rust-thiserror-impl-1: Update to 1.0.37.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-thiserror-impl-1): Update to 1.0.37.
---
 gnu/packages/crates-io.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 420e254fb3..c7b87dd8a2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -58089,16 +58089,14 @@ (define-public rust-thiserror-1
 (define-public rust-thiserror-impl-1
   (package
     (name "rust-thiserror-impl")
-    (version "1.0.26")
+    (version "1.0.37")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "thiserror-impl" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0ia72qiynlws5avb8f1xqlazp4g6bqgzjbwy5vs6nyg7myh6j386"))))
+        (base32 "1fydmpksd14x1mkc24zas01qjssz8q43sbn2ywl6n527dda1fbcq"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.38.0

[bug#56752] [PATCH v2 02/10] gnu: rust-thiserror-1: Update to 1.0.37.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-thiserror-1): Update to 1.0.37.
---
 gnu/packages/crates-io.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c7b87dd8a2..eb4a0c2c9e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -58061,16 +58061,14 @@ (define-public rust-thin-slice-0.1
 (define-public rust-thiserror-1
   (package
     (name "rust-thiserror")
-    (version "1.0.26")
+    (version "1.0.37")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "thiserror" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "1qmz542pq4wmz3p0s4kavsqv09h0x99klkf3k33ydjy1x97rw4ck"))))
+        (base32 "0gky83x4i87gd87w3fknnp920wvk9yycp7dgkf5h3jg364vb7phh"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.38.0

[bug#56752] [PATCH v2 03/10] gnu: Add rust-textwrap-0.15.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-textwrap-0.15): New variable.
---
 gnu/packages/crates-io.scm | 43 ++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index eb4a0c2c9e..a5a4a41e84 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -57982,8 +57982,39 @@ (define-public rust-text-size-1
     (description "This package provides a newtypes for text offsets")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-textwrap-0.15
+  (package
+    (name "rust-textwrap")
+    (version "0.15.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "textwrap" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1yw513k61lfiwgqrfvsjw1a5wpvm0azhpjr2kr0jhnq9c56is55i"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-hyphenation" ,rust-hyphenation-0.8)
+        ("rust-smawk" ,rust-smawk-0.3)
+        ("rust-terminal-size" ,rust-terminal-size-0.1)
+        ("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1)
+        ("rust-unicode-width" ,rust-unicode-width-0.1))))
+    (home-page
+     "https://github.com/mgeisler/textwrap")
+    (synopsis "Library for word wrapping, indenting, and dedenting strings")
+    (description
+     "Textwrap is a small library for word wrapping, indenting, and dedenting
+strings.  You can use it to format strings (such as help and error messages)
+for display in commandline applications.  It is designed to be efficient and
+handle Unicode characters correctly.")
+    (license license:expat)))
+
 (define-public rust-textwrap-0.12
   (package
+    (inherit rust-textwrap-0.15)
     (name "rust-textwrap")
     (version "0.12.1")
     (source
@@ -57995,22 +58026,12 @@ (define-public rust-textwrap-0.12
        (sha256
         (base32
          "12978qmkl5gcp94lxndpvp9qxq8mxp7hm9xbrw3422dgikchhc10"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-hyphenation" ,rust-hyphenation-0.8)
         ("rust-terminal-size" ,rust-terminal-size-0.1)
-        ("rust-unicode-width" ,rust-unicode-width-0.1))))
-    (home-page
-     "https://github.com/mgeisler/textwrap")
-    (synopsis "Library for word wrapping, indenting, and dedenting strings")
-    (description
-     "Textwrap is a small library for word wrapping, indenting, and dedenting
-strings.  You can use it to format strings (such as help and error messages)
-for display in commandline applications.  It is designed to be efficient and
-handle Unicode characters correctly.")
-    (license license:expat)))
+        ("rust-unicode-width" ,rust-unicode-width-0.1))))))
 
 (define-public rust-textwrap-0.11
   (package
-- 
2.38.0

[bug#56752] [PATCH v2 04/10] gnu: Add rust-swayipc-types-1.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-swayipc-types-1): New variable.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a5a4a41e84..4f7c9b46ba 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55769,6 +55769,31 @@ (define-public rust-swayipc-command-builder-0.1
 executed by swayipc.")
     (license license:expat)))
 
+(define-public rust-swayipc-types-1
+  (package
+   (name "rust-swayipc-types")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "swayipc-types" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13lj6jyyxg41r9g0b07y8yd7ygy5gih61w5v48bpksvfdzhwwn55"))))
+   (build-system cargo-build-system)
+   (arguments
+    `(#:skip-build? #t
+      #:cargo-inputs
+      (("rust-serde" ,rust-serde-1)
+       ("rust-serde-json" ,rust-serde-json-1)
+       ("rust-thiserror" ,rust-thiserror-1))))
+   (home-page "https://github.com/jaycefayne/swayipc-rs")
+   (synopsis "A library containing Type defintions from sway's IPC interface")
+   (description
+    "This package provides a library containing Type defintions from sway's IPC
+interface")
+   (license license:expat)))
+
 (define-public rust-syn-1
   (package
     (name "rust-syn")
-- 
2.38.0

[bug#56752] [PATCH v2 05/10] gnu: Add rust-swayipc-3.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-swayipc-3): New variable.
---
 gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4f7c9b46ba..934d2a35ef 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -55724,8 +55724,34 @@ (define-public rust-sval-derive-1
     (description "This package provides custom derive for @code{sval}.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-swayipc-3
+  (package
+    (name "rust-swayipc")
+    (version "3.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "swayipc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "16pf4r6svf99p73b8dhdannkvhfvmbjb4rx7gifxh8xj53rwy7db"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1)
+        ("rust-swayipc-types" ,rust-swayipc-types-1))))
+    (home-page "https://github.com/jaycefayne/swayipc-rs")
+    (synopsis "Library for controlling sway through its IPC interface")
+    (description
+     "This package provides a library for controlling sway through its IPC
+interface.")
+    (license license:expat)))
+
 (define-public rust-swayipc-2
   (package
+    (inherit rust-swayipc-3)
     (name "rust-swayipc")
     (version "2.7.2")
     (source
@@ -55735,20 +55761,13 @@ (define-public rust-swayipc-2
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "03r15c2sijyrxmpsyjgma4gz7zmdl1g8akjnjkw6hrml91d5dilj"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f                      ; test sync::tests::connect ... FAILED
        #:cargo-inputs
        (("rust-serde" ,rust-serde-1)
         ("rust-async-std" ,rust-async-std-1)
         ("rust-swayipc-command-builder" ,rust-swayipc-command-builder-0.1)
-        ("rust-serde-json" ,rust-serde-json-1))))
-    (home-page "https://github.com/jaycefayne/swayipc-rs")
-    (synopsis "Library for controlling sway through its IPC interface")
-    (description
-     "This package provides a library for controlling sway through its IPC
-interface.")
-    (license license:expat)))
+        ("rust-serde-json" ,rust-serde-json-1))))))
 
 (define-public rust-swayipc-command-builder-0.1
   (package
-- 
2.38.0

[bug#56752] [PATCH v2 06/10] gnu: Add rust-rt-format-0.3.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-rt-format-0.3): New variable.
---
 gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 934d2a35ef..064f6d39cf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68275,6 +68275,32 @@ (define-public rust-inflections-1
       "High performance inflection transformation library for changing properties of words like the case.")
     (license license:expat)))
 
+(define-public rust-rt-format-0.3
+  (package
+    (name "rust-rt-format")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rt-format" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1qjjwh9ny95xck1kp99gi6hfm9glrx54jx8npnj6yccxc7p7q225"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-regex" ,rust-regex-1))))
+    (home-page "https://github.com/vstojkovic/rt-format")
+    (synopsis "Runtime equivalent of the Rust format! macro")
+    (description "This package provides a runtime equivalent of the Rust
+format! macro. It allows formatting strings like the format! macro, with the
+formatting string and the arguments provided at runtime.  This crate supports
+all the formatting features of the format! macro, except for the fill
+character.")
+    (license license:asl2.0)))
+
 (define-public rust-rustc-workspace-hack-1
   (package
     (name "rust-rustc-workspace-hack")
-- 
2.38.0

[bug#56752] [PATCH v2 07/10] gnu: Add rust-clap-lex-0.2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-clap-lex-0.2): New variable.
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 064f6d39cf..8a41ddf9e2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -68472,6 +68472,28 @@ (define-public rust-clap-conf-0.1
       "This package provides a library to unify commandline arguments with config files and environment variables.  And make it easier for users to tell your program how to behave across the three main input sources")
     (license license:expat)))
 
+(define-public rust-clap-lex-0.2
+  (package
+    (name "rust-clap-lex")
+    (version "0.2.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "clap_lex" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-6))))
+    (home-page "https://github.com/clap-rs/clap/tree/master/clap_lex")
+    (synopsis "Command-line parser for Rust")
+    (description "This package provides a command-line parser for Rust.  As
+opposed to a declarative parser, @code{rust-clap-lex} processes arguments as a
+stream of tokens.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public svd2rust
   (package
     (name "svd2rust")
-- 
2.38.0

[bug#56752] [PATCH v2 08/10] gnu: rust-clap-derive-3: Update to 3.1.18.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-clap-derive-3): Update to 3.1.18.
---
 gnu/packages/crates-io.scm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8a41ddf9e2..80576f3533 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10458,23 +10458,20 @@ (define-public rust-clang-sys-0.11
 (define-public rust-clap-derive-3
   (package
     (name "rust-clap-derive")
-    (version "3.0.0-beta.2")
+    (version "3.1.18")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "clap_derive" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "18cn82jhcha7m0nkpi1a03jx8k7aaq5kxfcxnsqpaa8ih5dp23rp"))))
+        (base32 "0g53w6qkqcc122bqh51jzfg51147il643idvq1czxkr2x5306ci5"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-heck" ,rust-heck-0.3)
-        ("rust-proc-macro-error"
-         ,rust-proc-macro-error-1)
+       (("rust-heck" ,rust-heck-0.4)
+        ("rust-proc-macro-error" ,rust-proc-macro-error-1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))
-- 
2.38.0

[bug#56752] [PATCH v2 09/10] gnu: rust-clap-3: Update to 3.1.18.

[Nicolas Graves via Guix-patches via]

* gnu/packages/crates-io.scm (rust-clap-3): Update to 3.1.18.
---
 gnu/packages/crates-io.scm | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 80576f3533..cb4afafcb6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -10486,36 +10486,43 @@ (define-public rust-clap-derive-3
 (define-public rust-clap-3
   (package
     (name "rust-clap")
-    (version "3.0.0-beta.2")
+    (version "3.1.18")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "clap" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0hm1kivw6190rxbfqhdr4hqwlrijvwh90i3d9dyyw0d5k0chdlab"))))
+        (base32 "02s4hk9hrmm2s1j7dkbwpyd75mfzx3p8ks2chmp4ccybv95xznyj"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #:cargo-inputs
        (("rust-atty" ,rust-atty-0.2)
+        ("rust-backtrace" ,rust-backtrace-0.3)
         ("rust-bitflags" ,rust-bitflags-1)
         ("rust-clap-derive" ,rust-clap-derive-3)
+        ("rust-clap-lex" ,rust-clap-lex-0.2)
         ("rust-indexmap" ,rust-indexmap-1)
-        ("rust-os-str-bytes" ,rust-os-str-bytes-2)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-regex" ,rust-regex-1)
         ("rust-strsim" ,rust-strsim-0.10)
         ("rust-termcolor" ,rust-termcolor-1)
         ("rust-terminal-size" ,rust-terminal-size-0.1)
-        ("rust-textwrap" ,rust-textwrap-0.12)
-        ("rust-unicode-width" ,rust-unicode-width-0.1)
-        ("rust-vec-map" ,rust-vec-map-0.8)
+        ("rust-textwrap" ,rust-textwrap-0.15)
+        ("rust-unicase" ,rust-unicase-2)
         ("rust-yaml-rust" ,rust-yaml-rust-0.4))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-humantime" ,rust-humantime-2)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-regex" ,rust-regex-1)
-        ("rust-version-sync" ,rust-version-sync-0.8))))
+        ("rust-rustversion" ,rust-rustversion-1)
+        ("rust-shlex" ,rust-shlex-1)
+        ("rust-snapbox" ,rust-snapbox-0.4)
+        ("rust-trybuild" ,rust-trybuild-1)
+        ;; ("rust-trycmd" ,rust-trycmd-0.13)
+       )))
     (home-page "https://clap.rs/")
     (synopsis "Command Line Argument Parser")
     (description
-- 
2.38.0

[bug#56752] [PATCH v2 10/10] gnu: Add swayr.

[Nicolas Graves via Guix-patches via]

* gnu/packages/rust-apps.scm (swayr): New variable.
---
 gnu/packages/rust-apps.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 693489264d..66b89a6b2a 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1900,6 +1900,43 @@ (define-public swayhide
 terminal won't have to take up any space.")
     (license license:gpl3+)))
 
+(define-public swayr
+  (package
+   (name "swayr")
+   (version "0.18.0")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (crate-uri "swayr" version))
+     (file-name (string-append name "-" version ".tar.gz"))
+     (sha256
+      (base32 "1m443lwbs3lm20kkviw60db56w9i59dm393z1sn6llpfi2xihh3h"))))
+   (build-system cargo-build-system)
+   (arguments
+    `(#:tests? #f
+      #:cargo-inputs
+      (("rust-clap" ,rust-clap-3)
+       ("rust-directories" ,rust-directories-4)
+       ("rust-env-logger" ,rust-env-logger-0.9)
+       ("rust-log" ,rust-log-0.4)
+       ("rust-once-cell" ,rust-once-cell-1)
+       ("rust-rand" ,rust-rand-0.8)
+       ("rust-regex" ,rust-regex-1)
+       ("rust-rt-format" ,rust-rt-format-0.3)
+       ("rust-serde" ,rust-serde-1)
+       ("rust-serde-json" ,rust-serde-json-1)
+       ("rust-swayipc" ,rust-swayipc-3)
+       ("rust-toml" ,rust-toml-0.5))))
+   (home-page "https://sr.ht/~tsdh/swayr/")
+   (synopsis "Window-switcher for the sway window manager")
+   (description
+    "This package provides a last-recently-used window-switcher for the sway
+window manager. Swayr consists of a daemon, and a client. The swayrd daemon
+records window/workspace creations, deletions, and focus changes using sway's
+JSON IPC interface. The swayr client offers subcommands, and sends them to the
+daemon which executes them.")
+   (license license:gpl3+)))
+
 (define-public tealdeer
   (package
     (name "tealdeer")
-- 
2.38.0