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

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

[Aleksandr Vityazev]

* gnu/packages/crates-io.scm (rust-rt-format-0.3): 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 16ac36c9f5..4294c4beda 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14806,6 +14806,31 @@ (define-public rust-roxmltree-0.14
      "@code{roxmltree} represents an XML 1.0 document as a read-only tree.")
     (license (list license:expat license:asl2.0))))
 
+(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.
+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-rust-crypto-0.2
   (package
     (name "rust-rust-crypto")
-- 
2.37.1



-- 

Aleksandr Vityazev

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

[Aleksandr Vityazev]

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4294c4beda..be616d29a0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -59995,6 +59995,30 @@ (define-public rust-sval-derive-0.4
         ("rust-syn" ,rust-syn-1)
         ("rust-quote" ,rust-quote-1))))))
 
+(define-public rust-swaybar-types-3
+  (package
+    (name "rust-swaybar-types")
+    (version "3.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "swaybar-types" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0hz1ialgs4l0ki5s9gqhsdlfy0v3fph7mkw2z1rdi29bjlsv9h52"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-serde" ,rust-serde-1)
+        ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/jaycefayne/swaybar-types")
+    (synopsis "Library for building swaybar status commands in rust.")
+    (description
+     "This package provides a library for building swaybar status commands in
+Rust.")
+    (license license:expat)))
+
 (define-public rust-swayipc-2
   (package
     (name "rust-swayipc")
-- 
2.37.1



-- 

Aleksandr Vityazev

[bug#56752] [PATCH 03/27] gnu: rust-thiserror-impl-1: Update to 1.0.31.

[Aleksandr Vityazev]

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index be616d29a0..657d85f7ec 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62668,16 +62668,15 @@ (define-public rust-thiserror-1
 (define-public rust-thiserror-impl-1
   (package
     (name "rust-thiserror-impl")
-    (version "1.0.26")
+    (version "1.0.31")
     (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"))))
+         "16npm1s1cv9kxkk7is7blnayfnf41hny46gqprc4c916ws4vr5h3"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.37.1



-- 

Aleksandr Vityazev

[bug#56752] [PATCH 04/27] gnu: rust-thiserror-1: Update to 1.0.31.

[Aleksandr Vityazev]

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 657d85f7ec..09d0234fc8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62640,16 +62640,15 @@ (define-public rust-thin-slice-0.1
 (define-public rust-thiserror-1
   (package
     (name "rust-thiserror")
-    (version "1.0.26")
+    (version "1.0.31")
     (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"))))
+         "16h6d602kmjilbfw28zma22wnh03klqba82n4rv7zlkk4girz0mx"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
2.37.1



-- 

Aleksandr Vityazev

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

[Aleksandr Vityazev]

* gnu/packages/crates-io.scm (rust-swayipc-types-1): 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 09d0234fc8..2974bf344a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60064,6 +60064,32 @@ (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.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "swayipc-types" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "11p2jj081f7bw2rc6xqvw3y8bdraqqrmm3vsvq5mx7ds00r35jiq"))))
+    (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 "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-swc-1
   (package
     (name "rust-swc")
-- 
2.37.1



-- 

Aleksandr Vityazev

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

[Maxime Devos]

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


On 24-07-2022 23:33, Aleksandr Vityazev wrote:
> +  (package
> +    (name "rust-swayipc-types")
> +    (version "1.1.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (crate-uri "swayipc-types" version))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "11p2jj081f7bw2rc6xqvw3y8bdraqqrmm3vsvq5mx7ds00r35jiq"))))
> +    (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))))

Warning: this is one of those overly picky packages that pin the minor 
version of rust-serde & rust-serde-json & rust-thiserror, you will have 
to patch the Cargo.toml to relax it a bit, otherwise it will break with 
future updates to rust-swayipc-types. Alternatively, you can wait for 
antioxidant.

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 05/27] gnu: Add rust-swayipc-types-1.

[Maxime Devos]

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


On 24-07-2022 23:37, Maxime Devos wrote:
> Warning: this is one of those overly picky packages that pin the minor 
> version of rust-serde & rust-serde-json & rust-thiserror, you will 
> have to patch the Cargo.toml to relax it a bit, otherwise it will 
> break with future updates to rust-swayipc-types. Alternatively, you 
> can wait for antioxidant. 
(Also check for the other packages)

[-- 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 06/27] gnu: Add rust-swayipc-3.

[Aleksandr Vityazev]

* gnu/packages/crates-io.scm (rust-swayipc-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 2974bf344a..01ca45349d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -60019,6 +60019,32 @@ (define-public rust-swaybar-types-3
 Rust.")
     (license license:expat)))
 
+(define-public rust-swayipc-3
+  (package
+    (name "rust-swayipc")
+    (version "3.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "swayipc" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1v6arq79b72wm938yvb72j8np04n4ia9r78idg2ffcczp8mpxk20"))))
+    (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
     (name "rust-swayipc")
-- 
2.37.1



-- 

Aleksandr Vityazev

[bug#56752] [PATCH 06/27] gnu: Add rust-swayipc-3.

[Maxime Devos]

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


On 24-07-2022 23:33, Aleksandr Vityazev wrote:
> +    (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)))
> +

We already have that package, try "guix edit rust-swayipc". No need to 
override the description, home-page, etc.

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 00/27] Add swayr and swayrbar.

[Aleksandr Vityazev]

On 2022-07-24, 23:35 +0200, Maxime Devos <maximedevos@telenet.be> wrote:

> On 24-07-2022 23:33, Aleksandr Vityazev wrote:
>> +    (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)))
>> +
>
> We already have that package, try "guix edit rust-swayipc". No need to override the description,
> home-page, etc.

We have rust-swayipc-2, and I have not seen the newer version inherited
from the older one. In this case, we can add inheritance for
rust-swayipc-2.

-- 
Best regards,
Aleksandr Vityazev

[bug#56752] [PATCH 06/27] gnu: Add rust-swayipc-3.

[Maxime Devos]

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


On 24-07-2022 23:33, Aleksandr Vityazev wrote:
> +(define-public rust-swayipc-3
> +  (package
> +    (name "rust-swayipc")
> +    (version "3.0.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (crate-uri "swayipc" version))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "1v6arq79b72wm938yvb72j8np04n4ia9r78idg2ffcczp8mpxk20"))))

Looks like this can not legally be distributed as-is -- from the expat 
license:

> Permission is hereby granted, free of charge, to any person obtaining 
> a copy of this software and associated documentation files (the 
> "Software"), to deal in the Software without restriction, including 
> without limitation the rights to use, copy, modify, merge, publish, 
> distribute, sublicense, and/or sell copies of the Software, and to 
> permit persons to whom the Software is furnished to do so, ___subject 
> to the following conditions___:
>
> __The above copyright notice and this permission notice shall be 
> included in all copies or substantial portions of the Software.___
>
(emphasis mine).

This notice is missing from the tarball I've downloaded.  The other 
packages might have the same issue, please check.

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 15/27] gnu: rust-once-cell-1: Update to 1.13.0.

[Aleksandr Vityazev]

* gnu/packages/crates-io.scm (rust-once-cell-1): Update to 1.13.0.
---
 gnu/packages/crates-io.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b6cab46620..a8a5854acc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -39276,7 +39276,7 @@ (define-public rust-onig-sys-69.2
 (define-public rust-once-cell-1
   (package
     (name "rust-once-cell")
-    (version "1.9.0")
+    (version "1.13.0")
     (source
      (origin
        (method url-fetch)
@@ -39284,14 +39284,15 @@ (define-public rust-once-cell-1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1mfqhrsgi368x92bwnq3vi3p5nv0n1qlrn69gfflhvkfkxfm2cns"))))
+        (base32 "1qfqvgnwfzzwxd13ybvplzshaqwnjnna9ghcn0zgijaq0zixp9hq"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #:cargo-inputs
        (("rust-atomic-polyfill" ,rust-atomic-polyfill-0.1)
-        ("rust-parking-lot" ,rust-parking-lot-0.11))
+        ("rust-parking-lot-core" ,rust-parking-lot-core-0.9))
        #:cargo-development-inputs
-       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)
+       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-regex" ,rust-regex-1))))
     (home-page "https://github.com/matklad/once_cell")
-- 
2.37.1



-- 

Aleksandr Vityazev

[bug#56752] [PATCH 15/27] gnu: rust-once-cell-1: Update to 1.13.0.

[Maxime Devos]

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


On 24-07-2022 23:36, Aleksandr Vityazev wrote:
>          (("rust-atomic-polyfill" ,rust-atomic-polyfill-0.1)
> -        ("rust-parking-lot" ,rust-parking-lot-0.11))
> +        ("rust-parking-lot-core" ,rust-parking-lot-core-0.9))
>          #:cargo-development-inputs
> -       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)
> +       (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)

This is another one of those overly-strict packages.

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 16/27] gnu: rust-regex-syntax-0.6: Update to 0.6.27.

[Aleksandr Vityazev]

* gnu/packages/crates-io.scm (rust-regex-syntax-0.6): Update to 0.6.27.
---
 gnu/packages/crates-io.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a8a5854acc..1df88bc5aa 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48504,19 +48504,19 @@ (define-public rust-regex-automata-0.1
 (define-public rust-regex-syntax-0.6
   (package
     (name "rust-regex-syntax")
-    (version "0.6.25")
+    (version "0.6.27")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "regex-syntax" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16y87hz1bxmmz6kk360cxwfm3jnbsxb3x4zw9x1gzz7khic2i5zl"))))
+        (base32 "0i32nnvyzzkvz1rqp2qyfxrp2170859z8ck37jd63c8irrrppy53"))))
     (build-system cargo-build-system)
+    (arguments `(#:skip-build? #t))
     (home-page "https://github.com/rust-lang/regex")
     (synopsis "Regular expression parser")
-    (description
-     "This package provides a regular expression parser.")
+    (description "This package provides a regular expression parser.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-regex-syntax-0.5
-- 
2.37.1



-- 

Aleksandr Vityazev

[bug#56752] [PATCH 17/27] gnu: rust-regex-1: Update to 1.6.0.

[Aleksandr Vityazev]

* gnu/packages/crates-io.scm (rust-regex-1): Update to 1.6.0.
[arguments]: Set #:skip-build? to #t.
---
 gnu/packages/crates-io.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1df88bc5aa..eb0272cc6a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -48385,17 +48385,18 @@ (define-public rust-refpool-0.4
 (define-public rust-regex-1
   (package
     (name "rust-regex")
-    (version "1.5.4")
+    (version "1.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "regex" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0qf479kjbmb582h4d1d6gfl75h0j8aq2nrdi5wg6zdcy6llqcynh"))))
+        (base32 "12wqvyh4i75j7pc8sgvmqh4yy3qaj4inc4alyv1cdf3lf4kb6kjc"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t
+       #:cargo-inputs
        (("rust-aho-corasick" ,rust-aho-corasick-0.7)
         ("rust-memchr" ,rust-memchr-2)
         ("rust-regex-syntax" ,rust-regex-syntax-0.6))
-- 
2.37.1



-- 

Aleksandr Vityazev

[bug#56752] [PATCH 18/27] gnu: Add rust-peg-runtime-0.8.

[Aleksandr Vityazev]

* gnu/packages/crates-io.scm (rust-peg-runtime-0.8): New variable.
---
 gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index eb0272cc6a..15dc3a658f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41867,6 +41867,27 @@ (define-public rust-peg-macros-0.6
 procedural macros for rust-peg.  To use rust-peg, see the peg package.")
     (license license:expat)))
 
+(define-public rust-peg-runtime-0.8
+  (package
+    (name "rust-peg-runtime")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "peg-runtime" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "17znn3433nhhwks3zrmry2y45i4y4xgl4q2dsh4s9hq3pb9yzc7r"))))
+    (build-system cargo-build-system)
+    (arguments `(#:skip-build? #t))
+    (home-page "https://github.com/kevinmehall/rust-peg")
+    (synopsis "Runtime support for rust-peg grammars")
+    (description
+     "PEG provides a Parsing Expression Grammar.  This package provides
+runtime support for rust-peg grammars.  To use rust-peg, see the peg crate.")
+    (license license:expat)))
+
 (define-public rust-peg-runtime-0.6
   (package
     (name "rust-peg-runtime")
-- 
2.37.1



-- 

Aleksandr Vityazev

[bug#56752] [PATCH 19/27] gnu: Add rust-peg-macros-0.8.

[Aleksandr Vityazev]

* gnu/packages/crates-io.scm (rust-peg-macros-0.8): 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 15dc3a658f..cf0c8f7150 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41841,6 +41841,32 @@ (define-public rust-peg-0.5
     (arguments
      `(#:cargo-inputs (("rust-quote" ,rust-quote-0.3))))))
 
+(define-public rust-peg-macros-0.8
+  (package
+    (name "rust-peg-macros")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "peg-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "05nwzh94lvkalkm4cjac9gqlk3nfri7r7bfbjm4842vpgcabwdj5"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-peg-runtime" ,rust-peg-runtime-0.8)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1))))
+    (home-page "https://github.com/kevinmehall/rust-peg")
+    (synopsis "Procedural macros for rust-peg")
+    (description
+     "PEG provides a Parsing Expression Grammar.  This package provides
+procedural macros for rust-peg.  To use rust-peg, see the peg package.")
+    (license license:expat)))
+
 (define-public rust-peg-macros-0.6
   (package
     (name "rust-peg-macros")
-- 
2.37.1



-- 

Aleksandr Vityazev

[bug#56752] [PATCH 20/27] gnu: Add rust-peg-0.8.

[Aleksandr Vityazev]

* gnu/packages/crates-io.scm (rust-peg-0.8): New variable.
---
 gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index cf0c8f7150..fb4fa7b0ff 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41795,6 +41795,33 @@ (define-public rust-peeking-take-while-0.1
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-peg-0.8
+  (package
+    (name "rust-peg")
+    (version "0.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "peg" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0b6dgycdclxfxdp6ag9px99mjj04s7k3vs9pijrz66l14vl8ywmg"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-peg-macros" ,rust-peg-macros-0.8)
+        ("rust-peg-runtime" ,rust-peg-runtime-0.8))
+       #:cargo-development-inputs
+       (("rust-trybuild" ,rust-trybuild-1))))
+    (home-page "https://github.com/kevinmehall/rust-peg")
+    (synopsis "Simple Parsing Expression Grammar (PEG) parser generator")
+    (description
+     "PEG provides a simple Parsing Expression Grammar (PEG) parser generator
+in Rust.")
+    (license license:expat)))
+
 (define-public rust-peg-0.6
   (package
     (name "rust-peg")
-- 
2.37.1



-- 

Aleksandr Vityazev

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

[Aleksandr Vityazev]

* 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 fb4fa7b0ff..8eb075ab8f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -73554,6 +73554,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 "Minimal, flexible command line parser")
+    (description "This package provides minimal, flexible command line parser.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-cvss-1
   (package
     (name "rust-cvss")
-- 
2.37.1



-- 

Aleksandr Vityazev

[bug#56752] [PATCH 24/27] gnu: rust-clap-derive-3: Update to 3.2.7.

[Aleksandr Vityazev]

* gnu/packages/crates-io.scm (rust-clap-derive-3): Update to 3.2.7.
[source]<origin>: Update URI.
[arguments]<#:cargo-inputs>: Update.
---
 gnu/packages/crates-io.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f9a11dd408..ef7e5f16d9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -11192,21 +11192,21 @@ (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.2.7")
     (source
      (origin
        (method url-fetch)
-       (uri (crate-uri "clap_derive" version))
+       (uri (crate-uri "clap-derive" version))
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "18cn82jhcha7m0nkpi1a03jx8k7aaq5kxfcxnsqpaa8ih5dp23rp"))))
+         "00prk3kkk4fi5aavlpa10d9akrx3cjkfcndrhmxzl6kf6y3z36vm"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-heck" ,rust-heck-0.3)
+       (("rust-heck" ,rust-heck-0.4)
         ("rust-proc-macro-error"
          ,rust-proc-macro-error-1)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
-- 
2.37.1



-- 

Aleksandr Vityazev

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

[Aleksandr Vityazev]

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

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 0d5034ffb7..e15d505818 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1627,6 +1627,44 @@ (define-public swayhide
 terminal won't have to take up any space.")
     (license license:gpl3+)))
 
+(define-public swayr
+  (package
+    (name "swayr")
+    (version "0.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "swayr" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1a79dwj0gy11w7skli7k9rwn3jxb5afirfkrmpymk2vp7lalwx8k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=config::test_load_swayr_config")
+       #: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-peg" ,rust-peg-0.8)
+        ("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 "LRU window-switcher (and more) for the sway window manager")
+    (description
+     "This package provides a LRU window-switcher (and more) for the sway window
+manager.")
+    (license license:gpl3+)))
+
 (define-public tealdeer
   (package
     (name "tealdeer")
-- 
2.37.1



-- 

Aleksandr Vityazev

[bug#56752] [PATCH 27/27] gnu: Add swayrbar.

[Aleksandr Vityazev]

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

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index e15d505818..990e8368b9 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1665,6 +1665,45 @@ (define-public swayr
 manager.")
     (license license:gpl3+)))
 
+(define-public swayrbar
+  (package
+    (name "swayrbar")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "swayrbar" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "10k3qgm9hr1p54vvf1gnydbp7flvwkk382bb2x943bhvc26g2l7x"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=config::test_load_swayrbar_config")
+       #:cargo-inputs
+       (("rust-battery" ,rust-battery-0.7)
+        ("rust-chrono" ,rust-chrono-0.4)
+        ("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-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-swaybar-types" ,rust-swaybar-types-3)
+        ("rust-swayipc" ,rust-swayipc-3)
+        ("rust-sysinfo" ,rust-sysinfo-0.23)
+        ("rust-toml" ,rust-toml-0.5))))
+    (home-page "https://sr.ht/~tsdh/swayr/#swayrbar")
+    (synopsis "Swaybar-protocol implementation for sway/swaybar")
+    (description
+     "This package provides a swaybar-protocol implementation for sway/swaybar.")
+    (license license:gpl3+)))
+
 (define-public tealdeer
   (package
     (name "tealdeer")
-- 
2.37.1



-- 

Aleksandr Vityazev