[bug#73884] [PATCH 00/19] gnu: Add swayrbar

[bug#73884] [PATCH 00/19] gnu: Add swayrbar

[Luca Matei Pintilie via Guix-patches via]

This patch series intends to add swayrbar, a status command for sway's
swaybar.

I've been using it for a while now, have sent a patch[1] to it once, and
have even contributed the package to void-linux[2]

Needless to say, I'm a big fan, and I'd like to see this package in guix
as well!

In regards to packaging it, unfortunately quite a lot of dependencies
had to be added, and `rust-crossbeam-utils-0.8.16` I am not
particularely happy about, but unfortunately portable-atomic[3] demands
that specific patch version.

Also shoutout to the #guix channel on libera.chat which helped me get
this properly packaged, they rock!

[1]: https://lists.sr.ht/~tsdh/public-inbox/patches/53824
[2]: https://github.com/void-linux/void-packages/pull/49742
[3]: https://crates.io/crates/portable-atomic/1.9.0/dependencies

Luca Matei Pintilie (19):
  gnu: Add rust-windows-metadata-0.57
  gnu: Add rust-windows-bindgen-0.57
  gnu: Add rust-windows-result-0.1
  gnu: Add rust-windows-interface-0.57
  gnu: Add rust-windows-implement-0.57
  gnu: Add rust-windows-core-0.57
  gnu: Add rust-windows-0.57
  gnu: Add rust-sysinfo-0.31
  gnu: Add rust-swaybar-types-3
  gnu: rust-regex-syntax-0.8: Update to 0.8.5
  gnu: rust-regex-automata-0.4: Update to 0.4.8
  gnu: rust-regex-1: Update to 1.11.0
  gnu: Add rust-crossbeam-utils-0.8.16
  gnu: rust-portable-atomic-1: Update to 1.9.0
  gnu: rust-critical-section-1: Update to 1.1.3
  gnu: rust-once-cell-1: Update to 1.20.2
  gnu: Add rust-uom-0.30
  gnu: Add rust-battery-0.7
  gnu: Add swayrbar

 gnu/packages/crates-io.scm      | 275 ++++++++++++++++++++++++--------
 gnu/packages/crates-windows.scm | 148 +++++++++++++++++
 gnu/packages/rust-apps.scm      |  36 +++++
 3 files changed, 392 insertions(+), 67 deletions(-)


base-commit: 878b5a9f890ec1317b54e577159ebbfa6a7ccbce
-- 
2.47.0

[bug#73884] [PATCH v1 01/19] gnu: Add rust-windows-metadata-0.57

[Luca Matei Pintilie via Guix-patches via]

Change-Id: Ia6b72620d47db84c22de3a48d29592b8febc8b19
---
 gnu/packages/crates-windows.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 8d45d4f13c..922dcdb485 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -2235,6 +2235,23 @@ (define-public rust-windows-interface-0.39
        (sha256
         (base32 "00h56znmak3p8bh28y3s48m5zv6q7dn40vnvf3dzf0sz5rszrym2"))))))
 
