[PATCH 00/27] Add swayr and swayrbar.

  • Done
  • quality assurance status badge
Details
5 participants
  • Andrew Tropin
  • Aleksandr Vityazev
  • kiasoc5
  • Maxime Devos
  • Nicolas Graves
Owner
unassigned
Submitted by
Aleksandr Vityazev
Severity
normal
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:01
(address . guix-patches@gnu.org)
cover.1658695688.git.avityazev@posteo.org
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
M
M
Maxime Devos wrote on 24 Jul 2022 23:08
0622891b-7aa1-a4af-7df9-8e096fe536e0@telenet.be
On 24-07-2022 23:01, Aleksandr Vityazev wrote:
Toggle quote (5 lines)
> 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:
for the other packages whether they already have patches, and remove
patches that were already submitted previously from this patch series.
Greetings,
Maxime.
Attachment: OpenPGP_0x49E3EE22191725EE.asc
Attachment: OpenPGP_signature
A
A
Aleksandr Vityazev wrote seconds ago
[PATCH 01/27] gnu: Add rust-rt-format-0.3.
(address . 56752@debbugs.gnu.org)
3fa657737f3a958008ce5835b3648891ef3a8215.1658695688.git.avityazev@posteo.org

A
A
Aleksandr Vityazev wrote seconds ago
[PATCH 02/27] gnu: Add rust-swaybar-types-3.
(address . 56752@debbugs.gnu.org)
1fada90c4e37f551f25bd13aba4d7009bde939c3.1658695688.git.avityazev@posteo.org

A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:30
[PATCH 01/27] gnu: Add rust-rt-format-0.3.
(address . 56752@debbugs.gnu.org)
3fa657737f3a958008ce5835b3648891ef3a8215.1658698210.git.avityazev@posteo.org
* gnu/packages/crates-io.scm (rust-rt-format-0.3): New variable.
---
gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)

Toggle diff (44 lines)
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
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:31
[PATCH 02/27] gnu: Add rust-swaybar-types-3.
(address . 56752@debbugs.gnu.org)
1fada90c4e37f551f25bd13aba4d7009bde939c3.1658698210.git.avityazev@posteo.org
* gnu/packages/crates-io.scm (rust-swaybar-types-3): New variable.
---
gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)

Toggle diff (43 lines)
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
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:32
[PATCH 03/27] gnu: rust-thiserror-impl-1: Update to 1.0.31.
(address . 56752@debbugs.gnu.org)
1f49142004a062cbf1ffd4816d5aac0602cac3d0.1658698210.git.avityazev@posteo.org
* 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(-)

Toggle diff (32 lines)
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
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:32
[PATCH 04/27] gnu: rust-thiserror-1: Update to 1.0.31.
(address . 56752@debbugs.gnu.org)
f648e4f0687a977838d6ed0dfb244ded15ae5a6e.1658698210.git.avityazev@posteo.org
* 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(-)

Toggle diff (32 lines)
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
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:33
[PATCH 05/27] gnu: Add rust-swayipc-types-1.
(address . 56752@debbugs.gnu.org)
587748e23702659d89ca33b7bc9f806939ae5950.1658698210.git.avityazev@posteo.org
* gnu/packages/crates-io.scm (rust-swayipc-types-1): New variable.
---
gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)

Toggle diff (45 lines)
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
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:33
[PATCH 06/27] gnu: Add rust-swayipc-3.
(address . 56752@debbugs.gnu.org)
22132e72eed5efc4cfbd5bec63c21d07bf69f206.1658698210.git.avityazev@posteo.org
* gnu/packages/crates-io.scm (rust-swayipc-3): New variable.
---
gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)

