[bug#74234] [PATCH rust-team] Add gnome-authenticator

[bug#74234] [PATCH rust-team] Add gnome-authenticator

[paul via Guix-patches via]

Hi Guix,

this is the fourth and last patchest required to build GNOME 
Authenticator in Guix. It adds gnome-authenticator and its last 
dependencies.

This patchset depends on the first, second and third ones available at:

1. https://issues.guix.gnu.org/73956
2. https://issues.guix.gnu.org/74232
3. https://issues.guix.gnu.org/74233

Thank you for your work and please let me know if I can help get the 
review burden easier somehow!

Cheers

giacomo

[bug#74234] [PATCH rust-team 01/20] gnu: Add rust-ashpd-0.6.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-ashpd-0.6): New variable.

Change-Id: If7b758010fe8c729d7e3319869a8d9c518ade46f
---
 gnu/packages/crates-gtk.scm | 44 +++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 9d598b63d2..09ecf99efd 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -72,6 +72,50 @@ (define-public rust-aperture-0.3
      "This package provides GTK Widget for cameras using gstreamer and pipewire.")
     (license license:gpl3+)))
 
+(define-public rust-ashpd-0.6
+  (package
+    (name "rust-ashpd")
+    (version "0.6.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ashpd" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "109d7w6v0rnpy9lv4kmhwgh0sff0440s2vybj1k0ik4ib3d2xhja"))))
+    (build-system cargo-build-system)
+    (arguments
+     ;; error[E0432]: unresolved import `ashpd::desktop::Color`
+     `(#:tests? #f
+       #:cargo-inputs (("rust-async-fs" ,rust-async-fs-2)
+                       ("rust-async-net" ,rust-async-net-2)
+                       ("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-enumflags2" ,rust-enumflags2-0.7)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gdk4-wayland" ,rust-gdk4-wayland-0.7)
+                       ("rust-gdk4-x11" ,rust-gdk4-x11-0.7)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-gtk4" ,rust-gtk4-0.7)
+                       ("rust-pipewire" ,rust-pipewire-0.7)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-raw-window-handle" ,rust-raw-window-handle-0.6)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-repr" ,rust-serde-repr-0.1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-wayland-backend" ,rust-wayland-backend-0.3)
+                       ("rust-wayland-client" ,rust-wayland-client-0.30)
+                       ("rust-wayland-protocols" ,rust-wayland-protocols-0.30)
+                       ("rust-zbus" ,rust-zbus-3))
+       #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/bilelmoussaoui/ashpd")
+    (synopsis "XDG portals wrapper in Rust using zbus")
+    (description
+     "This package provides XDG portals wrapper in Rust using zbus.")
+    (license license:expat)))
+
 (define-public rust-atk-sys-0.14
   (package
     (name "rust-atk-sys")

base-commit: 9670382d0b16923e121a5f145edd561ace510b9f
-- 
2.46.0

[bug#74234] [PATCH rust-team 02/20] gnu: Add rust-migrations-internals-2.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-migrations-internals-2): New
variable;
(rust-migrations-internals-1): inherit from rust-migrations-internals-2.

Change-Id: I8bf2abc2019ea4545f3dea977f925f3b543a69c3
---
 gnu/packages/crates-io.scm | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1c17d49611..5ccfa358df 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44082,10 +44082,10 @@ (define-public rust-miette-derive-5
                        ("rust-quote" ,rust-quote-1)
                        ("rust-syn" ,rust-syn-2))))))
 
-(define-public rust-migrations-internals-1
+(define-public rust-migrations-internals-2
   (package
     (name "rust-migrations-internals")
-    (version "1.4.1")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
@@ -44093,7 +44093,7 @@ (define-public rust-migrations-internals-1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0q2qk4jpa16mcfcmhjz6hdg2s73az1k7j0cy08vvh87h997chkrb"))))
+        (base32 "1nnsr5d4h2kcvmz2j4l8g8n8r1zm7nngwmp842q58lh1h0azf8qg"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -44107,6 +44107,26 @@ (define-public rust-migrations-internals-1
 migration mechanism.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-migrations-internals-1
+  (package
+    (inherit rust-migrations-internals-2)
+    (name "rust-migrations-internals")
+    (version "1.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "migrations_internals" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0q2qk4jpa16mcfcmhjz6hdg2s73az1k7j0cy08vvh87h997chkrb"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-barrel" ,rust-barrel-0.6)
+        ("rust-diesel" ,rust-diesel-1))
+       #:cargo-development-inputs
+       (("rust-tempdir" ,rust-tempdir-0.3))))))
+
 (define-public rust-migrations-macros-1
   (package
     (name "rust-migrations-macros")
-- 
2.46.0

[bug#74234] [PATCH rust-team 03/20] gnu: Add rust-migrations-macros-2.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-migrations-macros-2): New variable;
(rust-migrations-macros-1): inherit from rust-migrations-macros-2.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5ccfa358df..3a2bfba2b2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44127,10 +44127,10 @@ (define-public rust-migrations-internals-1
        #:cargo-development-inputs
        (("rust-tempdir" ,rust-tempdir-0.3))))))
 
-(define-public rust-migrations-macros-1
+(define-public rust-migrations-macros-2
   (package
     (name "rust-migrations-macros")
-    (version "1.4.2")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
@@ -44138,12 +44138,15 @@ (define-public rust-migrations-macros-1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "173qgwans6n2jf6b7qajq273rvg1r9c34p5fflzr53gx14lz2lwp"))))
+        (base32 "027gd4s58fmh7jil9rz0ckdsdw81mqfa6dyqbfmvnrqfqxd35qyc"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-migrations-internals"
-         ,rust-migrations-internals-1)
+     ;; Some files are missing
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-dotenvy" ,rust-dotenvy-0.15)
+        ("rust-migrations-internals"
+         ,rust-migrations-internals-2)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))
@@ -44159,6 +44162,29 @@ (define-public rust-migrations-macros-1
 embedded migrations.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-migrations-macros-1
+  (package
+    (inherit rust-migrations-macros-2)
+    (name "rust-migrations-macros")
+    (version "1.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "migrations_macros" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "173qgwans6n2jf6b7qajq273rvg1r9c34p5fflzr53gx14lz2lwp"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-migrations-internals"
+         ,rust-migrations-internals-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-tempdir" ,rust-tempdir-0.3))))))
+
 (define-public rust-mimalloc-0.1
   (package
     (name "rust-mimalloc")
-- 
2.46.0

[bug#74234] [PATCH rust-team 04/20] gnu: Add rust-diesel-migrations-2.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-diesel-migrations-2): New variable;
(rust-diesel-migrations-1): inherit from rust-diesel-migrations-2.

Change-Id: Ifc9654995b613f9666216be32f910d1f403b2af5
---
 gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3a2bfba2b2..957924d931 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22263,10 +22263,10 @@ (define-public rust-diesel-derives-1
         ("rust-diesel" ,rust-diesel-1)
         ("rust-dotenv" ,rust-dotenv-0.10))))))
 
-(define-public rust-diesel-migrations-1
+(define-public rust-diesel-migrations-2
   (package
     (name "rust-diesel-migrations")
-    (version "1.4.0")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
@@ -22274,24 +22274,49 @@ (define-public rust-diesel-migrations-1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0k4g03ciqwya2xc1xvy5s9cs6q55k45wxa1gszswfg9m2f2dwg5z"))))
+        (base32 "1b0ld4azk73rg2axwq7a4wnpwba3085f43jp3cw62n8c2bqb6dk0"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f ;doctest_setup.rs: No such file or directory
        #:cargo-inputs
        (("rust-migrations-internals"
-         ,rust-migrations-internals-1)
+         ,rust-migrations-internals-2)
         ("rust-migrations-macros"
-         ,rust-migrations-macros-1))
+         ,rust-migrations-macros-2))
        #:cargo-development-inputs
        (("rust-cfg-if" ,rust-cfg-if-0.1)
-        ("rust-diesel" ,rust-diesel-1)
+        ("rust-diesel" ,rust-diesel-2)
         ("rust-dotenv" ,rust-dotenv-0.10))))
     (home-page "https://diesel.rs")
     (synopsis "Migration management for diesel")
     (description "This package provides migration management for Diesel.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-diesel-migrations-1
+  (package
+    (inherit rust-diesel-migrations-2)
+    (name "rust-diesel-migrations")
+    (version "1.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "diesel_migrations" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0k4g03ciqwya2xc1xvy5s9cs6q55k45wxa1gszswfg9m2f2dwg5z"))))
+    (arguments
+     `(#:tests? #f ;doctest_setup.rs: No such file or directory
+       #:cargo-inputs
+       (("rust-migrations-internals"
+         ,rust-migrations-internals-1)
+        ("rust-migrations-macros"
+         ,rust-migrations-macros-1))
+       #:cargo-development-inputs
+       (("rust-cfg-if" ,rust-cfg-if-0.1)
+        ("rust-diesel" ,rust-diesel-1)
+        ("rust-dotenv" ,rust-dotenv-0.10))))))
+
 (define-public rust-diesel-table-macro-syntax-0.1
   (package
     (name "rust-diesel-table-macro-syntax")
-- 
2.46.0

[bug#74234] [PATCH rust-team 05/20] gnu: Add rust-blocking-1.5.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-blocking-1.5): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 957924d931..a29402ddc8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9113,6 +9113,28 @@ (define-public rust-blocking-1.6
 programs.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-blocking-1.5
+  (package
+    (inherit rust-blocking-1.6)
+    (name "rust-blocking")
+    (version "1.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "blocking" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "064i3d6b8ln34fgdw49nmx9m36bwi3r3nv8c9xhcrpf4ilz92dva"))))
+    (arguments
+     `(#:cargo-inputs (("rust-async-channel" ,rust-async-channel-2)
+                       ("rust-async-task" ,rust-async-task-4)
+                       ("rust-futures-io" ,rust-futures-io-0.3)
+                       ("rust-futures-lite" ,rust-futures-lite-2)
+                       ("rust-piper" ,rust-piper-0.2)
+                       ("rust-tracing" ,rust-tracing-0.1))
+       #:cargo-development-inputs
+       (("rust-futures-lite" ,rust-futures-lite-1))))))
+
 (define-public rust-blocking-1
   (package
     (inherit rust-blocking-1.6)
-- 
2.46.0

[bug#74234] [PATCH rust-team 06/20] gnu: Add rust-oo7-0.2.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-oo7-0.2): New variable.

Change-Id: I011b3d08e928792cad32a45f549291d4542ed4d0
---
 gnu/packages/crates-gtk.scm | 51 +++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 09ecf99efd..65fed0f38a 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -28,6 +28,7 @@ (define-module (gnu packages crates-gtk)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (gnu packages)
+  #:use-module (gnu packages crates-crypto)
   #:use-module (gnu packages crates-graphics)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-windows)
@@ -4458,6 +4459,56 @@ (define-public rust-libadwaita-sys-0.5
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-oo7-0.2
+  (package
+    (name "rust-oo7")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "oo7" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13cpaq7f51gqcspd4097vjr7r2cjpxpn6c02x67dsdizk0xaiv5c"))))
+    (build-system cargo-build-system)
+    (arguments
+     ;; test result: FAILED. 14 passed; 3 failed; 0 ignored; 0 measured; 0 filtered out
+     `(#:tests? #f
+       #:cargo-inputs (("rust-aes" ,rust-aes-0.8)
+                       ("rust-async-fs" ,rust-async-fs-2)
+                       ("rust-async-io" ,rust-async-io-2)
+                       ("rust-async-lock" ,rust-async-lock-3)
+                       ("rust-async-net" ,rust-async-net-2)
+                       ("rust-blocking" ,rust-blocking-1.5)
+                       ("rust-cbc" ,rust-cbc-0.1)
+                       ("rust-cipher" ,rust-cipher-0.4)
+                       ("rust-digest" ,rust-digest-0.10)
+                       ("rust-futures-lite" ,rust-futures-lite-2)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-hkdf" ,rust-hkdf-0.12)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-md-5" ,rust-md-5-0.10)
+                       ("rust-num" ,rust-num-0.4)
+                       ("rust-num-bigint-dig" ,rust-num-bigint-dig-0.8)
+                       ("rust-openssl" ,rust-openssl-0.10)
+                       ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-zbus" ,rust-zbus-3)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/bilelmoussaoui/oo7")
+    (synopsis
+     "James Bond went on a new mission and this time as a Secret Service
+provider")
+    (description
+     "This package provides oo7, a Rust Secret Service provider.")
+    (license license:expat)))
+
 (define-public rust-pango-0.20
   (package
     (name "rust-pango")
-- 
2.46.0

[bug#74234] [PATCH rust-team 07/20] gnu: Add rust-percent-encoding-2.1.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-percent-encoding-2.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a29402ddc8..35455073a8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54532,6 +54532,20 @@ (define-public rust-percent-encoding-2
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-percent-encoding-2.1
+  (package
+    (inherit rust-percent-encoding-2)
+    (name "rust-percent-encoding")
+    (version "2.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "percent-encoding" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0bp3zrsk3kr47fbpipyczidbbx4g54lzxdm77ni1i3qws10mdzfl"))))))
+
 (define-public rust-percent-encoding-1
   (package
     (inherit rust-percent-encoding-2)
-- 
2.46.0

[bug#74234] [PATCH rust-team 08/20] gnu: Add rust-checked-int-cast-1.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-checked-int-cast-1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 35455073a8..c20bd516cb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12866,6 +12866,29 @@ (define-public rust-chrono-0.4
     (description "Date and time library for Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-checked-int-cast-1
+  (package
+    (name "rust-checked-int-cast")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "checked_int_cast" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06brva5agm6g12q15f8fidz17akb85q211496p1k2qxhb9mmxk0p"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://github.com/PeterReid/checked_int_cast")
+    (synopsis
+     "Conversions between primitive integers with overflow and
+underflow checking")
+    (description
+     "This package provides Conversions between primitive integers with
+overflow and underflow checking.")
+    (license license:expat)))
+
 (define-public rust-chic-1
   (package
     (name "rust-chic")
-- 
2.46.0

[bug#74234] [PATCH rust-team 09/20] gnu: Add rust-qrencode-0.14.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-qrencode-0.14): New variable.

Change-Id: I23ee1b5880d52c595907ff5359d1ca71c355be33
---
 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 c20bd516cb..4d89af711f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61397,6 +61397,27 @@ (define-public rust-python-pkginfo-0.5
         ("rust-zip" ,rust-zip-0.6))
        #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-qrencode-0.14
+  (package
+    (name "rust-qrencode")
+    (version "0.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrencode" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1hgp0lchnp3zx79j3799nm445rvqg7x62x2x7926ky22lqhv23d6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-checked-int-cast" ,rust-checked-int-cast-1)
+                       ("rust-image" ,rust-image-0.24))
+       #:cargo-development-inputs (("rust-image" ,rust-image-0.24))))
+    (home-page "https://github.com/sayanarijit/qrencode")
+    (synopsis "QR code encoder in Rust")
+    (description "This package provides QR code encoder in Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-quad-rand-0.2
   (package
     (name "rust-quad-rand")
-- 
2.46.0

[bug#74234] [PATCH rust-team 10/20] gnu: Add rust-search-provider-0.6.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-search-provider-0.6): New variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 65fed0f38a..40ae083274 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -5099,6 +5099,26 @@ (define-public rust-search-provider-0.8
      "This package provides Rust wrapper around the GNOME Shell search provider API.")
     (license license:gpl3+)))
 
+(define-public rust-search-provider-0.6
+  (package
+    (inherit rust-search-provider-0.8)
+    (name "rust-search-provider")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "search-provider" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01jby7xq0dd9rafw5kgskpbxgppn4imzm71w1sdj8iy9ci4ghh9z"))))
+    (arguments
+     `(#:cargo-inputs (("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.18)
+                       ("rust-gdk4" ,rust-gdk4-0.7)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-zbus" ,rust-zbus-3))))))
+
 (define-public rust-soup-sys-0.10
   (package
     (name "rust-soup-sys")
-- 
2.46.0

[bug#74234] [PATCH rust-team 11/20] gnu: Add rust-enum-ordinalize-derive-4.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-enum-ordinalize-derive-4): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4d89af711f..0ef313a442 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24885,6 +24885,31 @@ (define-public rust-enumflags2-derive-0.6
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-enum-ordinalize-derive-4
+  (package
+    (name "rust-enum-ordinalize-derive")
+    (version "4.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "enum-ordinalize-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zy53fabazimwv5cl0366k834ybixzl84lxj9mfavbnlfn532a0d"))))
+    (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://magiclen.org/enum-ordinalize")
+    (synopsis
+     "Macro that enables construction of enums from an ordinal value")
+    (description
+     "This crate provides a procedural macro that enables enums to not only
+obtain the ordinal values of their variants but also allows for the
+construction of enums from an ordinal value.")
+    (license license:expat)))
+
 (define-public rust-enumset-1
   (package
     (name "rust-enumset")
-- 
2.46.0

[bug#74234] [PATCH rust-team 12/20] gnu: Add rust-enum-ordinalize-4.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-enum-ordinalize-4): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0ef313a442..84eac123ca 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24910,6 +24910,28 @@ (define-public rust-enum-ordinalize-derive-4
 construction of enums from an ordinal value.")
     (license license:expat)))
 
+(define-public rust-enum-ordinalize-4
+  (package
+    (name "rust-enum-ordinalize")
+    (version "4.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "enum-ordinalize" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ydbzycxl0kais26lrk6i0riylw1ci4s065pky73vfvrnglbn9k9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-enum-ordinalize-derive" ,rust-enum-ordinalize-derive-4))))
+    (home-page "https://magiclen.org/enum-ordinalize")
+    (synopsis
+     "Construction of enums from an ordinal value")
+    (description
+     "This library enables enums to not only obtain the ordinal values of their
+variants but also allows for the construction of enums from an ordinal value.")
+    (license license:expat)))
+
 (define-public rust-enumset-1
   (package
     (name "rust-enumset")
-- 
2.46.0

[bug#74234] [PATCH rust-team 13/20] gnu: Add rust-qrcodegen-1.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-qrcodegen-1): New variable.

Change-Id: I2f0069293c945299283959cd29f95a37a6b5ea5b
---
 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 84eac123ca..572f00f052 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61444,6 +61444,27 @@ (define-public rust-python-pkginfo-0.5
         ("rust-zip" ,rust-zip-0.6))
        #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-qrcodegen-1
+  (package
+    (name "rust-qrcodegen")
+    (version "1.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrcodegen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hn1j12q31nzlkra42s20p0wh198bx8f7xc73mic3j9121xgqfa3"))))
+    (build-system cargo-build-system)
+    (arguments
+     ;; test result: FAILED. 1 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out
+     (list #:tests? #f))
+    (home-page "https://www.nayuki.io/page/qr-code-generator-library")
+    (synopsis "High-quality QR Code generator library")
+    (description
+     "This package provides a high-quality QR Code generator library.")
+    (license license:expat)))
+
 (define-public rust-qrencode-0.14
   (package
     (name "rust-qrencode")
-- 
2.46.0

[bug#74234] [PATCH rust-team 14/20] gnu: Add rust-manifest-dir-macros-0.1.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-manifest-dir-macros-0.1): New variable.

Change-Id: Idc496ce8efcbf6d3742d4a2c04c04502cf8d323c
---
 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 572f00f052..5fd162e9ff 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42795,6 +42795,33 @@ (define-public rust-malloc-buf-0.0
     (arguments
      `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))))
 
+(define-public rust-manifest-dir-macros-0.1
+  (package
+    (name "rust-manifest-dir-macros")
+    (version "0.1.18")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "manifest-dir-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14zm557gcm1ldr19ry53ngvni8vqaicm01xa5vg8pgyd3kg40vcw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-mime-guess" ,rust-mime-guess-2)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://magiclen.org/manifest-dir-macros")
+    (synopsis
+     "This crate provides function-like macros to check or operate paths
+relative to CARGO_MANIFEST_DIR at compile time")
+    (description
+     "This crate provides function-like macros to check or operate paths relative to
+CARGO_MANIFEST_DIR at compile time.")
+    (license license:expat)))
+
 (define-public rust-maplit-1
   (package
     (name "rust-maplit")
-- 
2.46.0

[bug#74234] [PATCH rust-team 15/20] gnu: Add rust-qrcode-generator-4.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-qrcode-generator-4): New variable.

Change-Id: Ib253a274940455d701bb06c149856fd01af7ba93
---
 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 5fd162e9ff..ac123fe3fa 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61471,6 +61471,32 @@ (define-public rust-python-pkginfo-0.5
         ("rust-zip" ,rust-zip-0.6))
        #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-qrcode-generator-4
+  (package
+    (name "rust-qrcode-generator")
+    (version "4.1.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrcode-generator" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ngiwz7mfqfy7g8nh309vq9qqphyybbp890s4fb418f78sbcn1hx"))))
+    (build-system cargo-build-system)
+    (arguments
+     ;; test result: FAILED. 4 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out
+     `(#:tests? #f
+       #:cargo-inputs (("rust-html-escape" ,rust-html-escape-0.2)
+                       ("rust-image" ,rust-image-0.24)
+                       ("rust-qrcodegen" ,rust-qrcodegen-1))
+       #:cargo-development-inputs (("rust-manifest-dir-macros" ,rust-manifest-dir-macros-0.1))))
+    (home-page "https://magiclen.org/qrcode-generator")
+    (synopsis
+     "Generate QR Code matrices and images in RAW, PNG and SVG formats")
+    (description
+     "This package provides Generate QR Code matrices and images in RAW, PNG and SVG formats.")
+    (license license:expat)))
+
 (define-public rust-qrcodegen-1
   (package
     (name "rust-qrcodegen")
-- 
2.46.0

[bug#74234] [PATCH rust-team 16/20] gnu: Add rust-zbar-rust-0.0.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-zbar-rust-0.0): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ac123fe3fa..d79dffc775 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -72,6 +72,7 @@ (define-module (gnu packages crates-io)
   #:use-module (gnu packages)
   #:use-module (gnu packages acl)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages aidc)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages avahi)
@@ -94984,6 +94985,33 @@ (define-public rust-z-base-32-0.1
     (description "This package provides human-oriented base-32 encoding.")
     (license license:expat)))
 
+(define-public rust-zbar-rust-0.0
+  (package
+    (name "rust-zbar-rust")
+    (version "0.0.23")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "zbar-rust" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0m6c9393bvw2sngp36m0db1gzqxyqa9ms5biibz659md68di7k59"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-enum-ordinalize" ,rust-enum-ordinalize-4)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))
+       #:cargo-development-inputs (("rust-image" ,rust-image-0.24)
+                                   ("rust-qrcode-generator" ,rust-qrcode-generator-4))))
+    (native-inputs (list pkg-config))
+    (inputs (list zbar))
+    (home-page "https://magiclen.org/zbar-rust")
+    (synopsis "High-level and low-level ZBar bindings")
+    (description
+     "This package provides High-level and low-level ZBar bindings
+for the Rust language.")
+    (license license:lgpl2.1)))
+
 (define-public rust-zbase32-0.1
   (package
     (name "rust-zbase32")
-- 
2.46.0

[bug#74234] [PATCH rust-team 17/20] gnu: Add rust-roxmltree-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-roxmltree-0.20): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d79dffc775..70744babf9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65817,17 +65817,17 @@ (define-public rust-rowan-0.15
      "This package provides a library for generic lossless syntax trees.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-roxmltree-0.19
+(define-public rust-roxmltree-0.20
   (package
     (name "rust-roxmltree")
-    (version "0.19.0")
+    (version "0.20.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "roxmltree" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0zs0q8hg5nnh91s1ib6r0fky7xm8ay63ayfa5i1afxxpwgalzl9w"))))
+        (base32 "15vw91ps91wkmmgy62khf9zb63bdinvm80957dascbsw7dwvc83c"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/RazrFalcon/roxmltree")
     (synopsis "Represent an XML as a read-only tree")
@@ -65835,6 +65835,19 @@ (define-public rust-roxmltree-0.19
      "@code{roxmltree} represents an XML 1.0 document as a read-only tree.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-roxmltree-0.19
+  (package
+    (inherit rust-roxmltree-0.20)
+    (name "rust-roxmltree")
+    (version "0.19.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "roxmltree" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0zs0q8hg5nnh91s1ib6r0fky7xm8ay63ayfa5i1afxxpwgalzl9w"))))))
+
 (define-public rust-roxmltree-0.14
   (package
     (inherit rust-roxmltree-0.19)
-- 
2.46.0

[bug#74234] [PATCH rust-team 18/20] gnu: Add rust-roxmltree-0.18.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-roxmltree-0.18): New variable.

Change-Id: I7c6f8580e739a04f0a8df90801b6ebb49efc22ee
---
 gnu/packages/crates-io.scm | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 70744babf9..b3fad287ce 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65848,10 +65848,31 @@ (define-public rust-roxmltree-0.19
        (sha256
         (base32 "0zs0q8hg5nnh91s1ib6r0fky7xm8ay63ayfa5i1afxxpwgalzl9w"))))))
 
-(define-public rust-roxmltree-0.14
+(define-public rust-roxmltree-0.18
   (package
     (inherit rust-roxmltree-0.19)
     (name "rust-roxmltree")
+    (version "0.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "roxmltree" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1n5ikvn00ciqkkr4hnch5ws1k3gfj8z50j3alv6wdf5nayj9bxfq"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* "Cargo.toml"
+                  ;; Patch xmlparser version
+                  (("0.13.5") "0.13.3"))))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-xmlparser" ,rust-xmlparser-0.13))))))
+
+(define-public rust-roxmltree-0.14
+  (package
+    (inherit rust-roxmltree-0.18)
+    (name "rust-roxmltree")
     (version "0.14.0")
     (source
      (origin
-- 
2.46.0

[bug#74234] [PATCH rust-team 19/20] gnu: Add rust-svg-metadata-0.4.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-svg-metadata-0.4): New variable.

Change-Id: Ia230444ba47d403e76106684f9fb07eb85c08cab
---
 gnu/packages/crates-graphics.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 197f77a724..2dae5bf0bf 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -3818,6 +3818,35 @@ (define-public rust-softbuffer-0.3
     (description "Cross-platform software buffer.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-svg-metadata-0.4
+  (package
+    (name "rust-svg-metadata")
+    (version "0.4.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "svg_metadata" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "002j0na1kfz4pgi43hdcz5baygzk6irnjd5lrmbqqfjldwn3sbx4"))))
+    (build-system cargo-build-system)
+    (arguments
+     ;; error[E0432]: unresolved import `svg_metadata`
+     `(#:tests? #f
+       #:cargo-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-roxmltree" ,rust-roxmltree-0.18)
+                       ("rust-skeptic" ,rust-skeptic-0.13))
+       #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3))))
+    (home-page "https://github.com/mre/svg-metadata")
+    (synopsis
+     "Extracts metadata (like the viewBox, width, and height) from SVG graphics")
+    (description
+     "This package provides Extracts metadata (like the @code{viewBox}, width,
+and height) from SVG graphics.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-tiff-0.9
   (package
     (name "rust-tiff")
-- 
2.46.0

[bug#74234] [PATCH rust-team 20/20] gnu: Add gnome-authenticator.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/rust-apps.scm (gnome-authenticator): New variable.

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

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 3844daa651..f976dba138 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -32,6 +32,7 @@
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
 ;;; Copyright © 2024 Jordan Moore <lockbox@struct.foo>
+;;; Copyright © 2024 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -61,6 +62,7 @@ (define-module (gnu packages rust-apps)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages aidc)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
@@ -80,8 +82,10 @@ (define-module (gnu packages rust-apps)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages haskell-xyz)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages ibus)
   #:use-module (gnu packages icu4c)
@@ -106,6 +110,7 @@ (define-module (gnu packages rust-apps)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages webkit)
+  #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
 (define-public aardvark-dns
@@ -985,6 +990,236 @@ (define-public gitui
     (description "This package provides a fast Terminal UI for git.")
     (license license:expat)))
 
+(define-public gnome-authenticator
+  (package
+    (name "gnome-authenticator")
+    (version "4.4.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/World/Authenticator.git/")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0zavax35n048spx097ymiq31s8b879qwbg8xmcxcx73r6m823mic"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:install-source? #f
+      #:cargo-inputs `(("rust-aes-gcm" ,rust-aes-gcm-0.10)
+                       ("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-rust-argon2" ,rust-rust-argon2-2.0)
+                       ("rust-aperture" ,rust-aperture-0.3)
+                       ("rust-ashpd" ,rust-ashpd-0.6)
+                       ("rust-data-encoding" ,rust-data-encoding-2)
+                       ("rust-diesel" ,rust-diesel-2)
+                       ("rust-diesel-migrations" ,rust-diesel-migrations-2)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-executor" ,rust-futures-executor-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gettext-rs" ,rust-gettext-rs-0.7)
+                       ("rust-gtk4" ,rust-gtk4-0.7)
+                       ("rust-hex" ,rust-hex-0.4)
+                       ("rust-image" ,rust-image-0.24)
+                       ("rust-libadwaita" ,rust-libadwaita-0.5)
+                       ("rust-oo7" ,rust-oo7-0.2)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2.1)
+                       ("rust-prost" ,rust-prost-0.12)
+                       ("rust-qrencode" ,rust-qrencode-0.14)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-reqwest" ,rust-reqwest-0.11)
+                       ("rust-ring" ,rust-ring-0.17)
+                       ("rust-scrypt" ,rust-scrypt-0.11)
+                       ("rust-search-provider" ,rust-search-provider-0.6)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-svg-metadata" ,rust-svg-metadata-0.4)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-uuid" ,rust-uuid-1)
+                       ("rust-zbar-rust" ,rust-zbar-rust-0.0)
+                       ("rust-zeroize" ,rust-zeroize-1))
+      #:imported-modules `(,@%glib-or-gtk-build-system-modules
+                           ,@%cargo-build-system-modules)
+      #:modules `((guix build cargo-build-system)
+                  ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+                  (guix build utils))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-in-files
+            (lambda _
+              (let ((bindir
+                     (string-append #$output "/bin"))
+                    (localedir
+                     (string-append "\"" #$output "share/locale\""))
+                    (pkgdatadir
+                     (string-append "\"" #$output "/share/authenticator\"")))
+
+                (substitute* "src/config.rs.in"
+                  (("@APP_ID@") "\"com.belmoussaoui.Authenticator\"")
+                  (("@PKGDATADIR@") pkgdatadir)
+                  (("@PROFILE@") "\"\"")
+                  (("@VERSION@") (string-append "\"" #$version "\""))
+                  (("@GETTEXT_PACKAGE@") "\"authenticator\"")
+                  (("@LOCALEDIR@") localedir)
+                  (("@OBJECT_PATH@") "\"/com/belmoussaoui/Authenticator/SearchProvider\""))
+                (rename-file "src/config.rs.in" "src/config.rs")
+
+                (substitute* "data/com.belmoussaoui.Authenticator.SearchProvider.service.in"
+                  (("@app-id@") "com.belmoussaoui.Authenticator")
+                  (("@bindir@") bindir)
+                  (("@name@") "authenticator"))
+                (rename-file "data/com.belmoussaoui.Authenticator.SearchProvider.service.in"
+                             "data/com.belmoussaoui.Authenticator.SearchProvider.service")
+
+                (substitute* "data/com.belmoussaoui.Authenticator.metainfo.xml.in.in"
+                  (("@app-id@") "com.belmoussaoui.Authenticator")
+                  (("@gettext-package@") "authenticator"))
+                (rename-file "data/com.belmoussaoui.Authenticator.metainfo.xml.in.in"
+                             "data/com.belmoussaoui.Authenticator.metainfo.xml")
+
+                (substitute* "data/com.belmoussaoui.Authenticator.desktop.in.in"
+                  (("@icon@") "com.belmoussaoui.Authenticator"))
+                (rename-file "data/com.belmoussaoui.Authenticator.desktop.in.in"
+                             "data/com.belmoussaoui.Authenticator.desktop")
+
+                (substitute* "data/com.belmoussaoui.Authenticator.gschema.xml.in"
+                  (("@app-id@") "com.belmoussaoui.Authenticator")
+                  (("@gettext-package@") "authenticator"))
+                (rename-file "data/com.belmoussaoui.Authenticator.gschema.xml.in"
+                             "data/com.belmoussaoui.Authenticator.gschema.xml"))))
+          (add-before 'build 'build-locales
+            (lambda _
+              (for-each
+               (lambda (po-file)
+                 (invoke "msgfmt" "-c" "-o"
+                         (string-append (string-drop-right po-file 3) ".mo")
+                         po-file))
+               (find-files "po" "\\.po"))))
+          (add-before 'build-locales 'build-resources
+            (lambda _
+              (with-directory-excursion "data"
+                (invoke "glib-compile-resources"
+                        "--generate"
+                        "resources.gresource.xml"))))
+          (add-before 'install 'install-extra
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (here (getcwd))
+                     (source (assoc-ref inputs "source"))
+                     (share (string-append out "/share"))
+                     (hicolor (string-append share "/icons/hicolor")))
+                (mkdir-p hicolor)
+                (with-directory-excursion hicolor
+                  (mkdir-p "scalable/apps")
+                  (install-file
+                   (string-append source "/data/icons/com.belmoussaoui.Authenticator.svg")
+                   "scalable/apps")
+                  (mkdir-p "symbolic/apps")
+                  (install-file
+                   (string-append
+                    source "/data/icons/com.belmoussaoui.Authenticator-symbolic.svg")
+                   "symbolic/apps"))
+                (with-directory-excursion share
+                  (mkdir-p "applications")
+                  (with-directory-excursion "applications"
+                    (install-file
+                     (string-append
+                      here "/data/com.belmoussaoui.Authenticator.desktop") "."))
+                  (mkdir-p "authenticator")
+                  (with-directory-excursion "authenticator"
+                    (copy-file
+                     (string-append
+                      here "/data/resources.gresource")
+                     "authenticator.gresource"))
+                  (mkdir-p "gnome-shell/search-providers")
+                  (with-directory-excursion "gnome-shell/search-providers"
+                    (install-file
+                     (string-append
+                      here
+                      "/data/com.belmoussaoui.Authenticator.search-provider.ini") "."))
+                  (mkdir-p "locale")
+                  (with-directory-excursion "locale"
+                    (for-each
+                     (lambda (mo-file)
+                       (define mo-dir
+                         (string-append
+                          (string-drop-right (basename mo-file) 3)
+                          "/LC_MESSAGES"))
+                       (mkdir-p mo-dir)
+                       (copy-file mo-file (string-append mo-dir "/authenticator.mo")))
+                     (find-files (string-append here "/po") "\\.mo")))
+                  (mkdir-p "metainfo")
+                  (with-directory-excursion "metainfo"
+                    (install-file
+                     (string-append
+                      here
+                      "/data/com.belmoussaoui.Authenticator.metainfo.xml") "."))
+                  (mkdir-p "glib-2.0/schemas")
+                  (with-directory-excursion "glib-2.0/schemas"
+                    (install-file
+                     (string-append
+                      here
+                      "/data/com.belmoussaoui.Authenticator.gschema.xml") "."))
+                  (mkdir-p "dbus-1/services")
+                  (with-directory-excursion "dbus-1/services"
+                    (install-file
+                     (string-append
+                      here
+                      "/data/com.belmoussaoui.Authenticator.SearchProvider.service") "."))))))
+          (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
+            (assoc-ref glib-or-gtk:%standard-phases
+                       'generate-gdk-pixbuf-loaders-cache-file))
+          (add-after 'install 'glib-or-gtk-compile-schemas
+            (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+          (add-after 'install 'glib-or-gtk-wrap
+            (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
+          (add-after 'glib-or-gtk-wrap 'wrap-extra-paths
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out"))
+                    (gst-plugins-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+                (for-each
+                 (lambda (prog)
+                   (wrap-program (string-append out "/bin/" prog)
+                     `("GST_PLUGIN_SYSTEM_PATH" ":" suffix (,gst-plugins-path))))
+                 '("authenticator"))))))))
+    (native-inputs (list clang
+                         gnu-gettext
+                         `(,glib "bin") ; for glib-compile-schemas
+                         libxml2        ; for xmllint
+                         pkg-config))
+    (inputs (list glib
+                  gstreamer
+                  gst-plugins-base
+                  gst-plugins-bad
+                  gtk
+                  libadwaita
+                  openssl
+                  pango-1.51
+                  sqlite
+                  zbar))
+    (home-page "https://apps.gnome.org/Authenticator")
+    (synopsis "Generate two-factor codes")
+    (description "Simple application for generating Two-Factor Authentication
+Codes:
+
+It features:
+
+@itemize
+@item Time-based/Counter-based/Steam methods support
+@item SHA-1/SHA-256/SHA-512 algorithms support
+@item QR code scanner using a camera or from a screenshot
+@item Lock the application with a password
+@item Beautiful UI
+@item GNOME Shell search provider
+@item Backup/Restore from/into known applications like FreeOTP+,
+Aegis (encrypted / plain-text), andOTP, Google Authenticator
+@end itemize")
+    (license license:gpl3)))
+
 (define-public helvum
   (package
     (name "helvum")
-- 
2.46.0

[bug#74234] [PATCH rust-team] Add gnome-authenticator

[paul via Guix-patches via]

Hi Guix,

I am about to send revision 2 the the fourth and last patchest required 
to build GNOME Authenticator in Guix. It adds gnome-authenticator and 
its last dependencies.

With respect to revision 1, these changes were introduced:

- this patches depend on revision 2 of issue #74233
- pango 1.52 is used instead of pango 1.51

This patchset depends on the first, second and third ones available at:

1. https://issues.guix.gnu.org/73956
2. https://issues.guix.gnu.org/74232
3. https://issues.guix.gnu.org/74233

Thank you for your work!

Cheers

giacomo

[bug#74234] [PATCHv2 rust-team 01/20] gnu: Add rust-ashpd-0.6.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-ashpd-0.6): New variable.

Change-Id: If7b758010fe8c729d7e3319869a8d9c518ade46f
---
 gnu/packages/crates-gtk.scm | 44 +++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index fce7c73270..dbc2a4c27b 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -72,6 +72,50 @@ (define-public rust-aperture-0.3
      "This package provides GTK Widget for cameras using gstreamer and pipewire.")
     (license license:gpl3+)))
 
+(define-public rust-ashpd-0.6
+  (package
+    (name "rust-ashpd")
+    (version "0.6.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ashpd" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "109d7w6v0rnpy9lv4kmhwgh0sff0440s2vybj1k0ik4ib3d2xhja"))))
+    (build-system cargo-build-system)
+    (arguments
+     ;; error[E0432]: unresolved import `ashpd::desktop::Color`
+     `(#:tests? #f
+       #:cargo-inputs (("rust-async-fs" ,rust-async-fs-2)
+                       ("rust-async-net" ,rust-async-net-2)
+                       ("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-enumflags2" ,rust-enumflags2-0.7)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gdk4-wayland" ,rust-gdk4-wayland-0.7)
+                       ("rust-gdk4-x11" ,rust-gdk4-x11-0.7)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-gtk4" ,rust-gtk4-0.7)
+                       ("rust-pipewire" ,rust-pipewire-0.7)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-raw-window-handle" ,rust-raw-window-handle-0.6)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-repr" ,rust-serde-repr-0.1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-wayland-backend" ,rust-wayland-backend-0.3)
+                       ("rust-wayland-client" ,rust-wayland-client-0.30)
+                       ("rust-wayland-protocols" ,rust-wayland-protocols-0.30)
+                       ("rust-zbus" ,rust-zbus-3))
+       #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/bilelmoussaoui/ashpd")
+    (synopsis "XDG portals wrapper in Rust using zbus")
+    (description
+     "This package provides XDG portals wrapper in Rust using zbus.")
+    (license license:expat)))
+
 (define-public rust-atk-sys-0.14
   (package
     (name "rust-atk-sys")

base-commit: d57d973513034b6b374852c675d16fe50572f66b
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 02/20] gnu: Add rust-migrations-internals-2.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-migrations-internals-2): New
variable;
(rust-migrations-internals-1): inherit from rust-migrations-internals-2.

Change-Id: I8bf2abc2019ea4545f3dea977f925f3b543a69c3
---
 gnu/packages/crates-io.scm | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1c17d49611..5ccfa358df 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44082,10 +44082,10 @@ (define-public rust-miette-derive-5
                        ("rust-quote" ,rust-quote-1)
                        ("rust-syn" ,rust-syn-2))))))
 
-(define-public rust-migrations-internals-1
+(define-public rust-migrations-internals-2
   (package
     (name "rust-migrations-internals")
-    (version "1.4.1")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
@@ -44093,7 +44093,7 @@ (define-public rust-migrations-internals-1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0q2qk4jpa16mcfcmhjz6hdg2s73az1k7j0cy08vvh87h997chkrb"))))
+        (base32 "1nnsr5d4h2kcvmz2j4l8g8n8r1zm7nngwmp842q58lh1h0azf8qg"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -44107,6 +44107,26 @@ (define-public rust-migrations-internals-1
 migration mechanism.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-migrations-internals-1
+  (package
+    (inherit rust-migrations-internals-2)
+    (name "rust-migrations-internals")
+    (version "1.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "migrations_internals" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0q2qk4jpa16mcfcmhjz6hdg2s73az1k7j0cy08vvh87h997chkrb"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-barrel" ,rust-barrel-0.6)
+        ("rust-diesel" ,rust-diesel-1))
+       #:cargo-development-inputs
+       (("rust-tempdir" ,rust-tempdir-0.3))))))
+
 (define-public rust-migrations-macros-1
   (package
     (name "rust-migrations-macros")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 03/20] gnu: Add rust-migrations-macros-2.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-migrations-macros-2): New variable;
(rust-migrations-macros-1): inherit from rust-migrations-macros-2.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5ccfa358df..3a2bfba2b2 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44127,10 +44127,10 @@ (define-public rust-migrations-internals-1
        #:cargo-development-inputs
        (("rust-tempdir" ,rust-tempdir-0.3))))))
 
-(define-public rust-migrations-macros-1
+(define-public rust-migrations-macros-2
   (package
     (name "rust-migrations-macros")
-    (version "1.4.2")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
@@ -44138,12 +44138,15 @@ (define-public rust-migrations-macros-1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "173qgwans6n2jf6b7qajq273rvg1r9c34p5fflzr53gx14lz2lwp"))))
+        (base32 "027gd4s58fmh7jil9rz0ckdsdw81mqfa6dyqbfmvnrqfqxd35qyc"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-migrations-internals"
-         ,rust-migrations-internals-1)
+     ;; Some files are missing
+     `(#:tests? #f
+       #:cargo-inputs
+       (("rust-dotenvy" ,rust-dotenvy-0.15)
+        ("rust-migrations-internals"
+         ,rust-migrations-internals-2)
         ("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))
@@ -44159,6 +44162,29 @@ (define-public rust-migrations-macros-1
 embedded migrations.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-migrations-macros-1
+  (package
+    (inherit rust-migrations-macros-2)
+    (name "rust-migrations-macros")
+    (version "1.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "migrations_macros" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "173qgwans6n2jf6b7qajq273rvg1r9c34p5fflzr53gx14lz2lwp"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-migrations-internals"
+         ,rust-migrations-internals-1)
+        ("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs
+       (("rust-tempdir" ,rust-tempdir-0.3))))))
+
 (define-public rust-mimalloc-0.1
   (package
     (name "rust-mimalloc")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 04/20] gnu: Add rust-diesel-migrations-2.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-diesel-migrations-2): New variable;
(rust-diesel-migrations-1): inherit from rust-diesel-migrations-2.

Change-Id: Ifc9654995b613f9666216be32f910d1f403b2af5
---
 gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3a2bfba2b2..957924d931 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22263,10 +22263,10 @@ (define-public rust-diesel-derives-1
         ("rust-diesel" ,rust-diesel-1)
         ("rust-dotenv" ,rust-dotenv-0.10))))))
 
-(define-public rust-diesel-migrations-1
+(define-public rust-diesel-migrations-2
   (package
     (name "rust-diesel-migrations")
-    (version "1.4.0")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
@@ -22274,24 +22274,49 @@ (define-public rust-diesel-migrations-1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0k4g03ciqwya2xc1xvy5s9cs6q55k45wxa1gszswfg9m2f2dwg5z"))))
+        (base32 "1b0ld4azk73rg2axwq7a4wnpwba3085f43jp3cw62n8c2bqb6dk0"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f ;doctest_setup.rs: No such file or directory
        #:cargo-inputs
        (("rust-migrations-internals"
-         ,rust-migrations-internals-1)
+         ,rust-migrations-internals-2)
         ("rust-migrations-macros"
-         ,rust-migrations-macros-1))
+         ,rust-migrations-macros-2))
        #:cargo-development-inputs
        (("rust-cfg-if" ,rust-cfg-if-0.1)
-        ("rust-diesel" ,rust-diesel-1)
+        ("rust-diesel" ,rust-diesel-2)
         ("rust-dotenv" ,rust-dotenv-0.10))))
     (home-page "https://diesel.rs")
     (synopsis "Migration management for diesel")
     (description "This package provides migration management for Diesel.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-diesel-migrations-1
+  (package
+    (inherit rust-diesel-migrations-2)
+    (name "rust-diesel-migrations")
+    (version "1.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "diesel_migrations" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0k4g03ciqwya2xc1xvy5s9cs6q55k45wxa1gszswfg9m2f2dwg5z"))))
+    (arguments
+     `(#:tests? #f ;doctest_setup.rs: No such file or directory
+       #:cargo-inputs
+       (("rust-migrations-internals"
+         ,rust-migrations-internals-1)
+        ("rust-migrations-macros"
+         ,rust-migrations-macros-1))
+       #:cargo-development-inputs
+       (("rust-cfg-if" ,rust-cfg-if-0.1)
+        ("rust-diesel" ,rust-diesel-1)
+        ("rust-dotenv" ,rust-dotenv-0.10))))))
+
 (define-public rust-diesel-table-macro-syntax-0.1
   (package
     (name "rust-diesel-table-macro-syntax")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 05/20] gnu: Add rust-blocking-1.5.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-blocking-1.5): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 957924d931..a29402ddc8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -9113,6 +9113,28 @@ (define-public rust-blocking-1.6
 programs.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-blocking-1.5
+  (package
+    (inherit rust-blocking-1.6)
+    (name "rust-blocking")
+    (version "1.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "blocking" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "064i3d6b8ln34fgdw49nmx9m36bwi3r3nv8c9xhcrpf4ilz92dva"))))
+    (arguments
+     `(#:cargo-inputs (("rust-async-channel" ,rust-async-channel-2)
+                       ("rust-async-task" ,rust-async-task-4)
+                       ("rust-futures-io" ,rust-futures-io-0.3)
+                       ("rust-futures-lite" ,rust-futures-lite-2)
+                       ("rust-piper" ,rust-piper-0.2)
+                       ("rust-tracing" ,rust-tracing-0.1))
+       #:cargo-development-inputs
+       (("rust-futures-lite" ,rust-futures-lite-1))))))
+
 (define-public rust-blocking-1
   (package
     (inherit rust-blocking-1.6)
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 06/20] gnu: Add rust-oo7-0.2.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-oo7-0.2): New variable.

Change-Id: I011b3d08e928792cad32a45f549291d4542ed4d0
---
 gnu/packages/crates-gtk.scm | 51 +++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index dbc2a4c27b..fd45be08b8 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -28,6 +28,7 @@ (define-module (gnu packages crates-gtk)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (gnu packages)
+  #:use-module (gnu packages crates-crypto)
   #:use-module (gnu packages crates-graphics)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-windows)
@@ -4458,6 +4459,56 @@ (define-public rust-libadwaita-sys-0.5
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-oo7-0.2
+  (package
+    (name "rust-oo7")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "oo7" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13cpaq7f51gqcspd4097vjr7r2cjpxpn6c02x67dsdizk0xaiv5c"))))
+    (build-system cargo-build-system)
+    (arguments
+     ;; test result: FAILED. 14 passed; 3 failed; 0 ignored; 0 measured; 0 filtered out
+     `(#:tests? #f
+       #:cargo-inputs (("rust-aes" ,rust-aes-0.8)
+                       ("rust-async-fs" ,rust-async-fs-2)
+                       ("rust-async-io" ,rust-async-io-2)
+                       ("rust-async-lock" ,rust-async-lock-3)
+                       ("rust-async-net" ,rust-async-net-2)
+                       ("rust-blocking" ,rust-blocking-1.5)
+                       ("rust-cbc" ,rust-cbc-0.1)
+                       ("rust-cipher" ,rust-cipher-0.4)
+                       ("rust-digest" ,rust-digest-0.10)
+                       ("rust-futures-lite" ,rust-futures-lite-2)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-hkdf" ,rust-hkdf-0.12)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-md-5" ,rust-md-5-0.10)
+                       ("rust-num" ,rust-num-0.4)
+                       ("rust-num-bigint-dig" ,rust-num-bigint-dig-0.8)
+                       ("rust-openssl" ,rust-openssl-0.10)
+                       ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-zbus" ,rust-zbus-3)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/bilelmoussaoui/oo7")
+    (synopsis
+     "James Bond went on a new mission and this time as a Secret Service
+provider")
+    (description
+     "This package provides oo7, a Rust Secret Service provider.")
+    (license license:expat)))
+
 (define-public rust-pango-0.20
   (package
     (name "rust-pango")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 07/20] gnu: Add rust-percent-encoding-2.1.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-percent-encoding-2.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a29402ddc8..35455073a8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -54532,6 +54532,20 @@ (define-public rust-percent-encoding-2
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-percent-encoding-2.1
+  (package
+    (inherit rust-percent-encoding-2)
+    (name "rust-percent-encoding")
+    (version "2.1.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "percent-encoding" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0bp3zrsk3kr47fbpipyczidbbx4g54lzxdm77ni1i3qws10mdzfl"))))))
+
 (define-public rust-percent-encoding-1
   (package
     (inherit rust-percent-encoding-2)
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 08/20] gnu: Add rust-checked-int-cast-1.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-checked-int-cast-1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 35455073a8..c20bd516cb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12866,6 +12866,29 @@ (define-public rust-chrono-0.4
     (description "Date and time library for Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-checked-int-cast-1
+  (package
+    (name "rust-checked-int-cast")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "checked_int_cast" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06brva5agm6g12q15f8fidz17akb85q211496p1k2qxhb9mmxk0p"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t))
+    (home-page "https://github.com/PeterReid/checked_int_cast")
+    (synopsis
+     "Conversions between primitive integers with overflow and
+underflow checking")
+    (description
+     "This package provides Conversions between primitive integers with
+overflow and underflow checking.")
+    (license license:expat)))
+
 (define-public rust-chic-1
   (package
     (name "rust-chic")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 09/20] gnu: Add rust-qrencode-0.14.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-qrencode-0.14): New variable.

Change-Id: I23ee1b5880d52c595907ff5359d1ca71c355be33
---
 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 c20bd516cb..4d89af711f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61397,6 +61397,27 @@ (define-public rust-python-pkginfo-0.5
         ("rust-zip" ,rust-zip-0.6))
        #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-qrencode-0.14
+  (package
+    (name "rust-qrencode")
+    (version "0.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrencode" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1hgp0lchnp3zx79j3799nm445rvqg7x62x2x7926ky22lqhv23d6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-checked-int-cast" ,rust-checked-int-cast-1)
+                       ("rust-image" ,rust-image-0.24))
+       #:cargo-development-inputs (("rust-image" ,rust-image-0.24))))
+    (home-page "https://github.com/sayanarijit/qrencode")
+    (synopsis "QR code encoder in Rust")
+    (description "This package provides QR code encoder in Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-quad-rand-0.2
   (package
     (name "rust-quad-rand")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 10/20] gnu: Add rust-search-provider-0.6.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-search-provider-0.6): New variable.

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

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index fd45be08b8..c66288351e 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -5099,6 +5099,26 @@ (define-public rust-search-provider-0.8
      "This package provides Rust wrapper around the GNOME Shell search provider API.")
     (license license:gpl3+)))
 
+(define-public rust-search-provider-0.6
+  (package
+    (inherit rust-search-provider-0.8)
+    (name "rust-search-provider")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "search-provider" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01jby7xq0dd9rafw5kgskpbxgppn4imzm71w1sdj8iy9ci4ghh9z"))))
+    (arguments
+     `(#:cargo-inputs (("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.18)
+                       ("rust-gdk4" ,rust-gdk4-0.7)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-zbus" ,rust-zbus-3))))))
+
 (define-public rust-soup-sys-0.10
   (package
     (name "rust-soup-sys")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 11/20] gnu: Add rust-enum-ordinalize-derive-4.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-enum-ordinalize-derive-4): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4d89af711f..0ef313a442 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24885,6 +24885,31 @@ (define-public rust-enumflags2-derive-0.6
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-enum-ordinalize-derive-4
+  (package
+    (name "rust-enum-ordinalize-derive")
+    (version "4.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "enum-ordinalize-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zy53fabazimwv5cl0366k834ybixzl84lxj9mfavbnlfn532a0d"))))
+    (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://magiclen.org/enum-ordinalize")
+    (synopsis
+     "Macro that enables construction of enums from an ordinal value")
+    (description
+     "This crate provides a procedural macro that enables enums to not only
+obtain the ordinal values of their variants but also allows for the
+construction of enums from an ordinal value.")
+    (license license:expat)))
+
 (define-public rust-enumset-1
   (package
     (name "rust-enumset")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 12/20] gnu: Add rust-enum-ordinalize-4.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-enum-ordinalize-4): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0ef313a442..84eac123ca 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -24910,6 +24910,28 @@ (define-public rust-enum-ordinalize-derive-4
 construction of enums from an ordinal value.")
     (license license:expat)))
 
+(define-public rust-enum-ordinalize-4
+  (package
+    (name "rust-enum-ordinalize")
+    (version "4.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "enum-ordinalize" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ydbzycxl0kais26lrk6i0riylw1ci4s065pky73vfvrnglbn9k9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-enum-ordinalize-derive" ,rust-enum-ordinalize-derive-4))))
+    (home-page "https://magiclen.org/enum-ordinalize")
+    (synopsis
+     "Construction of enums from an ordinal value")
+    (description
+     "This library enables enums to not only obtain the ordinal values of their
+variants but also allows for the construction of enums from an ordinal value.")
+    (license license:expat)))
+
 (define-public rust-enumset-1
   (package
     (name "rust-enumset")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 13/20] gnu: Add rust-qrcodegen-1.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-qrcodegen-1): New variable.

Change-Id: I2f0069293c945299283959cd29f95a37a6b5ea5b
---
 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 84eac123ca..572f00f052 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61444,6 +61444,27 @@ (define-public rust-python-pkginfo-0.5
         ("rust-zip" ,rust-zip-0.6))
        #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-qrcodegen-1
+  (package
+    (name "rust-qrcodegen")
+    (version "1.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrcodegen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hn1j12q31nzlkra42s20p0wh198bx8f7xc73mic3j9121xgqfa3"))))
+    (build-system cargo-build-system)
+    (arguments
+     ;; test result: FAILED. 1 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out
+     (list #:tests? #f))
+    (home-page "https://www.nayuki.io/page/qr-code-generator-library")
+    (synopsis "High-quality QR Code generator library")
+    (description
+     "This package provides a high-quality QR Code generator library.")
+    (license license:expat)))
+
 (define-public rust-qrencode-0.14
   (package
     (name "rust-qrencode")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 14/20] gnu: Add rust-manifest-dir-macros-0.1.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-manifest-dir-macros-0.1): New variable.

Change-Id: Idc496ce8efcbf6d3742d4a2c04c04502cf8d323c
---
 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 572f00f052..5fd162e9ff 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42795,6 +42795,33 @@ (define-public rust-malloc-buf-0.0
     (arguments
      `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))))
 
+(define-public rust-manifest-dir-macros-0.1
+  (package
+    (name "rust-manifest-dir-macros")
+    (version "0.1.18")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "manifest-dir-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14zm557gcm1ldr19ry53ngvni8vqaicm01xa5vg8pgyd3kg40vcw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-mime-guess" ,rust-mime-guess-2)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://magiclen.org/manifest-dir-macros")
+    (synopsis
+     "This crate provides function-like macros to check or operate paths
+relative to CARGO_MANIFEST_DIR at compile time")
+    (description
+     "This crate provides function-like macros to check or operate paths relative to
+CARGO_MANIFEST_DIR at compile time.")
+    (license license:expat)))
+
 (define-public rust-maplit-1
   (package
     (name "rust-maplit")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 15/20] gnu: Add rust-qrcode-generator-4.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-qrcode-generator-4): New variable.

Change-Id: Ib253a274940455d701bb06c149856fd01af7ba93
---
 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 5fd162e9ff..ac123fe3fa 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -61471,6 +61471,32 @@ (define-public rust-python-pkginfo-0.5
         ("rust-zip" ,rust-zip-0.6))
        #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-qrcode-generator-4
+  (package
+    (name "rust-qrcode-generator")
+    (version "4.1.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrcode-generator" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ngiwz7mfqfy7g8nh309vq9qqphyybbp890s4fb418f78sbcn1hx"))))
+    (build-system cargo-build-system)
+    (arguments
+     ;; test result: FAILED. 4 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out
+     `(#:tests? #f
+       #:cargo-inputs (("rust-html-escape" ,rust-html-escape-0.2)
+                       ("rust-image" ,rust-image-0.24)
+                       ("rust-qrcodegen" ,rust-qrcodegen-1))
+       #:cargo-development-inputs (("rust-manifest-dir-macros" ,rust-manifest-dir-macros-0.1))))
+    (home-page "https://magiclen.org/qrcode-generator")
+    (synopsis
+     "Generate QR Code matrices and images in RAW, PNG and SVG formats")
+    (description
+     "This package provides Generate QR Code matrices and images in RAW, PNG and SVG formats.")
+    (license license:expat)))
+
 (define-public rust-qrcodegen-1
   (package
     (name "rust-qrcodegen")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 16/20] gnu: Add rust-zbar-rust-0.0.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-zbar-rust-0.0): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ac123fe3fa..d79dffc775 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -72,6 +72,7 @@ (define-module (gnu packages crates-io)
   #:use-module (gnu packages)
   #:use-module (gnu packages acl)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages aidc)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages avahi)
@@ -94984,6 +94985,33 @@ (define-public rust-z-base-32-0.1
     (description "This package provides human-oriented base-32 encoding.")
     (license license:expat)))
 
+(define-public rust-zbar-rust-0.0
+  (package
+    (name "rust-zbar-rust")
+    (version "0.0.23")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "zbar-rust" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0m6c9393bvw2sngp36m0db1gzqxyqa9ms5biibz659md68di7k59"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-enum-ordinalize" ,rust-enum-ordinalize-4)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))
+       #:cargo-development-inputs (("rust-image" ,rust-image-0.24)
+                                   ("rust-qrcode-generator" ,rust-qrcode-generator-4))))
+    (native-inputs (list pkg-config))
+    (inputs (list zbar))
+    (home-page "https://magiclen.org/zbar-rust")
+    (synopsis "High-level and low-level ZBar bindings")
+    (description
+     "This package provides High-level and low-level ZBar bindings
+for the Rust language.")
+    (license license:lgpl2.1)))
+
 (define-public rust-zbase32-0.1
   (package
     (name "rust-zbase32")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 17/20] gnu: Add rust-roxmltree-0.20.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-roxmltree-0.20): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d79dffc775..70744babf9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65817,17 +65817,17 @@ (define-public rust-rowan-0.15
      "This package provides a library for generic lossless syntax trees.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-roxmltree-0.19
+(define-public rust-roxmltree-0.20
   (package
     (name "rust-roxmltree")
-    (version "0.19.0")
+    (version "0.20.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "roxmltree" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0zs0q8hg5nnh91s1ib6r0fky7xm8ay63ayfa5i1afxxpwgalzl9w"))))
+        (base32 "15vw91ps91wkmmgy62khf9zb63bdinvm80957dascbsw7dwvc83c"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/RazrFalcon/roxmltree")
     (synopsis "Represent an XML as a read-only tree")
@@ -65835,6 +65835,19 @@ (define-public rust-roxmltree-0.19
      "@code{roxmltree} represents an XML 1.0 document as a read-only tree.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-roxmltree-0.19
+  (package
+    (inherit rust-roxmltree-0.20)
+    (name "rust-roxmltree")
+    (version "0.19.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "roxmltree" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0zs0q8hg5nnh91s1ib6r0fky7xm8ay63ayfa5i1afxxpwgalzl9w"))))))
+
 (define-public rust-roxmltree-0.14
   (package
     (inherit rust-roxmltree-0.19)
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 18/20] gnu: Add rust-roxmltree-0.18.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-io.scm (rust-roxmltree-0.18): New variable.

Change-Id: I7c6f8580e739a04f0a8df90801b6ebb49efc22ee
---
 gnu/packages/crates-io.scm | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 70744babf9..b3fad287ce 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -65848,10 +65848,31 @@ (define-public rust-roxmltree-0.19
        (sha256
         (base32 "0zs0q8hg5nnh91s1ib6r0fky7xm8ay63ayfa5i1afxxpwgalzl9w"))))))
 
-(define-public rust-roxmltree-0.14
+(define-public rust-roxmltree-0.18
   (package
     (inherit rust-roxmltree-0.19)
     (name "rust-roxmltree")
+    (version "0.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "roxmltree" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1n5ikvn00ciqkkr4hnch5ws1k3gfj8z50j3alv6wdf5nayj9bxfq"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* "Cargo.toml"
+                  ;; Patch xmlparser version
+                  (("0.13.5") "0.13.3"))))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs (("rust-xmlparser" ,rust-xmlparser-0.13))))))
+
+(define-public rust-roxmltree-0.14
+  (package
+    (inherit rust-roxmltree-0.18)
+    (name "rust-roxmltree")
     (version "0.14.0")
     (source
      (origin
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 19/20] gnu: Add rust-svg-metadata-0.4.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-svg-metadata-0.4): New variable.

Change-Id: Ia230444ba47d403e76106684f9fb07eb85c08cab
---
 gnu/packages/crates-graphics.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 197f77a724..2dae5bf0bf 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -3818,6 +3818,35 @@ (define-public rust-softbuffer-0.3
     (description "Cross-platform software buffer.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-svg-metadata-0.4
+  (package
+    (name "rust-svg-metadata")
+    (version "0.4.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "svg_metadata" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "002j0na1kfz4pgi43hdcz5baygzk6irnjd5lrmbqqfjldwn3sbx4"))))
+    (build-system cargo-build-system)
+    (arguments
+     ;; error[E0432]: unresolved import `svg_metadata`
+     `(#:tests? #f
+       #:cargo-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-roxmltree" ,rust-roxmltree-0.18)
+                       ("rust-skeptic" ,rust-skeptic-0.13))
+       #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3))))
+    (home-page "https://github.com/mre/svg-metadata")
+    (synopsis
+     "Extracts metadata (like the viewBox, width, and height) from SVG graphics")
+    (description
+     "This package provides Extracts metadata (like the @code{viewBox}, width,
+and height) from SVG graphics.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-tiff-0.9
   (package
     (name "rust-tiff")
-- 
2.46.0

[bug#74234] [PATCHv2 rust-team 20/20] gnu: Add gnome-authenticator.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/rust-apps.scm (gnome-authenticator): New variable.

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

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 3844daa651..634efcd626 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -32,6 +32,7 @@
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
 ;;; Copyright © 2024 Jordan Moore <lockbox@struct.foo>
+;;; Copyright © 2024 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -61,6 +62,7 @@ (define-module (gnu packages rust-apps)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages aidc)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
@@ -80,8 +82,10 @@ (define-module (gnu packages rust-apps)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages haskell-xyz)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages ibus)
   #:use-module (gnu packages icu4c)
@@ -106,6 +110,7 @@ (define-module (gnu packages rust-apps)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages webkit)
+  #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
 (define-public aardvark-dns
@@ -985,6 +990,236 @@ (define-public gitui
     (description "This package provides a fast Terminal UI for git.")
     (license license:expat)))
 
+(define-public gnome-authenticator
+  (package
+    (name "gnome-authenticator")
+    (version "4.4.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/World/Authenticator.git/")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0zavax35n048spx097ymiq31s8b879qwbg8xmcxcx73r6m823mic"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:install-source? #f
+      #:cargo-inputs `(("rust-aes-gcm" ,rust-aes-gcm-0.10)
+                       ("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-rust-argon2" ,rust-rust-argon2-2.0)
+                       ("rust-aperture" ,rust-aperture-0.3)
+                       ("rust-ashpd" ,rust-ashpd-0.6)
+                       ("rust-data-encoding" ,rust-data-encoding-2)
+                       ("rust-diesel" ,rust-diesel-2)
+                       ("rust-diesel-migrations" ,rust-diesel-migrations-2)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-executor" ,rust-futures-executor-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gettext-rs" ,rust-gettext-rs-0.7)
+                       ("rust-gtk4" ,rust-gtk4-0.7)
+                       ("rust-hex" ,rust-hex-0.4)
+                       ("rust-image" ,rust-image-0.24)
+                       ("rust-libadwaita" ,rust-libadwaita-0.5)
+                       ("rust-oo7" ,rust-oo7-0.2)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2.1)
+                       ("rust-prost" ,rust-prost-0.12)
+                       ("rust-qrencode" ,rust-qrencode-0.14)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-reqwest" ,rust-reqwest-0.11)
+                       ("rust-ring" ,rust-ring-0.17)
+                       ("rust-scrypt" ,rust-scrypt-0.11)
+                       ("rust-search-provider" ,rust-search-provider-0.6)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-svg-metadata" ,rust-svg-metadata-0.4)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-uuid" ,rust-uuid-1)
+                       ("rust-zbar-rust" ,rust-zbar-rust-0.0)
+                       ("rust-zeroize" ,rust-zeroize-1))
+      #:imported-modules `(,@%glib-or-gtk-build-system-modules
+                           ,@%cargo-build-system-modules)
+      #:modules `((guix build cargo-build-system)
+                  ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+                  (guix build utils))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-in-files
+            (lambda _
+              (let ((bindir
+                     (string-append #$output "/bin"))
+                    (localedir
+                     (string-append "\"" #$output "share/locale\""))
+                    (pkgdatadir
+                     (string-append "\"" #$output "/share/authenticator\"")))
+
+                (substitute* "src/config.rs.in"
+                  (("@APP_ID@") "\"com.belmoussaoui.Authenticator\"")
+                  (("@PKGDATADIR@") pkgdatadir)
+                  (("@PROFILE@") "\"\"")
+                  (("@VERSION@") (string-append "\"" #$version "\""))
+                  (("@GETTEXT_PACKAGE@") "\"authenticator\"")
+                  (("@LOCALEDIR@") localedir)
+                  (("@OBJECT_PATH@") "\"/com/belmoussaoui/Authenticator/SearchProvider\""))
+                (rename-file "src/config.rs.in" "src/config.rs")
+
+                (substitute* "data/com.belmoussaoui.Authenticator.SearchProvider.service.in"
+                  (("@app-id@") "com.belmoussaoui.Authenticator")
+                  (("@bindir@") bindir)
+                  (("@name@") "authenticator"))
+                (rename-file "data/com.belmoussaoui.Authenticator.SearchProvider.service.in"
+                             "data/com.belmoussaoui.Authenticator.SearchProvider.service")
+
+                (substitute* "data/com.belmoussaoui.Authenticator.metainfo.xml.in.in"
+                  (("@app-id@") "com.belmoussaoui.Authenticator")
+                  (("@gettext-package@") "authenticator"))
+                (rename-file "data/com.belmoussaoui.Authenticator.metainfo.xml.in.in"
+                             "data/com.belmoussaoui.Authenticator.metainfo.xml")
+
+                (substitute* "data/com.belmoussaoui.Authenticator.desktop.in.in"
+                  (("@icon@") "com.belmoussaoui.Authenticator"))
+                (rename-file "data/com.belmoussaoui.Authenticator.desktop.in.in"
+                             "data/com.belmoussaoui.Authenticator.desktop")
+
+                (substitute* "data/com.belmoussaoui.Authenticator.gschema.xml.in"
+                  (("@app-id@") "com.belmoussaoui.Authenticator")
+                  (("@gettext-package@") "authenticator"))
+                (rename-file "data/com.belmoussaoui.Authenticator.gschema.xml.in"
+                             "data/com.belmoussaoui.Authenticator.gschema.xml"))))
+          (add-before 'build 'build-locales
+            (lambda _
+              (for-each
+               (lambda (po-file)
+                 (invoke "msgfmt" "-c" "-o"
+                         (string-append (string-drop-right po-file 3) ".mo")
+                         po-file))
+               (find-files "po" "\\.po"))))
+          (add-before 'build-locales 'build-resources
+            (lambda _
+              (with-directory-excursion "data"
+                (invoke "glib-compile-resources"
+                        "--generate"
+                        "resources.gresource.xml"))))
+          (add-before 'install 'install-extra
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (here (getcwd))
+                     (source (assoc-ref inputs "source"))
+                     (share (string-append out "/share"))
+                     (hicolor (string-append share "/icons/hicolor")))
+                (mkdir-p hicolor)
+                (with-directory-excursion hicolor
+                  (mkdir-p "scalable/apps")
+                  (install-file
+                   (string-append source "/data/icons/com.belmoussaoui.Authenticator.svg")
+                   "scalable/apps")
+                  (mkdir-p "symbolic/apps")
+                  (install-file
+                   (string-append
+                    source "/data/icons/com.belmoussaoui.Authenticator-symbolic.svg")
+                   "symbolic/apps"))
+                (with-directory-excursion share
+                  (mkdir-p "applications")
+                  (with-directory-excursion "applications"
+                    (install-file
+                     (string-append
+                      here "/data/com.belmoussaoui.Authenticator.desktop") "."))
+                  (mkdir-p "authenticator")
+                  (with-directory-excursion "authenticator"
+                    (copy-file
+                     (string-append
+                      here "/data/resources.gresource")
+                     "authenticator.gresource"))
+                  (mkdir-p "gnome-shell/search-providers")
+                  (with-directory-excursion "gnome-shell/search-providers"
+                    (install-file
+                     (string-append
+                      here
+                      "/data/com.belmoussaoui.Authenticator.search-provider.ini") "."))
+                  (mkdir-p "locale")
+                  (with-directory-excursion "locale"
+                    (for-each
+                     (lambda (mo-file)
+                       (define mo-dir
+                         (string-append
+                          (string-drop-right (basename mo-file) 3)
+                          "/LC_MESSAGES"))
+                       (mkdir-p mo-dir)
+                       (copy-file mo-file (string-append mo-dir "/authenticator.mo")))
+                     (find-files (string-append here "/po") "\\.mo")))
+                  (mkdir-p "metainfo")
+                  (with-directory-excursion "metainfo"
+                    (install-file
+                     (string-append
+                      here
+                      "/data/com.belmoussaoui.Authenticator.metainfo.xml") "."))
+                  (mkdir-p "glib-2.0/schemas")
+                  (with-directory-excursion "glib-2.0/schemas"
+                    (install-file
+                     (string-append
+                      here
+                      "/data/com.belmoussaoui.Authenticator.gschema.xml") "."))
+                  (mkdir-p "dbus-1/services")
+                  (with-directory-excursion "dbus-1/services"
+                    (install-file
+                     (string-append
+                      here
+                      "/data/com.belmoussaoui.Authenticator.SearchProvider.service") "."))))))
+          (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
+            (assoc-ref glib-or-gtk:%standard-phases
+                       'generate-gdk-pixbuf-loaders-cache-file))
+          (add-after 'install 'glib-or-gtk-compile-schemas
+            (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+          (add-after 'install 'glib-or-gtk-wrap
+            (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
+          (add-after 'glib-or-gtk-wrap 'wrap-extra-paths
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out"))
+                    (gst-plugins-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+                (for-each
+                 (lambda (prog)
+                   (wrap-program (string-append out "/bin/" prog)
+                     `("GST_PLUGIN_SYSTEM_PATH" ":" suffix (,gst-plugins-path))))
+                 '("authenticator"))))))))
+    (native-inputs (list clang
+                         gnu-gettext
+                         `(,glib "bin") ; for glib-compile-schemas
+                         libxml2        ; for xmllint
+                         pkg-config))
+    (inputs (list glib
+                  gstreamer
+                  gst-plugins-base
+                  gst-plugins-bad
+                  gtk
+                  libadwaita
+                  openssl
+                  pango-1.52
+                  sqlite
+                  zbar))
+    (home-page "https://apps.gnome.org/Authenticator")
+    (synopsis "Generate two-factor codes")
+    (description "Simple application for generating Two-Factor Authentication
+Codes:
+
+It features:
+
+@itemize
+@item Time-based/Counter-based/Steam methods support
+@item SHA-1/SHA-256/SHA-512 algorithms support
+@item QR code scanner using a camera or from a screenshot
+@item Lock the application with a password
+@item Beautiful UI
+@item GNOME Shell search provider
+@item Backup/Restore from/into known applications like FreeOTP+,
+Aegis (encrypted / plain-text), andOTP, Google Authenticator
+@end itemize")
+    (license license:gpl3+)))
+
 (define-public helvum
   (package
     (name "helvum")
-- 
2.46.0

[bug#74234] [PATCH rust-team v3 00/23] WIP add gnome-authenticator

[Aaron Covrig via Guix-patches via]

Thank you for the contribution,

I reworked several patches and adjusted their order such that all
patches should only depend on patches added before them and can be built
in the order that they are added. Additionally, I reworked the handling
of tests in many of the packages so they are able to be built and tested.
I also reformated and fixed several packages with incorrect/partial
includes. The final patch adding `gnome-authenticator` does not yet build
(it depends on on rust-aperture-0.3 which is added in
https://issues.guix.gnu.org/74233). This patch set will probably need
another round of rework once the final dependencies are merged in.

v/r,

Aaron Covrig

Aaron Covrig (7):
  gnu: Add rust-search-provider-0.6.
  gnu: rust-xmlparser-0.13: Upgrade to v0.13.6
  gnu: Add rust-roxmltree-0.14: Upgrade to v0.14.1.
  gnu: Add rust-roxmltree-0.20.
  gnu: Add rust-svg-metadata-0.5.
  gnu: Add rust-qrcode-0.14.
  gnu: Add rust-qrcode-generator-5.

Giacomo Leidi (16):
  gnu: Add rust-migrations-internals-2.
  gnu: Add rust-migrations-macros-2.
  gnu: Add rust-diesel-migrations-2.
  gnu: Add rust-manifest-dir-macros-0.1.
  gnu: Add rust-roxmltree-0.18.
  gnu: Add rust-svg-metadata-0.4.
  gnu: Add rust-checked-int-cast-1.
  gnu: Add rust-qrencode-0.14.
  gnu: Add rust-enum-ordinalize-derive-4.
  gnu: Add rust-enum-ordinalize-4.
  gnu: Add rust-qrcodegen-1.
  gnu: Add rust-qrcode-generator-4.
  gnu: Add rust-zbar-rust-0.0.
  gnu: Add rust-oo7-0.2.
  gnu: Add rust-ashpd-0.6.
  gnu: Add gnome-authenticator.

 gnu/packages/crates-graphics.scm |  48 ++++
 gnu/packages/crates-gtk.scm      | 118 +++++++++
 gnu/packages/crates-io.scm       | 420 +++++++++++++++++++++++++++----
 gnu/packages/rust-apps.scm       | 256 ++++++++++++++++++-
 4 files changed, 788 insertions(+), 54 deletions(-)


base-commit: 844fab8c4fef48e4548d2bbdb5cd4faaa8727022
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 01/23] gnu: Add rust-migrations-internals-2.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-io.scm (rust-migrations-internals-2): New
variable;
(rust-migrations-internals-1): inherit from rust-migrations-internals-2.

Change-Id: I8bf2abc2019ea4545f3dea977f925f3b543a69c3
---
 gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d5dc63fdc2..1b9175d852 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45222,31 +45222,44 @@ (define-public rust-miette-derive-5
                        ("rust-quote" ,rust-quote-1)
                        ("rust-syn" ,rust-syn-2))))))
 
-(define-public rust-migrations-internals-1
+(define-public rust-migrations-internals-2
   (package
     (name "rust-migrations-internals")
-    (version "1.4.1")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "migrations_internals" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0q2qk4jpa16mcfcmhjz6hdg2s73az1k7j0cy08vvh87h997chkrb"))))
+        (base32 "1nnsr5d4h2kcvmz2j4l8g8n8r1zm7nngwmp842q58lh1h0azf8qg"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-barrel" ,rust-barrel-0.6)
-        ("rust-diesel" ,rust-diesel-1))
-       #:cargo-development-inputs
-       (("rust-tempdir" ,rust-tempdir-0.3))))
+     `(#:cargo-inputs (("rust-serde" ,rust-serde-1)
+                       ("rust-toml" ,rust-toml-0.7))))
     (home-page "https://diesel.rs")
     (synopsis "Internal implementation of Diesel's migration mechanism")
     (description "This package provides an internal implementation of Diesel's
 migration mechanism.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-migrations-internals-1
+  (package
+    (inherit rust-migrations-internals-2)
+    (name "rust-migrations-internals")
+    (version "1.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "migrations_internals" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0q2qk4jpa16mcfcmhjz6hdg2s73az1k7j0cy08vvh87h997chkrb"))))
+    (arguments
+     `(#:cargo-inputs (("rust-barrel" ,rust-barrel-0.6)
+                       ("rust-diesel" ,rust-diesel-1))
+       #:cargo-development-inputs (("rust-tempdir" ,rust-tempdir-0.3))))))
+
 (define-public rust-migrations-macros-1
   (package
     (name "rust-migrations-macros")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 02/23] gnu: Add rust-migrations-macros-2.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-io.scm (rust-migrations-macros-2): New variable;
(rust-migrations-macros-1): inherit from rust-migrations-macros-2.
---
 gnu/packages/crates-io.scm | 52 +++++++++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1b9175d852..89d81f7191 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -45260,38 +45260,56 @@ (define-public rust-migrations-internals-1
                        ("rust-diesel" ,rust-diesel-1))
        #:cargo-development-inputs (("rust-tempdir" ,rust-tempdir-0.3))))))
 
-(define-public rust-migrations-macros-1
+(define-public rust-migrations-macros-2
   (package
     (name "rust-migrations-macros")
-    (version "1.4.2")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "migrations_macros" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "173qgwans6n2jf6b7qajq273rvg1r9c34p5fflzr53gx14lz2lwp"))))
+        (base32 "027gd4s58fmh7jil9rz0ckdsdw81mqfa6dyqbfmvnrqfqxd35qyc"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs
-       (("rust-migrations-internals"
-         ,rust-migrations-internals-1)
-        ("rust-proc-macro2" ,rust-proc-macro2-1)
-        ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))
-       #:cargo-development-inputs
-       (("rust-tempdir" ,rust-tempdir-0.3))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list sqlite))
+     `(#:cargo-test-flags '("--"
+                            ;; Missing files
+                            "--skip=src/lib.rs - embed_migrations (line 44)")
+       #:cargo-inputs (("rust-migrations-internals" ,rust-migrations-internals-2)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1))
+       #:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                                   ("rust-diesel" ,rust-diesel-2)
+                                   ("rust-dotenvy" ,rust-dotenvy-0.15)
+                                   ("rust-tempdir" ,rust-tempdir-0.3))))
+    (native-inputs (list pkg-config))
+    (inputs (list sqlite))
     (home-page "https://diesel.rs")
     (synopsis "Code generation macros for Diesel's embedded migrations")
     (description "This package provides code generation macros for Diesel's
 embedded migrations.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-migrations-macros-1
+  (package
+    (inherit rust-migrations-macros-2)
+    (name "rust-migrations-macros")
+    (version "1.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "migrations_macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "173qgwans6n2jf6b7qajq273rvg1r9c34p5fflzr53gx14lz2lwp"))))
+    (arguments
+     `(#:cargo-inputs (("rust-migrations-internals" ,rust-migrations-internals-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-1))
+       #:cargo-development-inputs (("rust-tempdir" ,rust-tempdir-0.3))))))
+
 (define-public rust-mimalloc-0.1
   (package
     (name "rust-mimalloc")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 03/23] gnu: Add rust-diesel-migrations-2.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-io.scm (rust-diesel-migrations-2): New variable;
(rust-diesel-migrations-1): inherit from rust-diesel-migrations-2.

Change-Id: Ifc9654995b613f9666216be32f910d1f403b2af5
---
 gnu/packages/crates-io.scm | 46 +++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 89d81f7191..b437f9132d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -22863,35 +22863,51 @@ (define-public rust-diesel-derives-1
         ("rust-diesel" ,rust-diesel-1)
         ("rust-dotenv" ,rust-dotenv-0.10))))))
 
-(define-public rust-diesel-migrations-1
+(define-public rust-diesel-migrations-2
   (package
     (name "rust-diesel-migrations")
-    (version "1.4.0")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "diesel_migrations" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0k4g03ciqwya2xc1xvy5s9cs6q55k45wxa1gszswfg9m2f2dwg5z"))))
+        (base32 "1b0ld4azk73rg2axwq7a4wnpwba3085f43jp3cw62n8c2bqb6dk0"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #f ;doctest_setup.rs: No such file or directory
-       #:cargo-inputs
-       (("rust-migrations-internals"
-         ,rust-migrations-internals-1)
-        ("rust-migrations-macros"
-         ,rust-migrations-macros-1))
-       #:cargo-development-inputs
-       (("rust-cfg-if" ,rust-cfg-if-0.1)
-        ("rust-diesel" ,rust-diesel-1)
-        ("rust-dotenv" ,rust-dotenv-0.10))))
+     `( ;#:tests? #f ;doctest_setup.rs: No such file or directory
+        #:cargo-inputs (("rust-diesel" ,rust-diesel-2)
+                        ("rust-migrations-internals" ,rust-migrations-internals-2)
+                        ("rust-migrations-macros" ,rust-migrations-macros-2))
+       #:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-0.1)
+                                   ("rust-dotenvy" ,rust-dotenvy-0.15)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
     (home-page "https://diesel.rs")
     (synopsis "Migration management for diesel")
     (description "This package provides migration management for Diesel.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-diesel-migrations-1
+  (package
+    (inherit rust-diesel-migrations-2)
+    (name "rust-diesel-migrations")
+    (version "1.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "diesel_migrations" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0k4g03ciqwya2xc1xvy5s9cs6q55k45wxa1gszswfg9m2f2dwg5z"))))
+    (arguments
+     `(#:tests? #f ;doctest_setup.rs: No such file or directory
+       #:cargo-inputs (("rust-migrations-internals" ,rust-migrations-internals-1)
+                       ("rust-migrations-macros" ,rust-migrations-macros-1))
+       #:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-0.1)
+                                   ("rust-diesel" ,rust-diesel-1)
+                                   ("rust-dotenv" ,rust-dotenv-0.10))))))
+
 (define-public rust-diesel-table-macro-syntax-0.1
   (package
     (name "rust-diesel-table-macro-syntax")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 04/23] gnu: Add rust-search-provider-0.6.

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-gtk.scm (rust-search-provider-0.6): New variable.
---
 gnu/packages/crates-gtk.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index f37fea93e3..8c90cafbb9 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -4734,6 +4734,25 @@ (define-public rust-search-provider-0.8
 provider API.")
     (license license:gpl3+)))
 
+(define-public rust-search-provider-0.6
+  (package
+    (inherit rust-search-provider-0.8)
+    (name "rust-search-provider")
+    (version "0.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "search-provider" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "01jby7xq0dd9rafw5kgskpbxgppn4imzm71w1sdj8iy9ci4ghh9z"))))
+    (arguments
+     `(#:cargo-inputs (("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.18)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-zbus" ,rust-zbus-3))))))
+
 (define-public rust-soup-sys-0.10
   (package
     (name "rust-soup-sys")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 05/23] gnu: Add rust-manifest-dir-macros-0.1.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-io.scm (rust-manifest-dir-macros-0.1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b437f9132d..94d3cc97a6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -43835,6 +43835,32 @@ (define-public rust-malloc-buf-0.0
     (arguments
      `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))))
 
+(define-public rust-manifest-dir-macros-0.1
+  (package
+    (name "rust-manifest-dir-macros")
+    (version "0.1.18")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "manifest-dir-macros" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "14zm557gcm1ldr19ry53ngvni8vqaicm01xa5vg8pgyd3kg40vcw"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-mime-guess" ,rust-mime-guess-2)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://magiclen.org/manifest-dir-macros")
+    (synopsis
+     "Provides macros to check or operate paths relative to CARGO_MANIFEST_DIR")
+    (description
+     "This crate provides function-like macros to check or operate paths
+relative to @emph{CARGO_MANIFEST_DIR} at compile time.")
+    (license license:expat)))
+
 (define-public rust-maplit-1
   (package
     (name "rust-maplit")
@@ -96867,7 +96893,7 @@ (define-public rust-xml5ever-0.16
 (define-public rust-xmlparser-0.13
   (package
     (name "rust-xmlparser")
-    (version "0.13.3")
+    (version "0.13.6")
     (source
      (origin
        (method url-fetch)
@@ -96876,7 +96902,7 @@ (define-public rust-xmlparser-0.13
        (sha256
         (base32 "1n73ymdxpdq30fgz698095zvh8k5r264rl6pcxnyyrr19nra4jqi"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
+    ;(arguments `(;#:skip-build? #t))
     (home-page "https://github.com/RazrFalcon/xmlparser")
     (synopsis "Pull-based, zero-allocation XML parser")
     (description
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 06/23] gnu: rust-xmlparser-0.13: Upgrade to v0.13.6

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-io.scm (rust-xmlparser-0.13): Upgrade to v0.13.6
---
 gnu/packages/crates-io.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 94d3cc97a6..dd329fb33b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -96900,9 +96900,13 @@ (define-public rust-xmlparser-0.13
        (uri (crate-uri "xmlparser" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1n73ymdxpdq30fgz698095zvh8k5r264rl6pcxnyyrr19nra4jqi"))))
+        (base32 "1r796g21c70p983ax0j6rmhzmalg4rhx61mvd4farxdhfyvy1zk6"))))
     (build-system cargo-build-system)
-    ;(arguments `(;#:skip-build? #t))
+    (arguments
+      `(#:cargo-test-flags
+        '("--"
+          ;; Test requires stdout
+          "--skip=src/stream.rs - stream::Stream<'a>::advance (line 151)")))
     (home-page "https://github.com/RazrFalcon/xmlparser")
     (synopsis "Pull-based, zero-allocation XML parser")
     (description
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 07/23] gnu: Add rust-roxmltree-0.18.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-io.scm (rust-roxmltree-0.18): New variable.

Change-Id: I7c6f8580e739a04f0a8df90801b6ebb49efc22ee
---
 gnu/packages/crates-io.scm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dd329fb33b..3fb0d9a5e5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67224,10 +67224,25 @@ (define-public rust-roxmltree-0.19
      "@code{roxmltree} represents an XML 1.0 document as a read-only tree.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-roxmltree-0.14
+(define-public rust-roxmltree-0.18
   (package
     (inherit rust-roxmltree-0.19)
     (name "rust-roxmltree")
+    (version "0.18.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "roxmltree" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "00mkd2xyrxm8ap39sxpkhzdzfn2m98q3zicf6wd2f6yfa7il08w6"))))
+    (arguments
+     `(#:cargo-inputs (("rust-xmlparser" ,rust-xmlparser-0.13))))))
+
+(define-public rust-roxmltree-0.14
+  (package
+    (inherit rust-roxmltree-0.18)
+    (name "rust-roxmltree")
     (version "0.14.0")
     (source
      (origin
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 08/23] gnu: Add rust-roxmltree-0.14: Upgrade to v0.14.1.

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-io.scm (rust-roxmltree-0.14): Upgrade to v0.14.1
---
 gnu/packages/crates-io.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3fb0d9a5e5..082c4d9834 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67243,17 +67243,17 @@ (define-public rust-roxmltree-0.14
   (package
     (inherit rust-roxmltree-0.18)
     (name "rust-roxmltree")
-    (version "0.14.0")
+    (version "0.14.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "roxmltree" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "010mahzyarkzb7kaawgga1a9y46nsp209yh2i4g4pq98bg8afn5z"))))
+        (base32 "0sv44pfl218p6r9anq5si6fhv0vz26vq20y42pi3f3j15sk086cj"))))
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs (("rust-xmlparser" ,rust-xmlparser-0.13))))))
+     `(#:cargo-inputs (("rust-xmlparser" ,rust-xmlparser-0.13))
+       #:cargo-development-inputs (("rust-pretty-assertions" ,rust-pretty-assertions-0.5))))))
 
 (define-public rust-rpassword-7
   (package
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 09/23] gnu: Add rust-roxmltree-0.20.

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-io.scm (rust-roxmltree-0.20): New variable.
---
 gnu/packages/crates-io.scm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 082c4d9834..d87b24810a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -67206,17 +67206,17 @@ (define-public rust-rowan-0.15
      "This package provides a library for generic lossless syntax trees.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-roxmltree-0.19
+(define-public rust-roxmltree-0.20
   (package
     (name "rust-roxmltree")
-    (version "0.19.0")
+    (version "0.20.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "roxmltree" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0zs0q8hg5nnh91s1ib6r0fky7xm8ay63ayfa5i1afxxpwgalzl9w"))))
+        (base32 "15vw91ps91wkmmgy62khf9zb63bdinvm80957dascbsw7dwvc83c"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/RazrFalcon/roxmltree")
     (synopsis "Represent an XML as a read-only tree")
@@ -67224,6 +67224,19 @@ (define-public rust-roxmltree-0.19
      "@code{roxmltree} represents an XML 1.0 document as a read-only tree.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-roxmltree-0.19
+  (package
+    (inherit rust-roxmltree-0.20)
+    (name "rust-roxmltree")
+    (version "0.19.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "roxmltree" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0zs0q8hg5nnh91s1ib6r0fky7xm8ay63ayfa5i1afxxpwgalzl9w"))))))
+
 (define-public rust-roxmltree-0.18
   (package
     (inherit rust-roxmltree-0.19)
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 10/23] gnu: Add rust-svg-metadata-0.4.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-graphics.scm (rust-svg-metadata-0.4): New variable.
---
 gnu/packages/crates-graphics.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index e553d3476d..f95dc7b0a4 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -4525,6 +4525,35 @@ (define-public rust-softbuffer-0.3
                (setenv "DISPLAY" display)
                (system (string-append xvfb " " display " &"))))))))))
 
+(define-public rust-svg-metadata-0.4
+  (package
+    (name "rust-svg-metadata")
+    (version "0.4.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "svg_metadata" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "002j0na1kfz4pgi43hdcz5baygzk6irnjd5lrmbqqfjldwn3sbx4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--"
+                            ;; error[E0432]: unresolved import `svg_metadata`
+                            "--skip=readme_sect_usage_example_line_19")
+       #:cargo-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-roxmltree" ,rust-roxmltree-0.18))
+       #:cargo-development-inputs (("rust-skeptic" ,rust-skeptic-0.13))))
+    (home-page "https://github.com/mre/svg-metadata")
+    (synopsis
+     "Extracts metadata (like the viewBox, width, and height) from SVG graphics")
+    (description
+     "This package provides Extracts metadata (like the @code{viewBox}, width,
+and height) from SVG graphics.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-tiff-0.9
   (package
     (name "rust-tiff")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 11/23] gnu: Add rust-svg-metadata-0.5.

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-graphics.scm (rust-svg-metadata-0.5): New variable.
---
 gnu/packages/crates-graphics.scm | 37 ++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index f95dc7b0a4..20bf6f2ab1 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -4525,8 +4525,35 @@ (define-public rust-softbuffer-0.3
                (setenv "DISPLAY" display)
                (system (string-append xvfb " " display " &"))))))))))
 
+(define-public rust-svg-metadata-0.5
+  (package
+    (name "rust-svg-metadata")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "svg_metadata" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0717wb4zkj5qdypg58zs7m1x45i49pdrhzga0k0wvqn2g2y7qk17"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-regex" ,rust-regex-1)
+                       ("rust-roxmltree" ,rust-roxmltree-0.20))
+       #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3))))
+    (home-page "https://github.com/mre/svg-metadata")
+    (synopsis
+     "Extracts metadata (like the viewBox, width, and height) from SVG graphics")
+    (description
+     "This package provides Extracts metadata (like the @code{viewBox}, width,
+and height) from SVG graphics.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-svg-metadata-0.4
   (package
+    (inherit rust-svg-metadata-0.5)
     (name "rust-svg-metadata")
     (version "0.4.4")
     (source
@@ -4536,7 +4563,6 @@ (define-public rust-svg-metadata-0.4
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "002j0na1kfz4pgi43hdcz5baygzk6irnjd5lrmbqqfjldwn3sbx4"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags '("--"
                             ;; error[E0432]: unresolved import `svg_metadata`
@@ -4545,14 +4571,7 @@ (define-public rust-svg-metadata-0.4
                        ("rust-lazy-static" ,rust-lazy-static-1)
                        ("rust-regex" ,rust-regex-1)
                        ("rust-roxmltree" ,rust-roxmltree-0.18))
-       #:cargo-development-inputs (("rust-skeptic" ,rust-skeptic-0.13))))
-    (home-page "https://github.com/mre/svg-metadata")
-    (synopsis
-     "Extracts metadata (like the viewBox, width, and height) from SVG graphics")
-    (description
-     "This package provides Extracts metadata (like the @code{viewBox}, width,
-and height) from SVG graphics.")
-    (license (list license:asl2.0 license:expat))))
+       #:cargo-development-inputs (("rust-skeptic" ,rust-skeptic-0.13))))))
 
 (define-public rust-tiff-0.9
   (package
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 12/23] gnu: Add rust-checked-int-cast-1.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-io.scm (rust-checked-int-cast-1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index d87b24810a..e03c651125 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -13159,6 +13159,26 @@ (define-public rust-chrono-0.4
     (description "Date and time library for Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-checked-int-cast-1
+  (package
+    (name "rust-checked-int-cast")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "checked_int_cast" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06brva5agm6g12q15f8fidz17akb85q211496p1k2qxhb9mmxk0p"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/PeterReid/checked_int_cast")
+    (synopsis "Conversions between primitive integers with overflow and
+underflow checking")
+    (description
+     "This package provides Conversions between primitive integers with
+overflow and underflow checking.")
+    (license license:expat)))
+
 (define-public rust-chic-1
   (package
     (name "rust-chic")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 13/23] gnu: Add rust-qrencode-0.14.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-io.scm (rust-qrencode-0.14): New variable.

Change-Id: I23ee1b5880d52c595907ff5359d1ca71c355be33
---
 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 e03c651125..dfdac24ca9 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62864,6 +62864,27 @@ (define-public rust-python-pkginfo-0.5
         ("rust-zip" ,rust-zip-0.6))
        #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-qrencode-0.14
+  (package
+    (name "rust-qrencode")
+    (version "0.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrencode" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1hgp0lchnp3zx79j3799nm445rvqg7x62x2x7926ky22lqhv23d6"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-checked-int-cast" ,rust-checked-int-cast-1)
+                       ("rust-image" ,rust-image-0.24))
+       #:cargo-development-inputs (("rust-image" ,rust-image-0.24))))
+    (home-page "https://github.com/sayanarijit/qrencode")
+    (synopsis "QR code encoder in Rust")
+    (description "This package provides QR code encoder in Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-quad-rand-0.2
   (package
     (name "rust-quad-rand")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 14/23] gnu: Add rust-qrcode-0.14.

[Aaron Covrig via Guix-patches via]

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index dfdac24ca9..bc4e17c411 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62864,6 +62864,26 @@ (define-public rust-python-pkginfo-0.5
         ("rust-zip" ,rust-zip-0.6))
        #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))))
 
+(define-public rust-qrcode-0.14
+  (package
+    (name "rust-qrcode")
+    (version "0.14.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrcode" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1v693x68yg90wfpas5v4bf6cfmnq9dq54qfgd3kb33j07r3851yn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-image" ,rust-image-0.25))
+       #:cargo-development-inputs (("rust-image" ,rust-image-0.25))))
+    (home-page "https://github.com/sayanarijit/qrencode")
+    (synopsis "QR code encoder in Rust")
+    (description "QR code and Micro QR code encoder in Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-qrencode-0.14
   (package
     (name "rust-qrencode")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 15/23] gnu: Add rust-enum-ordinalize-derive-4.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-io.scm (rust-enum-ordinalize-derive-4): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bc4e17c411..bf6f994a72 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25492,6 +25492,30 @@ (define-public rust-enumflags2-derive-0.6
         ("rust-quote" ,rust-quote-1)
         ("rust-syn" ,rust-syn-1))))))
 
+(define-public rust-enum-ordinalize-derive-4
+  (package
+    (name "rust-enum-ordinalize-derive")
+    (version "4.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "enum-ordinalize-derive" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1zy53fabazimwv5cl0366k834ybixzl84lxj9mfavbnlfn532a0d"))))
+    (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://magiclen.org/enum-ordinalize")
+    (synopsis "Macro that enables construction of enums from an ordinal value")
+    (description
+     "This crate provides a procedural macro that enables enums to not only
+obtain the ordinal values of their variants but also allows for the
+construction of enums from an ordinal value.")
+    (license license:expat)))
+
 (define-public rust-enumset-1
   (package
     (name "rust-enumset")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 16/23] gnu: Add rust-enum-ordinalize-4.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-io.scm (rust-enum-ordinalize-4): New variable.

Change-Id: I5aaf730e4cf03fa604c21c4764cbad5178bfbbc5
---
 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 bf6f994a72..76ea0a85ba 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25516,6 +25516,27 @@ (define-public rust-enum-ordinalize-derive-4
 construction of enums from an ordinal value.")
     (license license:expat)))
 
+(define-public rust-enum-ordinalize-4
+  (package
+    (name "rust-enum-ordinalize")
+    (version "4.3.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "enum-ordinalize" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1max64z9giii61qcwl56rndd7pakaylkaij5zqbbbvjl9vxdr87y"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-enum-ordinalize-derive" ,rust-enum-ordinalize-derive-4))))
+    (home-page "https://magiclen.org/enum-ordinalize")
+    (synopsis "Construction of enums from an ordinal value")
+    (description
+     "This library enables enums to not only obtain the ordinal values of their
+variants but also allows for the construction of enums from an ordinal value.")
+    (license license:expat)))
+
 (define-public rust-enumset-1
   (package
     (name "rust-enumset")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 17/23] gnu: Add rust-qrcodegen-1.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-io.scm (rust-qrcodegen-1): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 76ea0a85ba..bf15f893a3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62950,6 +62950,29 @@ (define-public rust-qrencode-0.14
     (description "This package provides QR code encoder in Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-qrcodegen-1
+  (package
+    (name "rust-qrcodegen")
+    (version "1.8.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrcodegen" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0hn1j12q31nzlkra42s20p0wh198bx8f7xc73mic3j9121xgqfa3"))))
+    (build-system cargo-build-system)
+    (arguments
+     ;; Doctests contain errors, see:
+     ;; https://github.com/nayuki/QR-Code-generator/pull/158
+     `(#:cargo-test-flags '("--" "--skip=test src/lib.rs - (line 67)"
+                            "--skip=src/lib.rs - (line 75)")))
+    (home-page "https://www.nayuki.io/page/qr-code-generator-library")
+    (synopsis "High-quality QR Code generator library")
+    (description
+     "This package provides a high-quality QR Code generator library.")
+    (license license:expat)))
+
 (define-public rust-quad-rand-0.2
   (package
     (name "rust-quad-rand")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 18/23] gnu: Add rust-qrcode-generator-4.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-io.scm (rust-qrcode-generator-4): New variable.

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

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index bf15f893a3..94f9228117 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62929,6 +62929,36 @@ (define-public rust-qrcode-0.14
     (description "QR code and Micro QR code encoder in Rust.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-qrcode-generator-4
+  (package
+    (name "rust-qrcode-generator")
+    (version "4.1.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrcode-generator" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ngiwz7mfqfy7g8nh309vq9qqphyybbp890s4fb418f78sbcn1hx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--"
+                            ;; Missing files
+                            "--skip=src/lib.rs - (line 51)"
+                            "--skip=src/lib.rs - (line 31)")
+       #:cargo-inputs (("rust-html-escape" ,rust-html-escape-0.2)
+                       ("rust-image" ,rust-image-0.24)
+                       ("rust-qrcodegen" ,rust-qrcodegen-1))
+       #:cargo-development-inputs (("rust-manifest-dir-macros"
+				    ,rust-manifest-dir-macros-0.1))))
+    (home-page "https://magiclen.org/qrcode-generator")
+    (synopsis
+     "Generate QR Code matrices and images in RAW, PNG and SVG formats")
+    (description
+     "This package provides Generate QR Code matrices and images in
+RAW, PNG and SVG formats.")
+    (license license:expat)))
+
 (define-public rust-qrencode-0.14
   (package
     (name "rust-qrencode")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 19/23] gnu: Add rust-qrcode-generator-5.

[Aaron Covrig via Guix-patches via]

* gnu/packages/crates-io.scm (rust-qrcode-generator-5): New variable.
---
 gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 94f9228117..0fa69838f1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62929,17 +62929,17 @@ (define-public rust-qrcode-0.14
     (description "QR code and Micro QR code encoder in Rust.")
     (license (list license:expat license:asl2.0))))
 
-(define-public rust-qrcode-generator-4
+(define-public rust-qrcode-generator-5
   (package
     (name "rust-qrcode-generator")
-    (version "4.1.9")
+    (version "5.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "qrcode-generator" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0ngiwz7mfqfy7g8nh309vq9qqphyybbp890s4fb418f78sbcn1hx"))))
+        (base32 "0v1hn1rjbz1ay3n786vhaijsv2iiqy4d6naznxcm0imm94c0bw7s"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags '("--"
@@ -62947,7 +62947,7 @@ (define-public rust-qrcode-generator-4
                             "--skip=src/lib.rs - (line 51)"
                             "--skip=src/lib.rs - (line 31)")
        #:cargo-inputs (("rust-html-escape" ,rust-html-escape-0.2)
-                       ("rust-image" ,rust-image-0.24)
+                       ("rust-image" ,rust-image-0.25)
                        ("rust-qrcodegen" ,rust-qrcodegen-1))
        #:cargo-development-inputs (("rust-manifest-dir-macros"
 				    ,rust-manifest-dir-macros-0.1))))
@@ -62959,6 +62959,29 @@ (define-public rust-qrcode-generator-4
 RAW, PNG and SVG formats.")
     (license license:expat)))
 
+(define-public rust-qrcode-generator-4
+  (package
+    (inherit rust-qrcode-generator-5)
+    (name "rust-qrcode-generator")
+    (version "4.1.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "qrcode-generator" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0ngiwz7mfqfy7g8nh309vq9qqphyybbp890s4fb418f78sbcn1hx"))))
+    (arguments
+     `(#:cargo-test-flags '("--"
+                            ;; Missing files
+                            "--skip=src/lib.rs - (line 51)"
+                            "--skip=src/lib.rs - (line 31)")
+       #:cargo-inputs (("rust-html-escape" ,rust-html-escape-0.2)
+                       ("rust-image" ,rust-image-0.24)
+                       ("rust-qrcodegen" ,rust-qrcodegen-1))
+       #:cargo-development-inputs (("rust-manifest-dir-macros"
+				    ,rust-manifest-dir-macros-0.1))))))
+
 (define-public rust-qrencode-0.14
   (package
     (name "rust-qrencode")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 20/23] gnu: Add rust-zbar-rust-0.0.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-io.scm (rust-zbar-rust-0.0): New variable.

Change-Id: I4cca2fd8c9fcaf0d2d53a8ae858e42e67ffc27bc
---
 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 0fa69838f1..5d76e0e1da 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -73,6 +73,7 @@ (define-module (gnu packages crates-io)
   #:use-module (gnu packages)
   #:use-module (gnu packages acl)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages aidc)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages avahi)
@@ -97579,6 +97580,32 @@ (define-public rust-z-base-32-0.1
     (description "This package provides human-oriented base-32 encoding.")
     (license license:expat)))
 
+(define-public rust-zbar-rust-0.0
+  (package
+    (name "rust-zbar-rust")
+    (version "0.0.23")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "zbar-rust" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0m6c9393bvw2sngp36m0db1gzqxyqa9ms5biibz659md68di7k59"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-enum-ordinalize" ,rust-enum-ordinalize-4)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pkg-config" ,rust-pkg-config-0.3))
+       #:cargo-development-inputs (("rust-image" ,rust-image-0.24)
+                                   ("rust-qrcode-generator" ,rust-qrcode-generator-4))))
+    (native-inputs (list pkg-config))
+    (inputs (list zbar))
+    (home-page "https://magiclen.org/zbar-rust")
+    (synopsis "High-level and low-level ZBar bindings")
+    (description "This package provides High-level and low-level ZBar bindings
+for the Rust language.")
+    (license license:lgpl2.1)))
+
 (define-public rust-zbase32-0.1
   (package
     (name "rust-zbase32")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 21/23] gnu: Add rust-oo7-0.2.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-gtk.scm (rust-oo7-0.2): New variable.

Change-Id: I011b3d08e928792cad32a45f549291d4542ed4d0
---
 gnu/packages/crates-gtk.scm | 54 +++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 8c90cafbb9..2654b1501b 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -28,6 +28,7 @@ (define-module (gnu packages crates-gtk)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (gnu packages)
+  #:use-module (gnu packages crates-crypto)
   #:use-module (gnu packages crates-graphics)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages crates-windows)
@@ -4143,6 +4144,59 @@ (define-public rust-libadwaita-sys-0.5
        #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
                                    ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-oo7-0.2
+  (package
+    (name "rust-oo7")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "oo7" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "13cpaq7f51gqcspd4097vjr7r2cjpxpn6c02x67dsdizk0xaiv5c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--"
+                            ;; Missing test files
+                            "--skip=dbus::collection::tests::create_encrypted_item"
+                            "--skip=dbus::collection::tests::create_plain_item"
+                            "--skip=dbus::service::tests::create_collection")
+       #:cargo-inputs (("rust-aes" ,rust-aes-0.8)
+                       ("rust-async-fs" ,rust-async-fs-2)
+                       ("rust-async-io" ,rust-async-io-2)
+                       ("rust-async-lock" ,rust-async-lock-3)
+                       ("rust-async-net" ,rust-async-net-2)
+                       ("rust-blocking" ,rust-blocking-1)
+                       ("rust-cbc" ,rust-cbc-0.1)
+                       ("rust-cipher" ,rust-cipher-0.4)
+                       ("rust-digest" ,rust-digest-0.10)
+                       ("rust-futures-lite" ,rust-futures-lite-2)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-hkdf" ,rust-hkdf-0.12)
+                       ("rust-hmac" ,rust-hmac-0.12)
+                       ("rust-md-5" ,rust-md-5-0.10)
+                       ("rust-num" ,rust-num-0.4)
+                       ("rust-num-bigint-dig" ,rust-num-bigint-dig-0.8)
+                       ("rust-openssl" ,rust-openssl-0.10)
+                       ("rust-pbkdf2" ,rust-pbkdf2-0.12)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-sha2" ,rust-sha2-0.10)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-zbus" ,rust-zbus-3)
+                       ("rust-zeroize" ,rust-zeroize-1))
+       #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)
+                                   ("rust-tokio" ,rust-tokio-1))))
+    (home-page "https://github.com/bilelmoussaoui/oo7")
+    (synopsis "Rust Secret Service provider")
+    (description
+     "The Rust Secret Service provider, @emph{oo7}, provides helper methods to
+store and retrieve secrets and uses either the DBus interface or the file
+backend based on whether the application is sandboxed or not.")
+    (license license:expat)))
+
 (define-public rust-pango-0.20
   (package
     (name "rust-pango")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 22/23] gnu: Add rust-ashpd-0.6.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/crates-gtk.scm (rust-ashpd-0.6): New variable.

Change-Id: If7b758010fe8c729d7e3319869a8d9c518ade46f
---
 gnu/packages/crates-gtk.scm | 45 +++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index 2654b1501b..4dbb324701 100644
--- a/gnu/packages/crates-gtk.scm
+++ b/gnu/packages/crates-gtk.scm
@@ -43,6 +43,51 @@ (define-module (gnu packages crates-gtk)
 ;;; Please: Try to add new module packages in alphabetic order.
 ;;;
 
+(define-public rust-ashpd-0.6
+  (package
+    (name "rust-ashpd")
+    (version "0.6.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ashpd" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "109d7w6v0rnpy9lv4kmhwgh0sff0440s2vybj1k0ik4ib3d2xhja"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags '("--"
+                            ;; error[E0432]: unresolved import `ashpd::desktop::Color`
+                            "--skip=src/lib.rs - (line 21)")
+       #:cargo-inputs (("rust-async-fs" ,rust-async-fs-2)
+                       ("rust-async-net" ,rust-async-net-2)
+                       ("rust-async-trait" ,rust-async-trait-0.1)
+                       ("rust-enumflags2" ,rust-enumflags2-0.7)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gdk4-wayland" ,rust-gdk4-wayland-0.7)
+                       ("rust-gdk4-x11" ,rust-gdk4-x11-0.7)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-gtk4" ,rust-gtk4-0.7)
+                       ("rust-pipewire" ,rust-pipewire-0.7)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-raw-window-handle" ,rust-raw-window-handle-0.6)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-repr" ,rust-serde-repr-0.1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-wayland-backend" ,rust-wayland-backend-0.3)
+                       ("rust-wayland-client" ,rust-wayland-client-0.30)
+                       ("rust-wayland-protocols" ,rust-wayland-protocols-0.30)
+                       ("rust-zbus" ,rust-zbus-3))
+       #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/bilelmoussaoui/ashpd")
+    (synopsis "XDG portals wrapper in Rust using zbus")
+    (description
+     "This package provides XDG portals wrapper in Rust using zbus.")
+    (license license:expat)))
+
 (define-public rust-atk-sys-0.18
   (package
     (name "rust-atk-sys")
-- 
2.47.0

[bug#74234] [PATCH rust-team v3 23/23] gnu: Add gnome-authenticator.

[Aaron Covrig via Guix-patches via]

From: Giacomo Leidi <goodoldpaul@autistici.org>

* gnu/packages/rust-apps.scm (gnome-authenticator): New variable.

Change-Id: Ibf3e0a3558c7623abdf313f9c4393825cd04f1c8
---
 gnu/packages/rust-apps.scm | 256 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 255 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 92f133ca12..216d504030 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -32,6 +32,7 @@
 ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz>
 ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
 ;;; Copyright © 2024 Jordan Moore <lockbox@struct.foo>
+;;; Copyright © 2024 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -61,6 +62,7 @@ (define-module (gnu packages rust-apps)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages aidc)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages cmake)
@@ -80,10 +82,11 @@ (define-module (gnu packages rust-apps)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
-  #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages ibus)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
@@ -3929,6 +3932,257 @@ (define-public git-delta
 @command{grep} and a stylized box presentation.")
     (license license:expat)))
 
+(define-public gnome-authenticator
+  (package
+    (name "gnome-authenticator")
+    (version "4.4.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/World/Authenticator.git/")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0zavax35n048spx097ymiq31s8b879qwbg8xmcxcx73r6m823mic"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:install-source? #f
+      #:cargo-inputs `(("rust-aes-gcm" ,rust-aes-gcm-0.10)
+                       ("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-rust-argon2" ,rust-rust-argon2-2)
+                       ("rust-aperture" ,rust-aperture-0.3)
+                       ("rust-ashpd" ,rust-ashpd-0.6)
+                       ("rust-data-encoding" ,rust-data-encoding-2)
+                       ("rust-diesel" ,rust-diesel-2)
+                       ("rust-diesel-migrations" ,rust-diesel-migrations-2)
+                       ("rust-futures-channel" ,rust-futures-channel-0.3)
+                       ("rust-futures-executor" ,rust-futures-executor-0.3)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-gettext-rs" ,rust-gettext-rs-0.7)
+                       ("rust-gtk4" ,rust-gtk4-0.7)
+                       ("rust-hex" ,rust-hex-0.4)
+                       ("rust-image" ,rust-image-0.24)
+                       ("rust-libadwaita" ,rust-libadwaita-0.5)
+                       ("rust-oo7" ,rust-oo7-0.2)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2.1)
+                       ("rust-prost" ,rust-prost-0.12)
+                       ("rust-qrencode" ,rust-qrencode-0.14)
+                       ("rust-rand" ,rust-rand-0.8)
+                       ("rust-reqwest" ,rust-reqwest-0.11)
+                       ("rust-ring" ,rust-ring-0.17)
+                       ("rust-scrypt" ,rust-scrypt-0.11)
+                       ("rust-search-provider" ,rust-search-provider-0.6)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-serde-json" ,rust-serde-json-1)
+                       ("rust-svg-metadata" ,rust-svg-metadata-0.4)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tracing" ,rust-tracing-0.1)
+                       ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-uuid" ,rust-uuid-1)
+                       ("rust-zbar-rust" ,rust-zbar-rust-0.0)
+                       ("rust-zeroize" ,rust-zeroize-1))
+      #:imported-modules `(,@%glib-or-gtk-build-system-modules ,@%cargo-build-system-modules)
+      #:modules `((guix build cargo-build-system)
+                  ((guix build glib-or-gtk-build-system)
+                   #:prefix glib-or-gtk:)
+                  (guix build utils))
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'patch-in-files
+                     (lambda _
+                       (let ((bindir (string-append #$output "/bin"))
+                             (localedir (string-append "\""
+                                                       #$output
+                                                       "share/locale\""))
+                             (pkgdatadir (string-append "\""
+                                          #$output "/share/authenticator\"")))
+                         
+                         (substitute* "src/config.rs.in"
+                           (("@APP_ID@")
+                            "\"com.belmoussaoui.Authenticator\"")
+                           (("@PKGDATADIR@")
+                            pkgdatadir)
+                           (("@PROFILE@")
+                            "\"\"")
+                           (("@VERSION@")
+                            (string-append "\""
+                                           #$version "\""))
+                           (("@GETTEXT_PACKAGE@")
+                            "\"authenticator\"")
+                           (("@LOCALEDIR@")
+                            localedir)
+                           (("@OBJECT_PATH@")
+                            "\"/com/belmoussaoui/Authenticator/SearchProvider\""))
+                         (rename-file "src/config.rs.in" "src/config.rs")
+
+                         (substitute* "data/com.belmoussaoui.Authenticator.SearchProvider.service.in"
+                           (("@app-id@")
+                            "com.belmoussaoui.Authenticator")
+                           (("@bindir@")
+                            bindir)
+                           (("@name@")
+                            "authenticator"))
+                         (rename-file
+                          "data/com.belmoussaoui.Authenticator.SearchProvider.service.in"
+                          "data/com.belmoussaoui.Authenticator.SearchProvider.service")
+
+                         (substitute* "data/com.belmoussaoui.Authenticator.metainfo.xml.in.in"
+                           (("@app-id@")
+                            "com.belmoussaoui.Authenticator")
+                           (("@gettext-package@")
+                            "authenticator"))
+                         (rename-file
+                          "data/com.belmoussaoui.Authenticator.metainfo.xml.in.in"
+                          "data/com.belmoussaoui.Authenticator.metainfo.xml")
+
+                         (substitute* "data/com.belmoussaoui.Authenticator.desktop.in.in"
+                           (("@icon@")
+                            "com.belmoussaoui.Authenticator"))
+                         (rename-file
+                          "data/com.belmoussaoui.Authenticator.desktop.in.in"
+                          "data/com.belmoussaoui.Authenticator.desktop")
+
+                         (substitute* "data/com.belmoussaoui.Authenticator.gschema.xml.in"
+                           (("@app-id@")
+                            "com.belmoussaoui.Authenticator")
+                           (("@gettext-package@")
+                            "authenticator"))
+                         (rename-file
+                          "data/com.belmoussaoui.Authenticator.gschema.xml.in"
+                          "data/com.belmoussaoui.Authenticator.gschema.xml"))))
+                   (add-before 'build 'build-locales
+                     (lambda _
+                       (for-each (lambda (po-file)
+                                   (invoke "msgfmt" "-c" "-o"
+                                           (string-append (string-drop-right
+                                                           po-file 3) ".mo")
+                                           po-file))
+                                 (find-files "po" "\\.po"))))
+                   (add-before 'build-locales 'build-resources
+                     (lambda _
+                       (with-directory-excursion "data"
+                         (invoke "glib-compile-resources" "--generate"
+                                 "resources.gresource.xml"))))
+                   (add-before 'install 'install-extra
+                     (lambda* (#:key inputs outputs #:allow-other-keys)
+                       (let* ((out (assoc-ref outputs "out"))
+                              (here (getcwd))
+                              (source (assoc-ref inputs "source"))
+                              (share (string-append out "/share"))
+                              (hicolor (string-append share "/icons/hicolor")))
+                         (mkdir-p hicolor)
+                         (with-directory-excursion hicolor
+                           (mkdir-p "scalable/apps")
+                           (install-file (string-append source
+                                          "/data/icons/com.belmoussaoui.Authenticator.svg")
+                                         "scalable/apps")
+                           (mkdir-p "symbolic/apps")
+                           (install-file (string-append source
+                                          "/data/icons/com.belmoussaoui.Authenticator-symbolic.svg")
+                                         "symbolic/apps"))
+                         (with-directory-excursion share
+                           (mkdir-p "applications")
+                           (with-directory-excursion "applications"
+                             (install-file (string-append here
+                                            "/data/com.belmoussaoui.Authenticator.desktop")
+                                           "."))
+                           (mkdir-p "authenticator")
+                           (with-directory-excursion "authenticator"
+                             (copy-file (string-append here
+                                         "/data/resources.gresource")
+                                        "authenticator.gresource"))
+                           (mkdir-p "gnome-shell/search-providers")
+                           (with-directory-excursion "gnome-shell/search-providers"
+                             (install-file (string-append here
+                                            "/data/com.belmoussaoui.Authenticator.search-provider.ini")
+                                           "."))
+                           (mkdir-p "locale")
+                           (with-directory-excursion "locale"
+                             (for-each (lambda (mo-file)
+                                         (define mo-dir
+                                           (string-append (string-drop-right (basename
+                                                                              mo-file)
+                                                                             3)
+                                                          "/LC_MESSAGES"))
+                                         (mkdir-p mo-dir)
+                                         (copy-file mo-file
+                                                    (string-append mo-dir
+                                                     "/authenticator.mo")))
+                                       (find-files (string-append here "/po")
+                                                   "\\.mo")))
+                           (mkdir-p "metainfo")
+                           (with-directory-excursion "metainfo"
+                             (install-file (string-append here
+                                            "/data/com.belmoussaoui.Authenticator.metainfo.xml")
+                                           "."))
+                           (mkdir-p "glib-2.0/schemas")
+                           (with-directory-excursion "glib-2.0/schemas"
+                             (install-file (string-append here
+                                            "/data/com.belmoussaoui.Authenticator.gschema.xml")
+                                           "."))
+                           (mkdir-p "dbus-1/services")
+                           (with-directory-excursion "dbus-1/services"
+                             (install-file (string-append here
+                                            "/data/com.belmoussaoui.Authenticator.SearchProvider.service")
+                                           "."))))))
+                   (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
+                     (assoc-ref glib-or-gtk:%standard-phases
+                                'generate-gdk-pixbuf-loaders-cache-file))
+                   (add-after 'install 'glib-or-gtk-compile-schemas
+                     (assoc-ref glib-or-gtk:%standard-phases
+                                'glib-or-gtk-compile-schemas))
+                   (add-after 'install 'glib-or-gtk-wrap
+                     (assoc-ref glib-or-gtk:%standard-phases
+                                'glib-or-gtk-wrap))
+                   (add-after 'glib-or-gtk-wrap 'wrap-extra-paths
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let ((out (assoc-ref outputs "out"))
+                             (gst-plugins-path (getenv
+                                                "GST_PLUGIN_SYSTEM_PATH")))
+                         (for-each (lambda (prog)
+                                     (wrap-program (string-append out "/bin/"
+                                                                  prog)
+                                       `("GST_PLUGIN_SYSTEM_PATH" ":" suffix
+                                         (,gst-plugins-path))))
+                                   '("authenticator"))))))))
+    (native-inputs (list clang
+                         gnu-gettext
+                         `(,glib "bin") ;for glib-compile-schemas
+                         libxml2 ;for xmllint
+                         pkg-config))
+    (inputs (list glib
+                  gstreamer
+                  gst-plugins-base
+                  gst-plugins-bad
+                  gtk
+                  libadwaita
+                  openssl
+                  pango
+                  sqlite
+                  zbar))
+    (home-page "https://apps.gnome.org/Authenticator")
+    (synopsis "Generate two-factor codes")
+    (description
+     "Simple application for generating Two-Factor Authentication
+Codes:
+
+It features:
+
+@itemize
+@item Time-based/Counter-based/Steam methods support
+@item SHA-1/SHA-256/SHA-512 algorithms support
+@item QR code scanner using a camera or from a screenshot
+@item Lock the application with a password
+@item Beautiful UI
+@item GNOME Shell search provider
+@item Backup/Restore from/into known applications like FreeOTP+,
+Aegis (encrypted / plain-text), andOTP, Google Authenticator
+@end itemize")
+    (license license:gpl3+)))
+
+
 (define-public rust-xremap
   (package
     (name "rust-xremap")
-- 
2.47.0