+(define-public rust-windows-metadata-0.57
+  (package
+    (name "rust-windows-metadata")
+    (version "0.57.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-metadata" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1z1xl76p0zjwsvyj16w6pbp2layhjqz13y34pid9x7avh9vd0243"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Windows metadata reader")
+    (description "This package provides Windows metadata reader.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-metadata-0.56
   (package
     (name "rust-windows-metadata")
-- 
2.47.0

[bug#73884] [PATCH v1 02/19] gnu: Add rust-windows-bindgen-0.57

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I2413422e25c207fe4dc9e6131836acc17316622b
---
 gnu/packages/crates-windows.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 922dcdb485..37180470ee 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1653,6 +1653,30 @@ (define-public rust-windows-aarch64-msvc-0.28
                (base32
                 "1hpk0n2z0jzzvwlvs98b75sa4q920953nqfc119rv19nwm0mlsaj"))))))
 
+(define-public rust-windows-bindgen-0.57
+  (package
+    (name "rust-windows-bindgen")
+    (version "0.57.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-bindgen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1d67wwhbdwf3rmdbiyfsz55hky2a972y2xqg7iablxv27l8rdjqw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-rayon" ,rust-rayon-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-syn" ,rust-syn-2)
+                       ("rust-windows-metadata" ,rust-windows-metadata-0.57))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Windows metadata compiler")
+    (description "This package provides Windows metadata compiler.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-bindgen-0.56
   (package
     (name "rust-windows-bindgen")
-- 
2.47.0

[bug#73884] [PATCH v1 03/19] gnu: Add rust-windows-result-0.1

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I24da9b21164a7c3da834293f92f26eb8a151bdc6
---
 gnu/packages/crates-windows.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 37180470ee..03fe3d3f03 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -2338,6 +2338,26 @@ (define-public rust-windows-result-0.2
     (description "This package provides Windows error handling.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-result-0.1
+  (package
+    (name "rust-windows-result")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-result" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1y274q1v0vy21lhkgslpxpq1m08hvr1mcs2l88h1b1gcx0136f2y"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-windows-targets" ,rust-windows-targets-0.52))
+       #:cargo-development-inputs (("rust-windows-bindgen" ,rust-windows-bindgen-0.57))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Windows error handling")
+    (description "This package provides Windows error handling.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-strings-0.1
   (package
     (name "rust-windows-strings")
-- 
2.47.0

[bug#73884] [PATCH v1 04/19] gnu: Add rust-windows-interface-0.57

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I1c14a99d4a84181a6585e1686080e9d6cc8981e5
---
 gnu/packages/crates-windows.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 03fe3d3f03..1083347926 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -2174,6 +2174,28 @@ (define-public rust-windows-interface-0.58
      "This package provides the interface macro for the Windows crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-interface-0.57
+  (package
+    (name "rust-windows-interface")
+    (version "0.57.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-interface" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19zwlzr0q1z9s692681yb5w2lhvwcyx4v95s25hfdkd3isry9gi9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "The interface macro for the windows crate")
+    (description
+     "This package provides The interface macro for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-interface-0.52
   (package
     (inherit rust-windows-interface-0.58)
-- 
2.47.0

[bug#73884] [PATCH v1 05/19] gnu: Add rust-windows-implement-0.57

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I9a97439b5649018919d18ee463550c43d0fbd42c
---
 gnu/packages/crates-windows.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 1083347926..360422cd4c 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -2045,6 +2045,28 @@ (define-public rust-windows-implement-0.58
 Windows crate.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-implement-0.57
+  (package
+    (name "rust-windows-implement")
+    (version "0.57.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-implement" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1mqs7qypclnmx5r8yq5jy3g2d8i27vzag9yzzzxzpdnmb70ds1wi"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "The implement macro for the windows crate")
+    (description
+     "This package provides The implement macro for the windows crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-implement-0.52
   (package
     (inherit rust-windows-implement-0.58)
-- 
2.47.0

[bug#73884] [PATCH v1 06/19] gnu: Add rust-windows-core-0.57

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I226e0033bd958041c1f0c262414528d8488a2d1d
---
 gnu/packages/crates-windows.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 360422cd4c..2c7a308ec4 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1761,6 +1761,29 @@ (define-public rust-windows-core-0.58
     (description "This package provides Rust for Windows.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-core-0.57
+  (package
+    (name "rust-windows-core")
+    (version "0.57.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0bc3jxw2jw76xkk3ddvnp5b2m76qmbzv1qncgvb6qrlhl8wj9vfj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-windows-implement" ,rust-windows-implement-0.57)
+                       ("rust-windows-interface" ,rust-windows-interface-0.57)
+                       ("rust-windows-result" ,rust-windows-result-0.1)
+                       ("rust-windows-targets" ,rust-windows-targets-0.52))
+       #:cargo-development-inputs (("rust-windows-bindgen" ,rust-windows-bindgen-0.57))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Rust for Windows")
+    (description "This package provides Rust for Windows.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-core-0.52
   (package
     (inherit rust-windows-core-0.58)
-- 
2.47.0

[bug#73884] [PATCH v1 07/19] gnu: Add rust-windows-0.57

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I745f4431806045962496f6067c0f379aea062d80
---
 gnu/packages/crates-windows.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm
index 2c7a308ec4..3bb3ad3fd0 100644
--- a/gnu/packages/crates-windows.scm
+++ b/gnu/packages/crates-windows.scm
@@ -1352,6 +1352,26 @@ (define-public rust-windows-0.58
 if they were just another Rust module.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-windows-0.57
+  (package
+    (name "rust-windows")
+    (version "0.57.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hqid10bqvxa3pbpgvrh2cilf950lxsd9zqfv3rldc73v2s2qd0j"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-windows-core" ,rust-windows-core-0.57)
+                       ("rust-windows-targets" ,rust-windows-targets-0.52))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Rust for Windows")
+    (description "This package provides Rust for Windows.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-0.52
   (package
     (inherit rust-windows-0.58)
-- 
2.47.0

[bug#73884] [PATCH v1 08/19] gnu: Add rust-sysinfo-0.31

[Luca Matei Pintilie via Guix-patches via]

Change-Id: Ied41755df7ec4c991ccd05dba002232244ddddcf
---
 gnu/packages/crates-io.scm | 43 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 772c16d003..f9e7432d72 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -79542,6 +79542,49 @@ (define-public rust-sysctl-0.1
         ("rust-errno" ,rust-errno-0.2)
         ("rust-libc" ,rust-libc-0.2))))))
 
+(define-public rust-sysinfo-0.31
+  (package
+    (name "rust-sysinfo")
+    (version "0.31.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sysinfo" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gm1d4pxwnx4gmh6kwawchv8v8djb7y0a3qvbsq09cwrhx7vwp9m"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags (list "--release"
+                           "--"
+                           ;; These files aren't available in the build environment.
+                           "--skip=test::check_system_info"
+                           "--skip=test::check_uid_gid"
+                           "--skip=test_networks"
+                           "--skip=test_wait_non_child"
+                           "--skip=test_process_disk_usage"
+                           ;; I don't know why these fail
+                           "--skip=common::network::tests::check_ip_networks"
+                           "--skip=test_components"
+                           "--skip=test_refresh_tasks"
+                           "--skip=test_refresh_memory")
+       #:cargo-inputs (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-ntapi" ,rust-ntapi-0.4)
+                       ("rust-rayon" ,rust-rayon-1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-windows" ,rust-windows-0.57))
+       #:cargo-development-inputs (("rust-bstr" ,rust-bstr-1)
+                                   ("rust-serde-json" ,rust-serde-json-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/GuillaumeGomez/sysinfo")
+    (synopsis "System handler to interact with processes")
+    (description
+     "This package is a library to get system information such as processes,
+processors, disks, components and networks.")
+    (license license:expat)))
+
 (define-public rust-sysinfo-0.30
   (package
     (name "rust-sysinfo")
-- 
2.47.0

[bug#73884] [PATCH v1 09/19] gnu: Add rust-swaybar-types-3

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I4c2b5e8e4f0dd6406e81bef6d6bd94f904bbaa6b
---
 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 f9e7432d72..1df56f7ed3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -78270,6 +78270,27 @@ (define-public rust-sxd-xpath-0.4
     (description "This package provides a Rust XML XPath library.")
     (license (list license:expat license:asl2.0))))
 
+(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
+     `(#: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-3
   (package
     (name "rust-swayipc")
-- 
2.47.0

[bug#73884] [PATCH v1 10/19] gnu: rust-regex-syntax-0.8: Update to 0.8.5

[Luca Matei Pintilie via Guix-patches via]

Change-Id: Idd338ee2873c6cfdf0f9c9247a13a83f9147f4f1
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1df56f7ed3..d6ad802303 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63933,14 +63933,14 @@ (define-public rust-regex-lite-0.1
 (define-public rust-regex-syntax-0.8
   (package
     (name "rust-regex-syntax")
-    (version "0.8.4")
+    (version "0.8.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "regex-syntax" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16r0kjy20vx33dr4mhasj5l1f87czas714x2fz6zl0f8wwxa0rks"))))
+        (base32 "0p41p3hj9ww7blnbwbj9h7rwxzxg0c1hvrdycgys8rxyhqqw859b"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1))))
-- 
2.47.0

[bug#73884] [PATCH v1 11/19] gnu: rust-regex-automata-0.4: Update to 0.4.8

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I8f767cebe488760c74d7774e44f4adce4249298d
---
 gnu/packages/crates-io.scm | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d6ad802303..6a6f712092 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63823,29 +63823,27 @@ (define-public rust-regex-0.1
 (define-public rust-regex-automata-0.4
   (package
     (name "rust-regex-automata")
-    (version "0.4.7")
+    (version "0.4.8")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "regex-automata" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1pwjdi4jckpbaivpl6x4v5g4crb37zr2wac93wlfsbzgqn6gbjiq"))))
+        (base32 "18wd530ndrmygi6xnz3sp345qi0hy2kdbsa89182nwbl6br5i1rn"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f          ; Not all files included.
-       #:cargo-inputs
-       (("rust-aho-corasick" ,rust-aho-corasick-1)
-        ("rust-log" ,rust-log-0.4)
-        ("rust-memchr" ,rust-memchr-2)
-        ("rust-regex-syntax" ,rust-regex-syntax-0.8))
-       #:cargo-development-inputs
-       (("rust-anyhow" ,rust-anyhow-1)
-        ("rust-bstr" ,rust-bstr-1)
-        ("rust-doc-comment" ,rust-doc-comment-0.3)
-        ("rust-env-logger" ,rust-env-logger-0.9)
-        ("rust-quickcheck" ,rust-quickcheck-1)
-        ("rust-regex-test" ,rust-regex-test-0.1))))
+     `(#:tests? #f ;Not all files included.
+       #:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-1)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-regex-syntax" ,rust-regex-syntax-0.8))
+       #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1)
+                                   ("rust-bstr" ,rust-bstr-1)
+                                   ("rust-doc-comment" ,rust-doc-comment-0.3)
+                                   ("rust-env-logger" ,rust-env-logger-0.9)
+                                   ("rust-quickcheck" ,rust-quickcheck-1)
+                                   ("rust-regex-test" ,rust-regex-test-0.1))))
     (home-page "https://github.com/rust-lang/regex/tree/master/regex-automata")
     (synopsis "Automata construction and matching using regular expressions")
     (description
-- 
2.47.0

[bug#73884] [PATCH v1 12/19] gnu: rust-regex-1: Update to 1.11.0

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I0fa4cca1f74f5fbf744acea09541725de2ba1806
---
 gnu/packages/crates-io.scm | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6a6f712092..3530bac7ff 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -63735,28 +63735,26 @@ (define-public rust-refpool-0.4
 (define-public rust-regex-1
   (package
     (name "rust-regex")
-    (version "1.10.6")
+    (version "1.11.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "regex" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "06cnlxwzyqfbw1za1i7ks89ns4i2kr0lpg5ykx56b8v7dd6df6a2"))))
+        (base32 "1n5imk7yxam409ik5nagsjpwqvbg3f0g0mznd5drf549x1g0w81q"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-aho-corasick" ,rust-aho-corasick-1)
-        ("rust-memchr" ,rust-memchr-2)
-        ("rust-regex-automata" ,rust-regex-automata-0.4)
-        ("rust-regex-syntax" ,rust-regex-syntax-0.8))
-       #:cargo-development-inputs
-       (("rust-anyhow" ,rust-anyhow-1)
-        ("rust-doc-comment" ,rust-doc-comment-0.3)
-        ("rust-env-logger" ,rust-env-logger-0.9)
-        ("rust-once-cell" ,rust-once-cell-1)
-        ("rust-quickcheck" ,rust-quickcheck-1)
-        ("rust-regex-test" ,rust-regex-test-0.1))))
+     `(#:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-1)
+                       ("rust-memchr" ,rust-memchr-2)
+                       ("rust-regex-automata" ,rust-regex-automata-0.4)
+                       ("rust-regex-syntax" ,rust-regex-syntax-0.8))
+       #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1)
+                                   ("rust-doc-comment" ,rust-doc-comment-0.3)
+                                   ("rust-env-logger" ,rust-env-logger-0.9)
+                                   ("rust-once-cell" ,rust-once-cell-1)
+                                   ("rust-quickcheck" ,rust-quickcheck-1)
+                                   ("rust-regex-test" ,rust-regex-test-0.1))))
     (home-page "https://github.com/rust-lang/regex")
     (synopsis "Regular expressions for Rust")
     (description
-- 
2.47.0

[bug#73884] [PATCH v1 13/19] gnu: Add rust-crossbeam-utils-0.8.16

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I3ef440c157d99521c452ed09ee3194191c63d067
---
 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 3530bac7ff..e80f2eab4f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -17945,6 +17945,32 @@ (define-public rust-crossbeam-queue-0.1
        #:cargo-development-inputs
        (("rust-rand" ,rust-rand-0.6))))))
 
+(define-public rust-crossbeam-utils-0.8.16
+  (package
+    (name "rust-crossbeam-utils")
+    (version "0.8.16")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "crossbeam-utils" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "153j0gikblz7n7qdvdi8pslhi008s1yp9cmny6vw07ad7pbb48js"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cfg-if" ,rust-cfg-if-0.1)
+        ("rust-loom" ,rust-loom-0.7))
+       #:cargo-development-inputs
+       (("rust-rand" ,rust-rand-0.8)
+        ("rust-rustversion" ,rust-rustversion-1))))
+    (home-page
+     "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils")
+    (synopsis "Utilities for concurrent programming")
+    (description
+     "This crate provides miscellaneous tools for concurrent programming.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-crossbeam-utils-0.8
   (package
     (name "rust-crossbeam-utils")
-- 
2.47.0

[bug#73884] [PATCH v1 14/19] gnu: rust-portable-atomic-1: Update to 1.9.0

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I705e84b34d68e00d39b040b2f14d9095c0094549
---
 gnu/packages/crates-io.scm | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e80f2eab4f..c9ed7cd464 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -56678,26 +56678,25 @@ (define-public rust-pori-0.0.0
 (define-public rust-portable-atomic-1
   (package
     (name "rust-portable-atomic")
-    (version "1.6.0")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "portable-atomic" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "1h77x9qx7pns0d66vdrmdbmwpi7586h7ysnkdnhrn5mwi2cyyw3i"))))
+    (version "1.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "portable-atomic" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1cmd87qj90panwsi350djb8lsxdryqkkxmimjcz7a1nsysini76c"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f              ; Not all test dependencies declared.
-       #:cargo-inputs
-       (("rust-critical-section" ,rust-critical-section-1)
-        ("rust-serde" ,rust-serde-1))
-       #:cargo-development-inputs
-       (("rust-build-context" ,rust-build-context-0.1)
-        ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
-        ("rust-fastrand" ,rust-fastrand-2)
-        ("rust-paste" ,rust-paste-1)
-        ("rust-sptr" ,rust-sptr-0.3)
-        ("rust-static-assertions" ,rust-static-assertions-1))))
+     `(#:tests? #f ;Not all test dependencies declared.
+       #:cargo-inputs (("rust-critical-section" ,rust-critical-section-1)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-build-context" ,rust-build-context-0.1)
+                                   ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8.16)
+                                   ("rust-fastrand" ,rust-fastrand-2)
+                                   ("rust-paste" ,rust-paste-1)
+                                   ("rust-sptr" ,rust-sptr-0.3)
+                                   ("rust-static-assertions" ,rust-static-assertions-1))))
     (home-page "https://github.com/taiki-e/portable-atomic")
     (synopsis "Portable atomic types")
     (description
-- 
2.47.0

[bug#73884] [PATCH v1 15/19] gnu: rust-critical-section-1: Update to 1.1.3

[Luca Matei Pintilie via Guix-patches via]

Change-Id: Ibb4399e65f728a6d3cbde6fd8d99c17d9f77a3f9
---
 gnu/packages/crates-io.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c9ed7cd464..1bc8b40075 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -17650,14 +17650,14 @@ (define-public rust-criterion-plot-0.3
 (define-public rust-critical-section-1
   (package
     (name "rust-critical-section")
-    (version "1.1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "critical-section" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "05pj0pvkdyc9r30xxabam4n8zxdbzxcddr0gdypajcbqjgwgynbh"))))
+    (version "1.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "critical-section" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hi289hs8kiyqmhwzsrlqrba559av3bzg71f4bs5mz28cf4hjh7n"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/rust-embedded/critical-section")
     (synopsis "Critical section abstraction")
-- 
2.47.0

[bug#73884] [PATCH v1 01/19] gnu: Add rust-windows-metadata-0.57

[Efraim Flashner]

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

I've only gotten patches 1-15 of the 19 patches sent, so I'll leave this
bug open for now. I've applied those 15 to the rust-team branch.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

[bug#73884] [PATCH v1 01/19] gnu: Add rust-windows-metadata-0.57

[Luca Matei Pintilie via Guix-patches via]

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

On Mon, Oct 21, 2024 at 08:20:26AM +0300, Efraim Flashner wrote:
>I've only gotten patches 1-15 of the 19 patches sent, so I'll leave this
>bug open for now. I've applied those 15 to the rust-team branch.

Hi, could you take a look again?
I had to send them split up like that due to the 20-email a day limit of
my provider, so I apologise for the trouble.

The last few patches show up on the web interface[1], so I hope it
should work as expected.

Let me know if I should send them again!

Thanks in advance

[1]: https://issues.guix.gnu.org/73884

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

[bug#73884] [PATCH v1 16/19] gnu: rust-once-cell-1: Update to 1.20.2

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I88ebcea02a5b813b39b59cbe6b13cb2fef843256
---
 gnu/packages/crates-io.scm | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1bc8b40075..b0581dce1c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -50394,24 +50394,21 @@ (define-public rust-onig-sys-69.6
 (define-public rust-once-cell-1
   (package
     (name "rust-once-cell")
-    (version "1.19.0")
+    (version "1.20.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "once_cell" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "14kvw7px5z96dk4dwdm1r9cqhhy2cyj1l5n5b29mynbb8yr15nrz"))))
+        (base32 "0xb7rw1aqr7pa4z3b00y7786gyf8awx2gca3md73afy76dzgwq8j"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-critical-section" ,rust-critical-section-1)
-        ("rust-parking-lot-core" ,rust-parking-lot-core-0.9)
-        ("rust-portable-atomic" ,rust-portable-atomic-1))
-       #:cargo-development-inputs
-       (("rust-critical-section" ,rust-critical-section-1)
-        ("rust-regex" ,rust-regex-1))))
+     `(#:cargo-inputs (("rust-critical-section" ,rust-critical-section-1)
+                       ("rust-parking-lot-core" ,rust-parking-lot-core-0.9)
+                       ("rust-portable-atomic" ,rust-portable-atomic-1))
+       #:cargo-development-inputs (("rust-critical-section" ,rust-critical-section-1)
+                                   ("rust-regex" ,rust-regex-1))))
     (home-page "https://github.com/matklad/once_cell")
     (synopsis "Single assignment cells and lazy values")
     (description
-- 
2.47.0

[bug#73884] [PATCH v1 17/19] gnu: Add rust-uom-0.30

[Luca Matei Pintilie via Guix-patches via]

Change-Id: Ia7a12435198d416edff521e70ef053bfdcaa7fd0
---
 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 b0581dce1c..a7abe1eb3b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -89398,6 +89398,33 @@ (define-public rust-uom-0.34
 mile, ...).")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-uom-0.30
+  (package
+    (name "rust-uom")
+    (version "0.30.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "uom" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1vg59hnb7hh0p8kjjhgmrsnn3597722lkfdkp481wksq6vk06rg7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-num-bigint" ,rust-num-bigint-0.3)
+                       ("rust-num-rational" ,rust-num-rational-0.3)
+                       ("rust-num-traits" ,rust-num-traits-0.2)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-typenum" ,rust-typenum-1))
+       #:cargo-development-inputs (("rust-approx" ,rust-approx-0.3)
+                                   ("rust-quickcheck" ,rust-quickcheck-0.9)
+                                   ("rust-serde-json" ,rust-serde-json-1)
+                                   ("rust-static-assertions" ,rust-static-assertions-1))))
+    (home-page "https://github.com/iliekturtles/uom")
+    (synopsis "Units of measurement")
+    (description "This package provides Units of measurement.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-ureq-2
   (package
     (name "rust-ureq")
-- 
2.47.0

[bug#73884] [PATCH v1 18/19] gnu: Add rust-battery-0.7

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I263d424b3f24eefa4910e95d81693d8af37bec1d
---
 gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a7abe1eb3b..e946cdab51 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7222,6 +7222,38 @@ (define-public rust-bat-0.18
     (inputs
      (list libgit2 zlib))))
 
+(define-public rust-battery-0.7
+  (package
+    (name "rust-battery")
+    (version "0.7.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "battery" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1r1641dyks76p39i1iihswhc6iz5z51pihmpxniy1h1pi4k29dml"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f ;/sys/class/power_supply cannot be found
+       #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-core-foundation" ,rust-core-foundation-0.7)
+                       ("rust-lazycell" ,rust-lazycell-1)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-mach" ,rust-mach-0.3)
+                       ("rust-nix" ,rust-nix-0.19)
+                       ("rust-num-traits" ,rust-num-traits-0.2)
+                       ("rust-uom" ,rust-uom-0.30)
+                       ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs (("rust-approx" ,rust-approx-0.3)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/svartalf/rust-battery")
+    (synopsis "Cross-platform information about the notebook batteries")
+    (description
+     "This package provides Cross-platform information about the notebook batteries.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-beef-0.5
   (package
     (name "rust-beef")
-- 
2.47.0

[bug#73884] [PATCH v1 19/19] gnu: Add swayrbar

[Luca Matei Pintilie via Guix-patches via]

Change-Id: I5b700cc0feeb8a5fcc86ac77188d27afc7a6da5d
---
 gnu/packages/rust-apps.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 12205ef1aa..5ff20b38e2 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -3105,6 +3105,42 @@ (define-public swayr
 daemon which executes them.")
    (license license:gpl3+)))
 
+(define-public swayrbar
+  (package
+    (name "swayrbar")
+    (version "0.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "swayrbar" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "05jpa87i6q1cpikyqqliy3q2ksslj79kgin8jq9ls6073yk5q6z7"))))
+    (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-4)
+                       ("rust-directories" ,rust-directories-5)
+                       ("rust-env-logger" ,rust-env-logger-0.11)
+                       ("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.31)
+                       ("rust-toml" ,rust-toml-0.8))))
+    (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.47.0

[bug#73884] [PATCH v2] gnu: Add swaysome

[Luca Matei Pintilie via Guix-patches via]

Signed-off-by: Luca Matei Pintilie <luca@lucamatei.com>
Change-Id: I7e9b43b875cfdf68131b0fcff99721655c5af2d0
---
 gnu/packages/rust-apps.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 3844daa651..245e0216eb 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -3269,6 +3269,31 @@ (define-public swayr
 daemon which executes them.")
    (license license:gpl3+)))
 
+(define-public swaysome
+  (package
+    (name "swaysome")
+    (version "2.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "swaysome" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "12rqvjj9d12nm9zppgp4hvfw5l308gn9ljbbgbhi0cglpg11rnjk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1)
+                       ("rust-clap" ,rust-clap-4)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://gitlab.com/hyask/swaysome")
+    (synopsis
+     "Awesome way to manage your multiple outputs with the sway windows manager")
+    (description
+     "This package provides swaysome provides an awesome way to manage your multiple
+outputs with the sway windows manager.")
+    (license license:expat)))
+
 (define-public tealdeer
   (package
     (name "tealdeer")
-- 
2.47.0