Toggle diff (45 lines)
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
M
M
Maxime Devos wrote on 24 Jul 2022 23:35
5ac5f725-c332-d5f5-7a56-c7bcd22202e4@telenet.be
On 24-07-2022 23:33, Aleksandr Vityazev wrote:
Toggle quote (14 lines)
> + (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: OpenPGP_0x49E3EE22191725EE.asc
Attachment: OpenPGP_signature
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:36
[PATCH 15/27] gnu: rust-once-cell-1: Update to 1.13.0.
(address . 56752@debbugs.gnu.org)
3e72dcd70d995b4344610ca723c5b33e9a1a90e0.1658698211.git.avityazev@posteo.org
* 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(-)

Toggle diff (41 lines)
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
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:37
[PATCH 16/27] gnu: rust-regex-syntax-0.6: Update to 0.6.27.
(address . 56752@debbugs.gnu.org)
98fac8c0c521ee3e4251d60c322e94c5b0df86dd.1658698211.git.avityazev@posteo.org
* 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(-)

Toggle diff (36 lines)
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
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:37
[PATCH 17/27] gnu: rust-regex-1: Update to 1.6.0.
(address . 56752@debbugs.gnu.org)
5f645ba27f42c4033bc852456436e9967ef5b822.1658698211.git.avityazev@posteo.org
* 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(-)

Toggle diff (34 lines)
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
M
M
Maxime Devos wrote on 24 Jul 2022 23:37
Re: [bug#56752] [PATCH 05/27] gnu: Add rust-swayipc-types-1.
29b45ff2-9f2b-fc84-4870-1a8c7e01ba9c@telenet.be
On 24-07-2022 23:33, Aleksandr Vityazev wrote:
Toggle quote (18 lines)
> + (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: OpenPGP_0x49E3EE22191725EE.asc
Attachment: OpenPGP_signature
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:37
[PATCH 18/27] gnu: Add rust-peg-runtime-0.8.
(address . 56752@debbugs.gnu.org)
c9e1930d27f1b1fa0043293f49f56ef0b2e72baa.1658698211.git.avityazev@posteo.org
* gnu/packages/crates-io.scm (rust-peg-runtime-0.8): New variable.
---
gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)

Toggle diff (40 lines)
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
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:38
[PATCH 19/27] gnu: Add rust-peg-macros-0.8.
(address . 56752@debbugs.gnu.org)
b0897a52e51be970dbadfd61cc7244c4d680bb27.1658698211.git.avityazev@posteo.org
* gnu/packages/crates-io.scm (rust-peg-macros-0.8): New variable.
---
gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)

Toggle diff (45 lines)
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
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:38
[PATCH 20/27] gnu: Add rust-peg-0.8.
(address . 56752@debbugs.gnu.org)
9b9d6a529ade14bc26c73fba2e956d4cadfd9db6.1658698211.git.avityazev@posteo.org
* gnu/packages/crates-io.scm (rust-peg-0.8): New variable.
---
gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)

Toggle diff (46 lines)
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
M
M
Maxime Devos wrote on 24 Jul 2022 23:42
Re: [bug#56752] [PATCH 06/27] gnu: Add rust-swayipc-3.
96e27240-bcc4-3bd7-3736-9249bfe0c333@telenet.be
On 24-07-2022 23:33, Aleksandr Vityazev wrote:
Toggle quote (12 lines)
> +(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:
Toggle quote (11 lines)
> 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: OpenPGP_0x49E3EE22191725EE.asc
Attachment: OpenPGP_signature
M
M
Maxime Devos wrote on 24 Jul 2022 23:42
Re: [bug#56752] [PATCH 05/27] gnu: Add rust-swayipc-types-1.
afdbb6e0-7498-4c81-ea2f-217519646e8f@telenet.be
On 24-07-2022 23:37, Maxime Devos wrote:
Toggle quote (5 lines)
> 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: OpenPGP_0x49E3EE22191725EE.asc
Attachment: OpenPGP_signature
M
M
Maxime Devos wrote on 24 Jul 2022 23:43
Re: [bug#56752] [PATCH 15/27] gnu: rust-once-cell-1: Update to 1.13.0.
3f257939-589b-fcc7-3397-443fd6af2998@telenet.be
On 24-07-2022 23:36, Aleksandr Vityazev wrote:
Toggle quote (6 lines)
> (("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: OpenPGP_0x49E3EE22191725EE.asc
Attachment: OpenPGP_signature
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:43
[PATCH 21/27] gnu: Add rust-clap-lex-0.2.
(address . 56752@debbugs.gnu.org)
6336f655218d5a575a464cdab4ae0a3604d19042.1658698211.git.avityazev@posteo.org
* gnu/packages/crates-io.scm (rust-clap-lex-0.2): New variable.
---
gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)

Toggle diff (41 lines)
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
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:47
[PATCH 24/27] gnu: rust-clap-derive-3: Update to 3.2.7.
(address . 56752@debbugs.gnu.org)
2e6418247b405a55a43491403613c37a1ed8f2fd.1658698211.git.avityazev@posteo.org
* 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(-)

Toggle diff (38 lines)
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
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:47
[PATCH 26/27] gnu: Add swayr.
(address . 56752@debbugs.gnu.org)
5b0654b8973124606b2098965d7aa07101121528.1658698212.git.avityazev@posteo.org
* gnu/packages/rust-apps.scm (swayr): New variable.
---
gnu/packages/rust-apps.scm | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)

Toggle diff (57 lines)
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
A
A
Aleksandr Vityazev wrote on 24 Jul 2022 23:48
[PATCH 27/27] gnu: Add swayrbar.
(address . 56752@debbugs.gnu.org)
5d7b6f27e7815cccc60450172816b5be3bf2efbb.1658698212.git.avityazev@posteo.org
* gnu/packages/rust-apps.scm (swayrbar): New variable.
---
gnu/packages/rust-apps.scm | 39 ++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)

Toggle diff (58 lines)
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
A
A
Aleksandr Vityazev wrote on 25 Jul 2022 00:08
Re: bug#56752: [PATCH 00/27] Add swayr and swayrbar.
(name . Maxime Devos)(address . maximedevos@telenet.be)(address . 56752@debbugs.gnu.org)
87h736kvtc.fsf_-_@posteo.org
On 2022-07-24, 23:35 +0200, Maxime Devos <maximedevos@telenet.be> wrote:

Toggle quote (19 lines)
> 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
N
N
Nicolas Graves wrote on 25 Oct 2022 09:35
swayr
(address . 56752@debbugs.gnu.org)
87h6zs2w5n.fsf@ngraves.fr
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:28
[PATCH 01/10] gnu: rust-thiserror-impl-1: Update to 1.0.37.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026082817.30710-1-ngraves@ngraves.fr
* 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(-)

Toggle diff (26 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:28
[PATCH 02/10] gnu: rust-thiserror-1: Update to 1.0.37.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026082817.30710-2-ngraves@ngraves.fr
* 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(-)

Toggle diff (26 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:28
[PATCH 03/10] gnu: Add rust-textwrap-0.15.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026082817.30710-3-ngraves@ngraves.fr
* gnu/packages/crates-io.scm (rust-textwrap-0.15): New variable.
---
gnu/packages/crates-io.scm | 43 ++++++++++++++++++++++++++++----------
1 file changed, 32 insertions(+), 11 deletions(-)

Toggle diff (70 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:28
[PATCH 04/10] gnu: Add rust-swayipc-types-1.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026082817.30710-4-ngraves@ngraves.fr
* gnu/packages/crates-io.scm (rust-swayipc-types-1): New variable.
---
gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)

Toggle diff (38 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:28
[PATCH 05/10] gnu: Add rust-swayipc-3.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026082817.30710-5-ngraves@ngraves.fr
* gnu/packages/crates-io.scm (rust-swayipc-3): New variable.
---
gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)

Toggle diff (63 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:28
[PATCH 06/10] gnu: Add rust-rt-format-0.3.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026082817.30710-6-ngraves@ngraves.fr
* gnu/packages/crates-io.scm (rust-rt-format-0.3): New variable.
---
gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)

Toggle diff (35 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:28
[PATCH 07/10] gnu: Add rust-clap-lex-0.2.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026082817.30710-7-ngraves@ngraves.fr
* gnu/packages/crates-io.scm (rust-clap-lex-0.2): New variable.
---
gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)

Toggle diff (33 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:28
[PATCH 08/10] gnu: rust-clap-derive-3: Update to 3.1.18.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026082817.30710-8-ngraves@ngraves.fr
* 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(-)

Toggle diff (35 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:28
[PATCH 09/10] gnu: rust-clap-3: Update to 3.1.18.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026082817.30710-9-ngraves@ngraves.fr
* 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(-)

Toggle diff (61 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:28
[PATCH 10/10] gnu: Add swayr.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026082817.30710-10-ngraves@ngraves.fr
* gnu/packages/rust-apps.scm (swayr): New variable.
---
gnu/packages/rust-apps.scm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)

Toggle diff (50 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:58
[PATCH v2 01/10] gnu: rust-thiserror-impl-1: Update to 1.0.37.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026085908.2938-1-ngraves@ngraves.fr
* 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(-)

Toggle diff (26 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:59
[PATCH v2 02/10] gnu: rust-thiserror-1: Update to 1.0.37.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026085908.2938-2-ngraves@ngraves.fr
* 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(-)

Toggle diff (26 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:59
[PATCH v2 03/10] gnu: Add rust-textwrap-0.15.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026085908.2938-3-ngraves@ngraves.fr
* gnu/packages/crates-io.scm (rust-textwrap-0.15): New variable.
---
gnu/packages/crates-io.scm | 43 ++++++++++++++++++++++++++++----------
1 file changed, 32 insertions(+), 11 deletions(-)

Toggle diff (70 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:59
[PATCH v2 04/10] gnu: Add rust-swayipc-types-1.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026085908.2938-4-ngraves@ngraves.fr
* gnu/packages/crates-io.scm (rust-swayipc-types-1): New variable.
---
gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)

Toggle diff (38 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:59
[PATCH v2 05/10] gnu: Add rust-swayipc-3.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026085908.2938-5-ngraves@ngraves.fr
* gnu/packages/crates-io.scm (rust-swayipc-3): New variable.
---
gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)

Toggle diff (63 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:59
[PATCH v2 06/10] gnu: Add rust-rt-format-0.3.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026085908.2938-6-ngraves@ngraves.fr
* gnu/packages/crates-io.scm (rust-rt-format-0.3): New variable.
---
gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)

Toggle diff (39 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:59
[PATCH v2 07/10] gnu: Add rust-clap-lex-0.2.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026085908.2938-7-ngraves@ngraves.fr
* gnu/packages/crates-io.scm (rust-clap-lex-0.2): New variable.
---
gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)

Toggle diff (35 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:59
[PATCH v2 08/10] gnu: rust-clap-derive-3: Update to 3.1.18.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026085908.2938-8-ngraves@ngraves.fr
* 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(-)

Toggle diff (35 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:59
[PATCH v2 10/10] gnu: Add swayr.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026085908.2938-10-ngraves@ngraves.fr
* gnu/packages/rust-apps.scm (swayr): New variable.
---
gnu/packages/rust-apps.scm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)

Toggle diff (50 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 10:59
[PATCH v2 09/10] gnu: rust-clap-3: Update to 3.1.18.
(address . 56752@debbugs.gnu.org)(address . ngraves@ngraves.fr)
20221026085908.2938-9-ngraves@ngraves.fr
* 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(-)

Toggle diff (61 lines)
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
N
N
Nicolas Graves wrote on 26 Oct 2022 11:05
Re: [PATCH 01/10] gnu: rust-thiserror-impl-1: Update to 1.0.37.
(address . 56752@debbugs.gnu.org)
87r0yvq7k3.fsf@ngraves.fr
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
K
K
kiasoc5 wrote on 27 Oct 2022 07:54
Re: [bug#56752] swayr
(name . Nicolas Graves via Guix-patches via)(address . guix-patches@gnu.org)
20221027055405.03d3daa6@aria
On Tue, Oct 25 2022, 09:35:16 AM +0200
Nicolas Graves via Guix-patches via <guix-patches@gnu.org> wrote:

Toggle quote (4 lines)
> 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.

--
A
A
Andrew Tropin wrote on 28 Nov 2022 09:53
878rjvcvdn.fsf@trop.in
On 2022-10-25 09:35, Nicolas Graves via Guix-patches via wrote:

Toggle quote (12 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmOEdyQACgkQIgjSCVjB
3rAD/RAAh6+aT10XAbBmpyh48CqHUsapZxXwShg/d/sJJD5n1tNoZ3KN07Yf41Hq
buEqQynGe9s/VvO+Y6yhQDhqMiJ+S4t80H5otkRqqDSAbqp6hVHT15gdLPpCGpix
2sAqjeZWnUCG6SHlUIPwY+RMoZKn1eraESX5AtI2IHAZTUJvJA7ONe2HM+xnCDvi
zAsykz8jz5RFYI31NBtzLJ9NZz26562BqEqgUI+5xiSAeyWrmKt130FYzwPgzyA/
/Qyx/DvYNEvfth/vQYgwMJTfprDizH+WdDLO95kiocwdhA6kEpU9kXu3a2LGfvfU
Pnnccs27+s/lvb4CpWiVrBoue3KxkxeILcTw/3c75Bk8JwmMK5yolsJh5Q+WZScG
6yggx8giXlad27UNk8LNEU9aoXsfHEGSyle/8WIptdw6SkQEbJUmYvJzJa7NlsjR
/3paMBdL4peRkqzORn6AwnCw6nUdyugHMdTauz12HTxcWAF4pDrZXEzhQ5S+Joqm
AaUsZgd4ENiIUKX1wvLKfI6LKB/seOUwY6T0Be/hWa38CvrmBHfQBYNdujWHFyrZ
F/jXMhFJ86mTUD2zzFua4aaTMwIyHRLS4rwDjcccPmMprXY3YL40jOS6i63uyHtz
BFoXs7CA7xVWE+yqYmPyfxAQLTofM/D0okxyv5JU187MdNGYgWs=
=t1VV
-----END PGP SIGNATURE-----

A
A
Andrew Tropin wrote on 28 Nov 2022 09:54
(address . control@debbugs.gnu.org)
875yezcvcz.fsf@trop.in
close 56752
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmOEdzwACgkQIgjSCVjB
3rBAZQ/+IBApoKbvn+FN9XfJy9QVCyMY5xX34Y3n/0RMRWCvWg/jLssivQtOu/nY
LNT856Ui05PMgF+c8idOjXZPyQKpYNQ6+etji6YskWHo6H2PC5if2jRE6raGkvin
jiX+G8X3kLdcx9wqkeYn0eGdgu5et3Y0kFZ9BeGqbDX9iINW+wH1PC2MYky6fnNM
TSfCJQjqPi4Na3jxcy6IY+/h4mGc1RaenrLUqRrGOKBwf4NC+93wsdJbd3zm1Iei
B1dASwzGFYC4H5kBJE+1qGK0HuJiWRJXbHE1Qny96UVxNSpHlCTChccDf0h94N1e
nLaB6QldST11HSuV6j6W3dVTcc94zz+XSwMZGLVP+Z6XEV/e8bmrgMYKRCpLwTMr
24v3Dt7jcRVRoY5zUdy5aFA0M+2ueCH/fycQNbXB7uSwLN1rxjvncer6qFkSrABA
7xHxubx5oYYzziy9MkvN5z8NGCbSt2S357uqerGXVxO7tdce6o3Q7oxDWHxiHbb3
r1qbDwVSr5xV6m2nxNKyQozcbyBL421XUWMRdRpa9fcjHanb3vbO83zz4WNGRQ57
YGbsg8j8pWlFEhh+x7daVodz7w6Ih7lejpnHgrYdz2Qe2NBgn8hHiO1XzPWi1qwl
aj67pEn27wGZX1GrTtacD+5jVLVy12Lcn7xOpif1zlDSVZ43En4=
=jxF0
-----END PGP SIGNATURE-----

A
A
Andrew Tropin wrote on 28 Nov 2022 11:08
871qpncrxm.fsf@trop.in
On 2022-11-28 12:53, Andrew Tropin wrote:

Toggle quote (20 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmOEiJUACgkQIgjSCVjB
3rAJbQ//fv/NTCG0qkGFGFfTqmcQKPVCLDbE1vykdnrVkr3l0v+Lp31MQY+Vh+Ep
SpBcu0F9Ouj2Rxn0QfBvr2sY+QP/cjPz1lilQAC4lLbQUNoocP+LhRRmOb9yvf4r
hW5TJPO0ZoVpYtVsw9kUJDehSJuf+H5jhOeLep8ba/Y6f+nZr3yiJgn9SKFPJ8py
12cznweY8V74qQXno+zQQSPH4D75LkD3rX7qjnp2TJQFk3z2araOG3vZYCXAL6Po
guPwWvy3o1AB3NgO6BiLzeKdWUL8ouGvYkpNVJW2iCsexmDCL2E4cwTtMnbK5T9f
SAFZ+ju8NN5KBC+Lhl+NFZUaVtShsQf6RYsGGB2mv7DlhD5HcKXH1gIO26esTdOF
lS7FQSUtd4W7EmlMhD27aQZ/uwesNfdadXo/Y6ZGww5irb2jNUyFXCURL/ZC9iaQ
PJrxq2Bmzd/urxiuEhbKPx+y1URR/oDuIoHe7JiUhnIofURabn+VPJe7y/dy8Amk
etUsDyzpbtjwJ3hiszALcOSV70HwG3wyGs3vaHsRFDpAn92AuwSu2OJz4zmEARvM
GRVy6rmYik56pY8GTftt++pX1+rLd0pFX0TMFRbtmL1LWcE3Q3l04sx1JdLcprrN
ppjOsL5k1L5/fN9x8YwPj5ELSj4kGRAzxCWUK8aQFD9o73b5G9o=
=RXwA
-----END PGP SIGNATURE-----

?