Merge branch 'rust-team'

Change-Id: I412341ad7a8bb84c7fafeb69dea8182eade68d2f

gnu/local.mk

@@ -2059,6 +2059,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch	\
   %D%/packages/patches/rust-ndarray-0.14-remove-blas-src.patch	\
   %D%/packages/patches/rust-nettle-disable-vendor.patch		 \
+  %D%/packages/patches/rust-poem-1-fewer-deps.patch		\
   %D%/packages/patches/rust-rspec-1-remove-clippy.patch	\
   %D%/packages/patches/rust-trash-2-update-windows.patch	\
   %D%/packages/patches/rust-webbrowser-remove-unsupported-os.patch	\

gnu/packages/crates-apple.scm

@@ -143,14 +143,14 @@ extension of blocks.")
 (define-public rust-cargo-credential-macos-keychain-0.4
   (package
     (name "rust-cargo-credential-macos-keychain")
-    (version "0.4.1")
+    (version "0.4.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "cargo-credential-macos-keychain" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1df098axn8pab6l2mljbkxg3bw1v4mcr4k42x6xy6j15854nsz70"))))
+        (base32 "1ls1ak7xmjw5h04h1sqxz8fyiq7w6xva5kavfkrs7rgplgh0049n"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-cargo-credential" ,rust-cargo-credential-0.4)

gnu/packages/crates-graphics.scm

@@ -292,8 +292,33 @@ styles (bold, underline).")
     (description "This package provides FFI bindings to aom.")
     (license license:expat)))
 
+(define-public rust-ascii-canvas-3
+  (package
+    (name "rust-ascii-canvas")
+    (version "3.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "ascii-canvas" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1in38ziqn4kh9sw89ys4naaqzvvjscfs0m4djqbfq7455v5fq948"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-term" ,rust-term-0.7))
+       #:cargo-development-inputs (("rust-diff" ,rust-diff-0.1))))
+    (home-page "https://github.com/nikomatsakis/ascii-canvas")
+    (synopsis "Simple canvas for drawing lines and styled text and emitting to
+the terminal")
+    (description "@code{ASCII} canvas is a simple Rust library that allows you
+to draw lines and colored text and then write them to the terminal.  It uses
+the term library to handle the ANSI nonsense and hence it works on Windows,
+Mac, and Unix.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-ascii-canvas-2
   (package
+    (inherit rust-ascii-canvas-3)
     (name "rust-ascii-canvas")
     (version "2.0.0")
     (source
@@ -303,19 +328,9 @@ styles (bold, underline).")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0a9s8vrbc5jr6ry5ygjyfqmbs9gyya1v6dsxzsczpai8z4nvg3pz"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t  ;; TODO: failes due to an unresolved import
-       #:cargo-inputs
+       #:cargo-inputs (("rust-term" ,rust-term-0.5))))))
-       (("rust-term" ,rust-term-0.5))))
-    (home-page "https://github.com/nikomatsakis/ascii-canvas")
-    (synopsis "Simple canvas for drawing lines and styled text and emitting to
-the terminal")
-    (description "@code{ASCII} canvas is a simple Rust library that allows you
-to draw lines and colored text and then write them to the terminal.  It uses
-the term library to handle the ANSI nonsense and hence it works on Windows,
-Mac, and Unix.")
-    (license (list license:asl2.0 license:expat))))
 
 (define-public rust-ash-0.37
   (package
@@ -973,6 +988,25 @@ and iOS.")
      "This package provides a library to perform image color model conversion.")
     (license license:expat-0)))
 
+(define-public rust-deltae-0.3
+  (package
+    (name "rust-deltae")
+    (version "0.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "deltae" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1d3hw9hpvicl9x0x34jr2ybjk5g5ym1lhbyz6zj31110gq8zaaap"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-development-inputs (("rust-clap" ,rust-clap-4))))
+    (home-page "https://gitlab.com/ryanobeirne/deltae")
+    (synopsis "Calculate delta-e between two colors")
+    (description "Calculate Delta E between two colors in CIE Lab space.")
+    (license license:expat)))
+
 (define-public rust-drm-0.10
   (package
     (name "rust-drm")
@@ -1585,14 +1619,14 @@ EUI-64, also known as MAC-48 media access control addresses.")
   (package
     (inherit rust-glutin-0.31)
     (name "rust-glutin")
-    (version "0.30.7")
+    (version "0.30.10")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "glutin" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "05gzw9icj4s0p9db9srnwrd3m3plcs7260jlblyy2pbiqygap6zq"))))
+        (base32 "1zk0cxchdy6fmnnwggylgg748wbk04mys9pv76nvh6974h1kpjcg"))))
     (arguments
      `(#:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
@@ -1600,7 +1634,7 @@ EUI-64, also known as MAC-48 media access control addresses.")
         ("rust-cgl" ,rust-cgl-0.3)
         ("rust-core-foundation" ,rust-core-foundation-0.9)
         ("rust-dispatch" ,rust-dispatch-0.2)
-        ("rust-glutin-egl-sys" ,rust-glutin-egl-sys-0.4)
+        ("rust-glutin-egl-sys" ,rust-glutin-egl-sys-0.5)
         ("rust-glutin-glx-sys" ,rust-glutin-glx-sys-0.4)
         ("rust-glutin-wgl-sys" ,rust-glutin-wgl-sys-0.4)
         ("rust-libloading" ,rust-libloading-0.7)
@@ -1611,6 +1645,40 @@ EUI-64, also known as MAC-48 media access control addresses.")
         ("rust-windows-sys" ,rust-windows-sys-0.45)
         ("rust-x11-dl" ,rust-x11-dl-2))))))
 
+(define-public rust-glutin-0.29
+  (package
+    (inherit rust-glutin-0.31)
+    (name "rust-glutin")
+    (version "0.29.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "glutin" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "04y7s5m74j9gns5bdja0alkm0m0b727vf9k7rw6g5jpxjk99lk24"))))
+    (arguments
+     `(#:cargo-inputs (("rust-cgl" ,rust-cgl-0.3)
+                       ("rust-cocoa" ,rust-cocoa-0.24)
+                       ("rust-core-foundation" ,rust-core-foundation-0.9)
+                       ("rust-glutin-egl-sys" ,rust-glutin-egl-sys-0.1)
+                       ("rust-glutin-gles2-sys" ,rust-glutin-gles2-sys-0.1)
+                       ("rust-glutin-glx-sys" ,rust-glutin-glx-sys-0.1)
+                       ("rust-glutin-wgl-sys" ,rust-glutin-wgl-sys-0.1)
+                       ("rust-libloading" ,rust-libloading-0.7)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-objc" ,rust-objc-0.2)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-osmesa-sys" ,rust-osmesa-sys-0.1)
+                       ("rust-parking-lot" ,rust-parking-lot-0.12)
+                       ("rust-raw-window-handle" ,rust-raw-window-handle-0.5)
+                       ("rust-wayland-client" ,rust-wayland-client-0.29)
+                       ("rust-wayland-egl" ,rust-wayland-egl-0.29)
+                       ("rust-winapi" ,rust-winapi-0.3)
+                       ("rust-winit" ,rust-winit-0.27))))
+    (native-inputs (list pkg-config))
+    (inputs (list expat fontconfig freetype))))
+
 (define-public rust-glutin-0.28
   (package
     (inherit rust-glutin-0.30)
@@ -1734,6 +1802,22 @@ EUI-64, also known as MAC-48 media access control addresses.")
     (description "The egl bindings for glutin.")
     (license license:asl2.0)))
 
+(define-public rust-glutin-egl-sys-0.5
+  (package
+    (inherit rust-glutin-egl-sys-0.6)
+    (name "rust-glutin-egl-sys")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "glutin_egl_sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1iapzqscy4891crxdddddq4qqqday1sf0s0j762yqs2sdjr4wy5g"))))
+    (arguments
+     `(#:cargo-inputs (("rust-gl-generator" ,rust-gl-generator-0.14)
+                       ("rust-windows-sys" ,rust-windows-sys-0.45))))))
+
 (define-public rust-glutin-egl-sys-0.4
   (package
     (inherit rust-glutin-egl-sys-0.6)
@@ -1851,17 +1935,16 @@ EUI-64, also known as MAC-48 media access control addresses.")
   (package
     (inherit rust-glutin-glx-sys-0.4)
     (name "rust-glutin-glx-sys")
-    (version "0.1.7")
+    (version "0.1.8")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "glutin_glx_sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0l8kk60kq5v6hl1qr6ym2arzvbsgkh71aa8485cp901bq27kqfby"))))
+        (base32 "0s14s3v2dddkx141w2x65s8ik54mrn432hisbc65i62hhrshagfr"))))
     (arguments
-     `(#:skip-build? #t
+     `(#:cargo-inputs
-       #:cargo-inputs
        (("rust-gl-generator" ,rust-gl-generator-0.14)
         ("rust-x11-dl" ,rust-x11-dl-2))))))
 
@@ -2189,14 +2272,14 @@ filters and decoders for the most common image formats.")
 (define-public rust-imgref-1
   (package
     (name "rust-imgref")
-    (version "1.9.4")
+    (version "1.10.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "imgref" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0b3czpz206z4nvpq7yq0v58bwjmqjwjmkr302hbzpp4523glkkxj"))))
+        (base32 "09l18s80crfn7g8ank3v44g43xns4pg7f6hpaz3sfna1bwsxmzj4"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/kornelski/imgref")
     (synopsis "2D slice of a @code{Vec}")
@@ -2256,7 +2339,7 @@ pixel buffers with width, height and stride.")
         ("rust-rayon" ,rust-rayon-1))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
-        ("rust-png" ,rust-png-0.14)
+        ("rust-png" ,rust-png-0.16)
         ("rust-walkdir" ,rust-walkdir-2))))))
 
 (define-public rust-keyframe-1
@@ -2545,14 +2628,19 @@ graphics and video games.")
 (define-public rust-palette-0.7
   (package
     (name "rust-palette")
-    (version "0.7.3")
+    (version "0.7.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "palette" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1p2inf23vsqy06w7vp7rcxmb9vk91asib534m9cafykn8x0z7qmj"))))
+        (base32 "0ynr6q7629gpw6pg8w1wrsl31sq48nxh1bg4awyrhhk6nyj27z7b"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* "Cargo.toml"
+                  (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                   (string-append "\"^" version)))))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; Regression tests not included.
@@ -2567,17 +2655,10 @@ graphics and video games.")
         ("rust-serde" ,rust-serde-1)
         ("rust-wide" ,rust-wide-0.7))
        #:cargo-development-inputs
-       (("rust-clap" ,rust-clap-3)
+       (("rust-enterpolation" ,rust-enterpolation-0.2)
-        ("rust-criterion" ,rust-criterion-0.4)
-        ("rust-csv" ,rust-csv-1)
-        ("rust-enterpolation" ,rust-enterpolation-0.2)
         ("rust-image" ,rust-image-0.23)
-        ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-rand-mt" ,rust-rand-mt-4)
         ("rust-ron" ,rust-ron-0.8)
-        ("rust-scad" ,rust-scad-1)
-        ("rust-serde" ,rust-serde-1)
-        ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-json" ,rust-serde-json-1))))
     (home-page "https://github.com/Ogeon/palette")
     (synopsis "Convert and manage colors")
@@ -2621,14 +2702,14 @@ on correctness, flexibility and ease of use.")
 (define-public rust-palette-derive-0.7
   (package
     (name "rust-palette-derive")
-    (version "0.7.3")
+    (version "0.7.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "palette_derive" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "02ps239sxcr5v294qf89d87sv7fdm9pr2cziwj2l6ggzql703nxp"))))
+        (base32 "0vcxjslri6f24zgv3n6ixhzb21a8z23fa6h42s8ss2zcvc10g2g8"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-find-crate" ,rust-find-crate-0.6)
@@ -2906,29 +2987,44 @@ interactive applications.")
 (define-public rust-png-0.17
   (package
     (name "rust-png")
-    (version "0.17.7")
+    (version "0.17.13")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "png" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0f66slx641p7an277xskz8vq7syy9cmhsx1qwnfb268ahspqww2x"))))
+        (base32 "1qdmajjzkdbmk5zk7qb5pc6927xa26hr2v68hbkpa9ris79v1r06"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:tests? #false                  ;XXX missing files in tarball
+     `(#:cargo-test-flags
+       '("--release" "--"
+         ;; Not all files incuded.
+         "--skip=decoder::stream::tests::image_gamma"
+         "--skip=decoder::stream::tests::image_source_chromaticities"
+         "--skip=decoder::stream::tests::test_two_iccp_chunks"
+         "--skip=encoder::tests::image_palette"
+         "--skip=src/decoder/mod.rs - decoder::Decoder<R>::set_ignore_text_chunk (line 269)"
+         "--skip=src/decoder/mod.rs - decoder::Decoder<R>::set_limits (line 182)"
+         "--skip=src/lib.rs - (line 13)"
+         "--skip=src/text_metadata.rs - text_metadata (line 25)")
        #:cargo-inputs
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-crc32fast" ,rust-crc32fast-1)
-        ("rust-deflate" ,rust-deflate-1)
+        ("rust-fdeflate" ,rust-fdeflate-0.3)
-        ("rust-miniz-oxide" ,rust-miniz-oxide-0.6))
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-miniz-oxide" ,rust-miniz-oxide-0.7))
        #:cargo-development-inputs
-       (("rust-criterion" ,rust-criterion-0.3)
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-clap" ,rust-clap-3)
+        ("rust-criterion" ,rust-criterion-0.4)
         ("rust-getopts" ,rust-getopts-0.2)
-        ("rust-glium" ,rust-glium-0.31)
+        ("rust-glium" ,rust-glium-0.32)
         ("rust-glob" ,rust-glob-0.3)
         ("rust-rand" ,rust-rand-0.8)
         ("rust-term" ,rust-term-0.7))))
+    (native-inputs (list pkg-config))
+    (inputs (list expat fontconfig freetype))
     (home-page "https://github.com/image-rs/image-png")
     (synopsis "PNG decoding and encoding library in pure Rust")
     (description
@@ -3070,17 +3166,23 @@ interactive applications.")
 (define-public rust-ravif-0.11
   (package
     (name "rust-ravif")
-    (version "0.11.3")
+    (version "0.11.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "ravif" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1vhn2p31z31c01j6i28slgbi01wq1hmyqjidwfkqy430hh16kp5s"))))
+        (base32 "1315abwxldavjxdl8dphab16fh8akw000hn406dbjnsi53b4kgl5"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* "Cargo.toml"
+                  (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                   (string-append "\"^" version)))))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-avif-serialize" ,rust-avif-serialize-0.8)
+                       ("rust-bitstream-io" ,rust-bitstream-io-2)
                        ("rust-imgref" ,rust-imgref-1)
                        ("rust-loop9" ,rust-loop9-0.1)
                        ("rust-quick-error" ,rust-quick-error-2)
@@ -3111,7 +3213,8 @@ in AVIF format (powers the @code{cavif} tool).")
               (sha256
                (base32 "1r3s78781kb9lwysdvpdc80gavly33dcs4inhhp2dawml9g3rjss"))))
     (arguments
-     `(#:cargo-inputs
+     `(#:skip-build? #t     ; Needs rav1e-0.6
+       #:cargo-inputs
        (("rust-avif-serialize" ,rust-avif-serialize-0.7)
         ("rust-imgref" ,rust-imgref-1)
         ("rust-loop9" ,rust-loop9-0.1)
@@ -3283,7 +3386,7 @@ in AVIF format (powers the @code{cavif} tool).")
 (define-public rust-rgb-0.8
   (package
     (name "rust-rgb")
-    (version "0.8.36")
+    (version "0.8.37")
     (source
      (origin
        (method url-fetch)
@@ -3291,7 +3394,7 @@ in AVIF format (powers the @code{cavif} tool).")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0ncgzkgifbyfx7vpnygfl4mgpdhhbaywxybx6pnjraf77wz2vv10"))))
+         "1n275hng7hmnzjavmdf24vqd86nm6bkg80nhr4zmgzb49c0aiah5"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -3848,22 +3951,22 @@ applications.")
 (define-public rust-wayland-backend-0.3
   (package
     (name "rust-wayland-backend")
-    (version "0.3.2")
+    (version "0.3.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-backend" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1r7vz56z6ixfbljraxl4q59g43jfb6i9qkaksi704pzlfgfjs58r"))))
+        (base32 "0h4s8nfrl1q8xys1409lfwkb70cdh81c0pvzr1s69mwhrrhzll4x"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; use of undeclared crate or module `wayland_scanner`
        #:cargo-inputs (("rust-cc" ,rust-cc-1)
                        ("rust-downcast-rs" ,rust-downcast-rs-1)
                        ("rust-log" ,rust-log-0.4)
-                       ("rust-nix" ,rust-nix-0.26)
                        ("rust-raw-window-handle" ,rust-raw-window-handle-0.5)
+                       ("rust-rustix" ,rust-rustix-0.38)
                        ("rust-scoped-tls" ,rust-scoped-tls-1)
                        ("rust-smallvec" ,rust-smallvec-1)
                        ("rust-wayland-sys" ,rust-wayland-sys-0.31))
@@ -3906,20 +4009,20 @@ protocol.")
 (define-public rust-wayland-client-0.31
   (package
     (name "rust-wayland-client")
-    (version "0.31.1")
+    (version "0.31.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-client" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1lryhibzmi4hb3jpbraj623l110f6rgp0migpxrm8vrl8wixb9qw"))))
+        (base32 "07rzml07li3bi4nnqx4i2rfj3xkifzxp1d6cd1kflb2wjgp9dyw2"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; use of undeclared crate or module `wayland_protocols`
        #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
                        ("rust-log" ,rust-log-0.4)
-                       ("rust-nix" ,rust-nix-0.26)
+                       ("rust-rustix" ,rust-rustix-0.38)
                        ("rust-wayland-backend" ,rust-wayland-backend-0.3)
                        ("rust-wayland-scanner" ,rust-wayland-scanner-0.31))
        #:cargo-development-inputs (("rust-futures-channel" ,rust-futures-channel-0.3)
@@ -4181,17 +4284,17 @@ and wayland-server.")
 (define-public rust-wayland-cursor-0.31
   (package
     (name "rust-wayland-cursor")
-    (version "0.31.0")
+    (version "0.31.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-cursor" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0nxdyyg3a3649n316fbnm8rak5k90j580kfnfxn9src6x45a4jm4"))))
+        (base32 "1fii68l6x235b867q96yx1xqkl16azkf5i841ldd24yxd2l5zkki"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:cargo-inputs (("rust-nix" ,rust-nix-0.26)
+     `(#:cargo-inputs (("rust-rustix" ,rust-rustix-0.38)
                        ("rust-wayland-client" ,rust-wayland-client-0.31)
                        ("rust-xcursor" ,rust-xcursor-0.3))))
     (home-page "https://github.com/smithay/wayland-rs")
@@ -4286,14 +4389,14 @@ initializing an OpenGL or Vulkan context.")
 (define-public rust-wayland-protocols-0.31
   (package
     (name "rust-wayland-protocols")
-    (version "0.31.0")
+    (version "0.31.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-protocols" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "077257bxv21whi33wm0lz5jkq6jnx0spz5jkq8yr44x9gc8dflz2"))))
+        (base32 "1x310l1p6p3p3l76nl1l2yava9408dy77s605917zadlp1jz70cg"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
@@ -4490,14 +4593,14 @@ protocol extensions.")
 (define-public rust-wayland-scanner-0.31
   (package
     (name "rust-wayland-scanner")
-    (version "0.31.0")
+    (version "0.31.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-scanner" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1760n887j18lzd1ni087q7jzsmpcf7ny3dq2698zkjb56r02i3pv"))))
+        (base32 "10y2nq076x4zml8wc5bw75560rwvrsfpi35mdyc02w1854lsdcv3"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-test-flags '("--release" "--"
@@ -4505,7 +4608,7 @@ protocol extensions.")
                             "--skip=interfaces::tests::interface_gen"
                             "--skip=server_gen::tests::server_gen")
        #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
-                       ("rust-quick-xml" ,rust-quick-xml-0.30)
+                       ("rust-quick-xml" ,rust-quick-xml-0.31)
                        ("rust-quote" ,rust-quote-1))
        #:cargo-development-inputs (("rust-similar" ,rust-similar-2))))
     (home-page "https://github.com/smithay/wayland-rs")
@@ -4613,21 +4716,21 @@ wayland-client crate for usable bindings.")
 (define-public rust-wayland-server-0.31
   (package
     (name "rust-wayland-server")
-    (version "0.31.0")
+    (version "0.31.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-server" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1kmiii32hi7h3r9q923q628rrbglkjkg362c32hnr4s5li90qgrz"))))
+        (base32 "1dzxfabykj156abnbx2i8j8gvmgb9yys9mfj9sx29g45qbay9rh0"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
                        ("rust-downcast-rs" ,rust-downcast-rs-1)
                        ("rust-io-lifetimes" ,rust-io-lifetimes-2)
                        ("rust-log" ,rust-log-0.4)
-                       ("rust-nix" ,rust-nix-0.26)
+                       ("rust-rustix" ,rust-rustix-0.38)
                        ("rust-wayland-backend" ,rust-wayland-backend-0.3)
                        ("rust-wayland-scanner" ,rust-wayland-scanner-0.31))))
     (home-page "https://github.com/smithay/wayland-rs")

gnu/packages/crates-gtk.scm

@@ -3054,8 +3054,37 @@ library.")
        (("rust-shell-words" ,rust-shell-words-0.1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-pangocairo-0.18
+  (package
+    (name "rust-pangocairo")
+    (version "0.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pangocairo" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "199qdgw5mf1vbqmslscy1qzz0szw2dcd21p6z61wzjngm64na0sp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.18)
+                       ("rust-glib" ,rust-glib-0.18)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango" ,rust-pango-0.18)
+                       ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.18))
+       #:cargo-development-inputs
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+    (native-inputs (list pkg-config))
+    (inputs (list pango))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "Rust bindings for the PangoCairo library")
+    (description
+     "This package provides Rust bindings for the @code{PangoCairo} library.")
+    (license license:expat)))
+
 (define-public rust-pangocairo-0.17
   (package
+    (inherit rust-pangocairo-0.18)
     (name "rust-pangocairo")
     (version "0.17.10")
     (source
@@ -3065,7 +3094,6 @@ library.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1kr2b31034b8zif4r3lf4rniqphk2bxi2q7n8iwq2wrf3k5jkgw6"))))
-    (build-system cargo-build-system)
     (arguments
      `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display`
        #:tests? #f
@@ -3077,16 +3105,7 @@ library.")
         ("rust-pango" ,rust-pango-0.17)
         ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.17))
        #:cargo-development-inputs
-       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))
+       (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list pango))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "Rust bindings for the PangoCairo library")
-    (description
-     "This package provides Rust bindings for the @code{PangoCairo} library.")
-    (license license:expat)))
 
 (define-public rust-pangocairo-0.15
   (package
@@ -3114,8 +3133,38 @@ library.")
        #:cargo-development-inputs
        (("rust-gir-format-check" ,rust-gir-format-check-0.1))))))
 
+(define-public rust-pangocairo-sys-0.18
+  (package
+    (name "rust-pangocairo-sys")
+    (version "0.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "pangocairo-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0cw82261ixgr9xw549rx11w74h0wz4lw0pqxxir7lzm3fvv8yg7w"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.18)
+                       ("rust-glib-sys" ,rust-glib-sys-0.18)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-pango-sys" ,rust-pango-sys-0.18)
+                       ("rust-system-deps" ,rust-system-deps-6))
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (native-inputs (list pkg-config))
+    (inputs
+     ;; XXX: Should these be propagated from their respective crates?
+     (list cairo glib pango))
+    (home-page "https://gtk-rs.org/")
+    (synopsis "FFI bindings to libgtk-3")
+    (description "This package provides FFI bindings to @code{PangoCairo}.")
+    (license license:expat)))
+
 (define-public rust-pangocairo-sys-0.17
   (package
+    (inherit rust-pangocairo-sys-0.18)
     (name "rust-pangocairo-sys")
     (version "0.17.10")
     (source
@@ -3125,7 +3174,6 @@ library.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0ymr4aqrdpysz0rh383s4h6hj8nbkyj7n4723f45zzzqkf6x7pwl"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.17)
@@ -3133,18 +3181,8 @@ library.")
         ("rust-libc" ,rust-libc-0.2)
         ("rust-pango-sys" ,rust-pango-sys-0.17)
         ("rust-system-deps" ,rust-system-deps-6))
-       #:cargo-development-inputs
+       #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1)
-       (("rust-shell-words" ,rust-shell-words-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
-        ("rust-tempfile" ,rust-tempfile-3))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     ;; XXX: Should these be propagated from their respective crates?
-     (list cairo glib pango))
-    (home-page "https://gtk-rs.org/")
-    (synopsis "FFI bindings to libgtk-3")
-    (description "This package provides FFI bindings to @code{PangoCairo}.")
-    (license license:expat)))
 
 (define-public rust-pangocairo-sys-0.15
   (package

gnu/packages/crates-tls.scm

@@ -3,7 +3,7 @@
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
 ;;; Copyright © 2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020, 2021, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
 ;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
@@ -424,18 +424,19 @@ Google @code{BoringSSL} project and the @code{OpenSSL} project.")
 (define-public rust-der-0.7
   (package
     (name "rust-der")
-    (version "0.7.5")
+    (version "0.7.8")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "der" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "06f2clallhpjc51s3dc7mpcw5ms3jak727qc5yrfg3ncrpzqvr85"))))
+                "070bwiyr80800h31c5zd96ckkgagfjgnrrdmz3dzg2lccsd3dypz"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-arbitrary" ,rust-arbitrary-1)
+        ("rust-bytes" ,rust-bytes-1)
         ("rust-const-oid" ,rust-const-oid-0.9)
         ("rust-der-derive" ,rust-der-derive-0.7)
         ("rust-flagset" ,rust-flagset-0.4)
@@ -523,14 +524,14 @@ targets")
 (define-public rust-der-derive-0.7
   (package
     (name "rust-der-derive")
-    (version "0.7.1")
+    (version "0.7.2")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "der_derive" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0cmyza28s52wfb67ymydjmvsc4m3sfp98dv9vprx6ibmdfx94iqi"))))
+                "0jg0y3k46bpygwc5cqha07axz5sdnsx5116g3nxf0rwrabj7rs2z"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -1451,18 +1452,22 @@ PEM-encodings commonly used to store keys and certificates at rest.")
 (define-public rust-rustls-pki-types-1
   (package
     (name "rust-rustls-pki-types")
-    (version "1.0.1")
+    (version "1.7.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rustls-pki-types" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "16rkx6gn5l2zximxy8fx9h2vzks1hfxi5z5cd9y97r0fl853wrz7"))))
+        (base32 "0banlc9xzwqrx8n0h4bd0igmq3z5hc72rn941lf22cp3gkkraqlp"))))
     (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-web-time" ,rust-web-time-1))))
     (home-page "https://github.com/rustls/pki-types")
     (synopsis "Shared types for the rustls PKI ecosystem")
-    (description "Shared types for the rustls PKI ecosystem.")
+    (description
+     "This crate provides shared types for the rustls PKI ecosystem.")
     (license (list license:expat license:asl2.0))))
 
 (define-public rust-rustls-webpki-0.102
@@ -1578,6 +1583,42 @@ PEM-encodings commonly used to store keys and certificates at rest.")
     (description "This package provides a Rust parser for the TLS protocol.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-x509-cert-0.2
+  (package
+    (name "rust-x509-cert")
+    (version "0.2.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "x509-cert" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "155f42vm6m7phn8w7s2wmk9vli3ws45dqpk5z3jilw0a04syj08k"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1)
+                       ("rust-const-oid" ,rust-const-oid-0.9)
+                       ("rust-der" ,rust-der-0.7)
+                       ("rust-sha1" ,rust-sha1-0.10)
+                       ("rust-signature" ,rust-signature-2)
+                       ("rust-spki" ,rust-spki-0.7)
+                       ("rust-tls-codec" ,rust-tls-codec-0.4))
+       #:cargo-development-inputs
+       (("rust-ecdsa" ,rust-ecdsa-0.16)
+        ("rust-hex-literal" ,rust-hex-literal-0.4)
+        ("rust-p256" ,rust-p256-0.13)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rsa" ,rust-rsa-0.9)
+        ("rust-rstest" ,rust-rstest-0.18)
+        ("rust-sha2" ,rust-sha2-0.10)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/RustCrypto/formats/tree/master/x509-cert")
+    (synopsis "X.509 Public Key Infrastructure Certificate format in Rust")
+    (description
+     "This package provides a pure Rust implementation of the X.509
+Public Key Infrastructure Certificate format as described in RFC 5280.")
+    (license (list license:asl2.0 license:expat))))
+
 (define-public rust-x509-parser-0.15
   (package
     (name "rust-x509-parser")

gnu/packages/crates-windows.scm

@@ -101,18 +101,18 @@
 (define-public rust-cargo-credential-wincred-0.4
   (package
     (name "rust-cargo-credential-wincred")
-    (version "0.4.1")
+    (version "0.4.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "cargo-credential-wincred" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1d3h1y0f42xv2sjvn2bmyib4pdimpxjmsi17npx0bd6wlsn568xs"))))
+        (base32 "0bb9yczmk3ral2r20v5c4jzf3l9qp0nmm11i20s0w5inprp9b228"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-cargo-credential" ,rust-cargo-credential-0.4)
-                       ("rust-windows-sys" ,rust-windows-sys-0.48))))
+                       ("rust-windows-sys" ,rust-windows-sys-0.52))))
     (home-page "https://github.com/rust-lang/cargo")
     (synopsis
      "Cargo credential process that stores tokens with Windows Credential Manager")
@@ -138,8 +138,31 @@ Windows Credential Manager.")
        (("rust-cargo-credential" ,rust-cargo-credential-0.3)
         ("rust-windows-sys" ,rust-windows-sys-0.48))))))
 
+(define-public rust-clipboard-win-5
+  (package
+    (name "rust-clipboard-win")
+    (version "5.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "clipboard-win" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15x28184cw6r8hx30farqvcir0kz151dfbfms4avl9q11rqa1y8j"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f  ; unresolved import `clipboard_win::raw`
+       #:cargo-inputs (("rust-error-code" ,rust-error-code-3)
+                       ("rust-windows-win" ,rust-windows-win-3))))
+    (home-page "https://github.com/DoumanAsh/clipboard-win")
+    (synopsis "Simple way to interact with Windows clipboard")
+    (description
+     "This package provides simple way to interact with Windows clipboard.")
+    (license license:boost1.0)))
+
 (define-public rust-clipboard-win-4
   (package
+    (inherit rust-clipboard-win-5)
     (name "rust-clipboard-win")
     (version "4.5.0")
     (source
@@ -149,18 +172,12 @@ Windows Credential Manager.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0qh3rypkf1lazniq4nr04hxsck0d55rigb5sjvpvgnap4dyc54bi"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f  ; unresolved import `clipboard_win::raw`
        #:cargo-inputs
        (("rust-error-code" ,rust-error-code-2)
         ("rust-str-buf" ,rust-str-buf-1)
-        ("rust-winapi" ,rust-winapi-0.3))))
+        ("rust-winapi" ,rust-winapi-0.3))))))
-    (home-page "https://github.com/DoumanAsh/clipboard-win")
-    (synopsis "Simple way to interact with Windows clipboard")
-    (description
-     "This package provides simple way to interact with Windows clipboard.")
-    (license license:boost1.0)))
 
 (define-public rust-clipboard-win-3
   (package
@@ -719,14 +736,14 @@ See winapi for types and constants.")
 (define-public rust-win-crypto-ng-0.5
   (package
     (name "rust-win-crypto-ng")
-    (version "0.5.0")
+    (version "0.5.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "win-crypto-ng" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0faf5bd4d5kaf642yw91lh0n2bfwnz0l70bm85ysmj3dsj4hg9mf"))))
+                "14mv2wsvji8x7ds72zsjpz6hdq57y4r8r38xjyr4mrbib91zpawr"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t     ; Windows library
@@ -941,8 +958,44 @@ color in a Windows console.")
        #:cargo-inputs
        (("rust-winapi" ,rust-winapi-0.3))))))
 
+(define-public rust-winreg-0.52
+  (package
+    (name "rust-winreg")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "winreg" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19gh9vp7mp1ab84kc3ag48nm9y7xgjhh3xa4vxss1gylk1rsaxx2"))
+       (snippet
+        #~(begin (use-modules (guix build utils))
+                 (substitute* "Cargo.toml"
+                   (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                    (string-append "\"^" version)))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t ; OS not supported
+       #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-windows-sys" ,rust-windows-sys-0.48))
+       #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3)
+                                   ("rust-serde-transcode" ,rust-serde-transcode-1)
+                                   ("rust-serde-bytes" ,rust-serde-bytes-0.11)
+                                   ("rust-serde-derive" ,rust-serde-derive-1)
+                                   ("rust-serde-json" ,rust-serde-json-1)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
+    (home-page "https://github.com/gentoo90/winreg-rs")
+    (synopsis "Rust bindings to the MS Windows Registry API")
+    (description
+     "This package provides Rust bindings to MS Windows Registry API.")
+    (license license:expat)))
+
 (define-public rust-winreg-0.51
   (package
+    (inherit rust-winreg-0.52)
     (name "rust-winreg")
     (version "0.51.0")
     (source
@@ -967,12 +1020,7 @@ color in a Windows console.")
        #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3)
                                    ("rust-serde-bytes" ,rust-serde-bytes-0.11)
                                    ("rust-serde-derive" ,rust-serde-derive-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
-    (home-page "https://github.com/gentoo90/winreg-rs")
-    (synopsis "Rust bindings to the MS Windows Registry API")
-    (description
-     "This package provides Rust bindings to MS Windows Registry API.")
-    (license license:expat)))
 
 (define-public rust-winreg-0.50
   (package
@@ -1134,6 +1182,29 @@ color in a Windows console.")
 icons to windows executables and dynamic libraries.")
     (license license:expat)))
 
+(define-public rust-winresource-0.1
+  (package
+    (name "rust-winresource")
+    (version "0.1.17")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "winresource" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0aakwh8llq2zvm7qihkrg7sz50hzccyl4x831j60g4psijpsmqkp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; failed to resolve: could not find `um` in `winapi`
+       #:cargo-inputs (("rust-toml" ,rust-toml-0.7)
+                       ("rust-version-check" ,rust-version-check-0.9))
+       #:cargo-development-inputs (("rust-winapi" ,rust-winapi-0.3))))
+    (home-page "https://github.com/BenjaminRi/winresource")
+    (synopsis "Create and set windows icons and metadata for executables")
+    (description "This package provides functions to create and set windows
+icons and metadata for executables.")
+    (license license:expat)))
+
 (define-public rust-winutil-0.1
   (package
     (name "rust-winutil")
@@ -1238,8 +1309,34 @@ for Rust.")
      "Contains function definitions for the Windows API library ws2_32.")
     (license license:expat)))
 
+(define-public rust-windows-0.52
+  (package
+    (name "rust-windows")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1gnh210qjlprpd1szaq04rjm1zqgdm9j7l9absg0kawi2rwm72p4"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-windows-core" ,rust-windows-core-0.52)
+                       ("rust-windows-implement" ,rust-windows-implement-0.52)
+                       ("rust-windows-interface" ,rust-windows-interface-0.52)
+                       ("rust-windows-targets" ,rust-windows-targets-0.52))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Rust for Windows")
+    (description "The windows crate lets you call any Windows API past,
+present, and future using code generated on the fly directly from the metadata
+describing the API and right into your Rust package where you can call them as
+if they were just another Rust module.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-0.48
   (package
+    (inherit rust-windows-0.52)
     (name "rust-windows")
     (version "0.48.0")
     (source
@@ -1249,19 +1346,11 @@ for Rust.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "03vh89ilnxdxdh0n9np4ns4m10fvm93h3b0cc05ipg3qq1mqi1p6"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-windows-implement" ,rust-windows-implement-0.48)
         ("rust-windows-interface" ,rust-windows-interface-0.48)
-        ("rust-windows-targets" ,rust-windows-targets-0.48))))
+        ("rust-windows-targets" ,rust-windows-targets-0.48))))))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "Rust for Windows")
-    (description "The windows crate lets you call any Windows API past,
-present, and future using code generated on the fly directly from the metadata
-describing the API and right into your Rust package where you can call them as
-if they were just another Rust module.")
-    (license (list license:expat license:asl2.0))))
 
 (define-public rust-windows-0.46
   (package
@@ -1387,16 +1476,16 @@ if they were just another Rust module.")
   (package
     (inherit rust-windows-aarch64-gnullvm-0.52)
     (name "rust-windows-aarch64-gnullvm")
-    (version "0.48.0")
+    (version "0.48.5")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows_aarch64_gnullvm" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1g71yxi61c410pwzq05ld7si4p9hyx6lf5fkw21sinvr3cp5gbli"))
+                "1n05v7qblg1ci3i567inc7xrkmywczxrs1z3lj3rkkxw18py6f1b"))
               (snippet
-               '(delete-file "lib/libwindows.0.48.0.a"))))
+               '(delete-file "lib/libwindows.0.48.5.a"))))
     (arguments (list #:skip-build? #t))))
 
 (define-public rust-windows-aarch64-gnullvm-0.42
@@ -1441,16 +1530,16 @@ crate.")
   (package
     (inherit rust-windows-aarch64-msvc-0.52)
     (name "rust-windows-aarch64-msvc")
-    (version "0.48.0")
+    (version "0.48.5")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows_aarch64_msvc" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1wvwipchhywcjaw73h998vzachf668fpqccbhrxzrz5xszh2gvxj"))
+                "1g5l4ry968p73g6bg6jgyvy9lb8fyhcs54067yzxpcpkf44k2dfw"))
               (snippet
-               #~(delete-file "lib/windows.0.48.0.lib"))))
+               #~(delete-file "lib/windows.0.48.5.lib"))))
     (arguments (list #:skip-build? #t))))
 
 (define-public rust-windows-aarch64-msvc-0.42
@@ -1567,6 +1656,25 @@ crate.")
                        ("rust-syn" ,rust-syn-2)
                        ("rust-windows-metadata" ,rust-windows-metadata-0.51))))))
 
+(define-public rust-windows-core-0.52
+  (package
+    (name "rust-windows-core")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-core" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1nc3qv7sy24x0nlnb32f7alzpd6f72l4p24vl65vydbyil669ark"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-windows-targets" ,rust-windows-targets-0.52))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "Rust for Windows")
+    (description "This package provides the core of Rust for Windows.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-i686-gnu-0.52
   (package
     (name "rust-windows-i686-gnu")
@@ -1592,16 +1700,16 @@ crate.")
   (package
     (inherit rust-windows-i686-gnu-0.52)
     (name "rust-windows-i686-gnu")
-    (version "0.48.0")
+    (version "0.48.5")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows_i686_gnu" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0hd2v9kp8fss0rzl83wzhw0s5z8q1b4875m6s1phv0yvlxi1jak2"))
+                "0gklnglwd9ilqx7ac3cn8hbhkraqisd0n83jxzf9837nvvkiand7"))
               (snippet
-               #~(delete-file "lib/libwindows.0.48.0.a"))))
+               #~(delete-file "lib/libwindows.0.48.5.a"))))
     (arguments (list #:skip-build? #t))))
 
 (define-public rust-windows-i686-gnu-0.42
@@ -1703,15 +1811,15 @@ crate.")
   (package
     (inherit rust-windows-i686-msvc-0.52)
     (name "rust-windows-i686-msvc")
-    (version "0.48.0")
+    (version "0.48.5")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows_i686_msvc" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "004fkyqv3if178xx9ksqc4qqv8sz8n72mpczsr2vy8ffckiwchj5"))
+               (base32 "01m4rik437dl9rdf0ndnm2syh10hizvq0dajdkv2fjqcywrw4mcg"))
               (snippet
-               #~(delete-file "lib/windows.0.48.0.lib"))))
+               #~(delete-file "lib/windows.0.48.5.lib"))))
     (arguments (list #:skip-build? #t))))
 
 (define-public rust-windows-i686-msvc-0.42
@@ -1788,8 +1896,31 @@ crate.")
                (base32
                 "0r0z8s1wcdwd20azsdfilf2a6bz68xkavl990wy64hyc8f51bmai"))))))
 
+(define-public rust-windows-implement-0.52
+  (package
+    (name "rust-windows-implement")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-implement" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0il91jkdgnwl20gm8dwbjswsmiq7paif49dyk5kvhwv72wrqq5hj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "The implement macro for the windows crate")
+    (description "This package provides the @code{implement} macro for the
+windows crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-implement-0.48
   (package
+    (inherit rust-windows-implement-0.52)
     (name "rust-windows-implement")
     (version "0.48.0")
     (source
@@ -1799,17 +1930,11 @@ crate.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1764n853zd7bb0wn94i0qxfs6kdy7wrz7v9qhdn7x7hvk64fabjy"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
+        ("rust-syn" ,rust-syn-1))))))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "The implement macro for the windows crate")
-    (description "This package provides the @code{implement} macro for the
-windows crate.")
-    (license (list license:expat license:asl2.0))))
 
 (define-public rust-windows-implement-0.46
   (package
@@ -1882,8 +2007,31 @@ windows crate.")
        (("rust-syn" ,rust-syn-1)
         ("rust-windows-tokens" ,rust-windows-tokens-0.32))))))
 
+(define-public rust-windows-interface-0.52
+  (package
+    (name "rust-windows-interface")
+    (version "0.52.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-interface" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1la254wzd8qlbxplvb667z5mwdh9jngg1qyhxg6fx9wm00pc73cx"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+                       ("rust-quote" ,rust-quote-1)
+                       ("rust-syn" ,rust-syn-2))))
+    (home-page "https://github.com/microsoft/windows-rs")
+    (synopsis "The interface macro for the windows crate")
+    (description "This package provides the interface macro for the windows
+crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-windows-interface-0.48
   (package
+    (inherit rust-windows-interface-0.52)
     (name "rust-windows-interface")
     (version "0.48.0")
     (source
@@ -1893,17 +2041,11 @@ windows crate.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1iqcilw0hfyzwhk12xfmcy40r10406sgf4xmdansijlv1kr8vyz6"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-proc-macro2" ,rust-proc-macro2-1)
         ("rust-quote" ,rust-quote-1)
-        ("rust-syn" ,rust-syn-1))))
+        ("rust-syn" ,rust-syn-1))))))
-    (home-page "https://github.com/microsoft/windows-rs")
-    (synopsis "The interface macro for the windows crate")
-    (description "This package provides the interface macro for the windows
-crate.")
-    (license (list license:expat license:asl2.0))))
 
 (define-public rust-windows-interface-0.46
   (package
@@ -2175,14 +2317,14 @@ if they were just another Rust module.")
   (package
     (inherit rust-windows-targets-0.52)
     (name "rust-windows-targets")
-    (version "0.48.0")
+    (version "0.48.5")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows-targets" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1mfzg94w0c8h4ya9sva7rra77f3iy1712af9b6bwg03wrpqbc7kv"))))
+                "034ljxqshifs1lan89xwpcy1hp0lhdh4b5n0d2z4fwjx2piacbws"))))
     (arguments
      `(#:cargo-inputs
        (("rust-windows-aarch64-gnullvm" ,rust-windows-aarch64-gnullvm-0.48)
@@ -2248,6 +2390,28 @@ windows crate.")
                (base32
                 "1rrqbxjkyk6h6p6jjzbcxr0mhqbz0yfndd2s2dsgmbl75f4yy7gn"))))))
 
+(define-public rust-windows-win-3
+  (package
+    (name "rust-windows-win")
+    (version "3.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "windows-win" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1p7jbk3i7wj1i6w7chfp4rpbyd6ckgncp6h493wm4frbc8rkxqjq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; unresolved import `windows_win::sys`
+       #:cargo-inputs (("rust-error-code" ,rust-error-code-3))
+       #:cargo-development-inputs (("rust-clipboard-win" ,rust-clipboard-win-5))))
+    (home-page "https://github.com/DoumanAsh/windows-win-rs")
+    (synopsis "Windows hacking library to find windows and access them")
+    (description
+     "Some windows hacking library with utilities to find windows and access them.")
+    (license license:boost1.0)))
+
 (define-public rust-windows-x86-64-gnu-0.52
   (package
     (name "rust-windows-x86-64-gnu")
@@ -2273,16 +2437,16 @@ windows crate.")
   (package
     (inherit rust-windows-x86-64-gnu-0.52)
     (name "rust-windows-x86-64-gnu")
-    (version "0.48.0")
+    (version "0.48.5")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows_x86_64_gnu" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1cblz5m6a8q6ha09bz4lz233dnq5sw2hpra06k9cna3n3xk8laya"))
+                "13kiqqcvz2vnyxzydjh73hwgigsdr2z1xpzx313kxll34nyhmm2k"))
               (snippet
-               #~(delete-file "lib/libwindows.0.48.0.a"))))
+               #~(delete-file "lib/libwindows.0.48.5.a"))))
     (arguments (list #:skip-build? #t))))
 
 (define-public rust-windows-x86-64-gnu-0.42
@@ -2384,16 +2548,16 @@ windows crate.")
   (package
     (inherit rust-windows-x86-64-gnullvm-0.52)
     (name "rust-windows-x86-64-gnullvm")
-    (version "0.48.0")
+    (version "0.48.5")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows_x86_64_gnullvm" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0lxryz3ysx0145bf3i38jkr7f9nxiym8p3syklp8f20yyk0xp5kq"))
+                "1k24810wfbgz8k48c2yknqjmiigmql6kk3knmddkv8k8g1v54yqb"))
               (snippet
-               '(delete-file "lib/libwindows.0.48.0.a"))))
+               '(delete-file "lib/libwindows.0.48.5.a"))))
     (arguments (list #:skip-build? #t))))
 
 (define-public rust-windows-x86-64-gnullvm-0.42
@@ -2437,15 +2601,15 @@ windows crate.")
   (package
     (inherit rust-windows-x86-64-msvc-0.52)
     (name "rust-windows-x86-64-msvc")
-    (version "0.48.0")
+    (version "0.48.5")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "windows_x86_64_msvc" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
-               (base32 "12ipr1knzj2rwjygyllfi5mkd0ihnbi3r61gag5n2jgyk5bmyl8s"))
+               (base32 "0f4mdp895kkjh9zv8dxvn4pc10xr7839lf5pa9l0193i2pkgr57d"))
               (snippet
-               #~(delete-file "lib/windows.0.48.0.lib"))))
+               #~(delete-file "lib/windows.0.48.5.lib"))))
     (arguments (list #:skip-build? #t))))
 
 (define-public rust-windows-x86-64-msvc-0.42

gnu/packages/crypto.scm

@@ -1554,14 +1554,14 @@ SHA-3, and BLAKE2.")
 (define-public rust-blake3-1
   (package
     (name "rust-blake3")
-    (version "1.5.0")
+    (version "1.5.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "blake3" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "11ysh12zcqq6xkjxh5cbrmnwzalprm3z552i5ff7wm5za9hz0c82"))))
+        (base32 "0lpgw3gl564wqwf98v9jsa29lp6nv7w7nn1cvw6w75s5cz9sdk1h"))))
     (build-system cargo-build-system)
     (arguments
      (list
@@ -1573,7 +1573,7 @@ SHA-3, and BLAKE2.")
         ("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-constant-time-eq" ,rust-constant-time-eq-0.3)
         ("rust-digest" ,rust-digest-0.10)
-        ("rust-memmap2" ,rust-memmap2-0.7)
+        ("rust-memmap2" ,rust-memmap2-0.9)
         ("rust-rayon" ,rust-rayon-1)
         ("rust-serde" ,rust-serde-1)
         ("rust-zeroize" ,rust-zeroize-1))

gnu/packages/nss.scm

@@ -323,11 +323,12 @@ security standards.")
          ;; These tests fail with the current builder network setup
          "--skip=ffi::test_gethostbyaddr_r"
          "--skip=ffi::test_gethostbyname2_r")
+      #:install-source? #f
        #:cargo-inputs
        (("rust-anyhow" ,rust-anyhow-1)
         ("rust-atoi" ,rust-atoi-2)
         ("rust-slog" ,rust-slog-2)
-        ("rust-slog-async" ,rust-slog-async-2-8)
+        ("rust-slog-async" ,rust-slog-async-2)
         ("rust-slog-term" ,rust-slog-term-2)
         ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
         ("rust-nix" ,rust-nix-0.28)

gnu/packages/patches/rust-poem-1-fewer-deps.patch

@@ -0,0 +1,229 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 79b878c..95ec54c 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -71,26 +71,26 @@ features = ["clock"]
+ optional = true
+ default-features = false
+ 
+-[dependencies.eyre06]
+-version = "0.6"
+-optional = true
+-package = "eyre"
++#[dependencies.eyre06]
++#version = "0.6"
++#optional = true
++#package = "eyre"
+ 
+-[dependencies.fluent]
+-version = "0.16.0"
+-optional = true
++#[dependencies.fluent]
++#version = "0.16.0"
++#optional = true
+ 
+-[dependencies.fluent-langneg]
+-version = "0.13.0"
+-optional = true
++#[dependencies.fluent-langneg]
++#version = "0.13.0"
++#optional = true
+ 
+-[dependencies.fluent-syntax]
+-version = "0.11.0"
+-optional = true
++#[dependencies.fluent-syntax]
++#version = "0.11.0"
++#optional = true
+ 
+-[dependencies.futures-util]
+-version = "0.3.17"
+-features = ["sink"]
++#[dependencies.futures-util]
++#version = "0.3.17"
++#features = ["sink"]
+ 
+ [dependencies.headers]
+ version = "0.3.7"
+@@ -125,9 +125,9 @@ features = [
+ optional = true
+ default-features = false
+ 
+-[dependencies.intl-memoizer]
+-version = "0.5.1"
+-optional = true
++#[dependencies.intl-memoizer]
++#version = "0.5.1"
++#optional = true
+ 
+ [dependencies.libcookie]
+ version = "0.17"
+@@ -146,16 +146,16 @@ version = "0.4.1"
+ optional = true
+ package = "csrf"
+ 
+-[dependencies.libopentelemetry]
+-version = "0.21.0"
+-features = ["metrics"]
+-optional = true
+-package = "opentelemetry"
++#[dependencies.libopentelemetry]
++#version = "0.21.0"
++#features = ["metrics"]
++#optional = true
++#package = "opentelemetry"
+ 
+-[dependencies.libprometheus]
+-version = "0.13.0"
+-optional = true
+-package = "prometheus"
++#[dependencies.libprometheus]
++#version = "0.13.0"
++#optional = true
++#package = "prometheus"
+ 
+ [dependencies.libtempfile]
+ version = "3.2.0"
+@@ -178,17 +178,17 @@ optional = true
+ version = "0.10.56"
+ optional = true
+ 
+-[dependencies.opentelemetry-http]
+-version = "0.10.0"
+-optional = true
++#[dependencies.opentelemetry-http]
++#version = "0.10.0"
++#optional = true
+ 
+-[dependencies.opentelemetry-prometheus]
+-version = "0.14.0"
+-optional = true
++#[dependencies.opentelemetry-prometheus]
++#version = "0.14.0"
++#optional = true
+ 
+-[dependencies.opentelemetry-semantic-conventions]
+-version = "0.13.0"
+-optional = true
++#[dependencies.opentelemetry-semantic-conventions]
++#version = "0.13.0"
++#optional = true
+ 
+ [dependencies.parking_lot]
+ version = "0.12.0"
+@@ -219,14 +219,14 @@ optional = true
+ version = "0.11.1"
+ optional = true
+ 
+-[dependencies.redis]
+-version = "0.23.0"
+-features = [
+-    "aio",
+-    "tokio-comp",
+-    "connection-manager",
+-]
+-optional = true
++#[dependencies.redis]
++#version = "0.23.0"
++#features = [
++#    "aio",
++#    "tokio-comp",
++#    "connection-manager",
++#]
++#optional = true
+ 
+ [dependencies.regex]
+ version = "1.5.5"
+@@ -263,9 +263,9 @@ optional = true
+ [dependencies.smallvec]
+ version = "1.6.1"
+ 
+-[dependencies.sse-codec]
+-version = "0.3.2"
+-optional = true
++#[dependencies.sse-codec]
++#version = "0.3.2"
++#optional = true
+ 
+ [dependencies.thiserror]
+ version = "1.0.30"
+@@ -323,10 +323,10 @@ default-features = false
+ [dependencies.tracing]
+ version = "0.1.36"
+ 
+-[dependencies.unic-langid]
+-version = "0.9.0"
+-features = ["macros"]
+-optional = true
++#[dependencies.unic-langid]
++#version = "0.9.0"
++#features = ["macros"]
++#optional = true
+ 
+ [dependencies.wildmatch]
+ version = "2"
+@@ -383,13 +383,13 @@ embed = [
+     "hex",
+     "mime_guess",
+ ]
+-i18n = [
+-    "fluent",
+-    "fluent-langneg",
+-    "fluent-syntax",
+-    "unic-langid",
+-    "intl-memoizer",
+-]
++#i18n = [
++#    "fluent",
++#    "fluent-langneg",
++#    "fluent-syntax",
++#    "unic-langid",
++#    "intl-memoizer",
++#]
+ multipart = ["multer"]
+ native-tls = [
+     "server",
+@@ -400,20 +400,20 @@ openssl-tls = [
+     "tokio-openssl",
+     "openssl",
+ ]
+-opentelemetry = [
+-    "libopentelemetry",
+-    "opentelemetry-http",
+-    "opentelemetry-semantic-conventions",
+-]
+-prometheus = [
+-    "libopentelemetry",
+-    "opentelemetry-prometheus",
+-    "libprometheus",
+-]
+-redis-session = [
+-    "session",
+-    "redis",
+-]
++#opentelemetry = [
++#    "libopentelemetry",
++#    "opentelemetry-http",
++#    "opentelemetry-semantic-conventions",
++#]
++#prometheus = [
++#    "libopentelemetry",
++#    "opentelemetry-prometheus",
++#    "libprometheus",
++#]
++#redis-session = [
++#    "session",
++#    "redis",
++#]
+ rustls = [
+     "server",
+     "tokio-rustls",
+@@ -445,7 +445,7 @@ tempfile = [
+ ]
+ test = [
+     "sse",
+-    "sse-codec",
++#    "sse-codec",
+     "tokio-util/compat",
+ ]
+ tower-compat = [

gnu/packages/python-compression.scm

@@ -173,11 +173,13 @@ were a single file.")
                        ("rust-zstd" ,rust-zstd-0.11))
       #:install-source? #f))
     (native-inputs (list maturin
+                         pkg-config
                          python-pytest
                          python-pytest-xdist
                          python-numpy
                          python-hypothesis
                          python-wrapper))
+    (inputs (list `(,zstd "lib")))
     (home-page "https://github.com/milesgranger/cramjam")
     (synopsis "Python bindings to compression algorithms in Rust")
     (description

gnu/packages/python-crypto.scm

@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
-;;; Copyright © 2015-2021, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015-2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016, 2017, 2020, 2022, 2023 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
@@ -523,16 +523,18 @@ def contents() -> str:
 (define-public python-cryptography-vectors
   (package
     (name "python-cryptography-vectors")
-    (version "41.0.4")
+    (version "42.0.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cryptography_vectors" version))
        (sha256
         (base32
-         "17m1azxfc3w0390jp9mkx1v0k3xfv4v1lrgch4hvbbm77s0z42j4"))))
+         "1lcflcvv0xjz5cyvf33iav1vd91qzjvl4w7h4qaxlcnbn3ixap2h"))))
     (build-system pyproject-build-system)
     (arguments (list #:tests? #f))  ; No tests included.
+    (native-inputs
+     (list python-flit-core))
     (home-page "https://github.com/pyca/cryptography")
     (synopsis "Test vectors for the cryptography package")
     (description
@@ -543,14 +545,14 @@ def contents() -> str:
 (define-public python-cryptography
   (package
     (name "python-cryptography")
-    (version "41.0.4")
+    (version "42.0.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cryptography" version))
        (sha256
         (base32
-         "06pm952pr6f31pzwh5fb68zryqyss0hg9cbggxm15z15844w7svz"))))
+         "1qdz0yk5smi0dnywbxmanccwizilmnzgbbihjpmpgm6zjpn7xq3g"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -561,8 +563,7 @@ def contents() -> str:
                        ;; 'python-cryptography-rust', so there's no need
                        ;; to build it here.
                        (substitute* "pyproject.toml"
-                         ((".*setuptools-rust.*") ""))
+                         (("\\s+\\\"setuptools-rust.*") ""))))
-                       (delete-file "setup.py")))
                    (add-before 'check 'symlink-rust-library
                      (lambda* (#:key inputs outputs #:allow-other-keys)
                        (symlink (search-input-file
@@ -572,13 +573,12 @@ def contents() -> str:
                                                "_rust.abi3.so")))))))
 
     (native-inputs
-     (list python-cryptography-vectors
+     (list python-certifi
-           python-hypothesis
+           python-cryptography-vectors
            python-iso8601
            python-pretend
            python-pytest                ;for subtests
-           python-pytest-benchmark
+           python-pytest-benchmark))
-           python-pytest-subtests))
     (inputs (list python-cryptography-rust))
     (propagated-inputs (list python-cffi))
     (home-page "https://github.com/pyca/cryptography")
@@ -632,14 +632,15 @@ ciphers, message digests and key derivation functions.")
       #:cargo-inputs
       `(("rust-asn1" ,rust-asn1-0.15)
         ("rust-cc" ,rust-cc-1)
+        ("rust-cfg-if" ,rust-cfg-if-1)
         ("rust-foreign-types" ,rust-foreign-types-0.3)
         ("rust-foreign-types-shared" ,rust-foreign-types-shared-0.1)
         ("rust-once-cell" ,rust-once-cell-1)
         ("rust-openssl" ,rust-openssl-0.10)
         ("rust-openssl-sys" ,rust-openssl-sys-0.9)
-        ("rust-ouroboros" ,rust-ouroboros-0.15)
+        ("rust-pem" ,rust-pem-3)
-        ("rust-pem" ,rust-pem-1)
+        ("rust-pyo3" ,rust-pyo3-0.20)
-        ("rust-pyo3" ,rust-pyo3-0.18))))
+        ("rust-self-cell" ,rust-self-cell-1))))
     (native-inputs (list pkg-config python python-cffi))
     ;; XXX: Adding rust-openssl-sys-0.9 is needed because #:cargo-inputs
     ;; doesn't honor propagated-inputs.
@@ -650,14 +651,14 @@ ciphers, message digests and key derivation functions.")
 (define-public python-pyopenssl
   (package
     (name "python-pyopenssl")
-    (version "23.2.0")
+    (version "24.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pyOpenSSL" version))
        (sha256
         (base32
-         "1b4bkcpzhmablf592g21rq3l8apbhklp6wcwlvgfflm4algr6vr7"))))
+         "0vqsyji1q4vhd5yxlzks0z6va62knq64mxhfdjhz3yaxmazx9gna"))))
     (build-system python-build-system)
     (arguments
      (list
@@ -669,25 +670,21 @@ ciphers, message digests and key derivation functions.")
                 ;; PyOpenSSL runs tests against a certificate with a fixed
                 ;; expiry time.  To ensure successful builds in the future,
                 ;; set the time to roughly the release date.
-                (invoke "faketime" "2023-03-25" "pytest" "-vv" "-k"
+                (invoke "faketime" "2024-03-09" "pytest" "-vv" "-k"
-                        (string-append
+                        ;; This test tries to look up certificates from
-                         ;; This test tries to look up certificates from
+                        ;; the compiled-in default path in OpenSSL, which
-                         ;; the compiled-in default path in OpenSSL, which
+                        ;; does not exist in the build environment.
-                         ;; does not exist in the build environment.
+                        "not test_fallback_default_verify_paths ")))))))
-                         "not test_fallback_default_verify_paths "
-                         ;; This test attempts to make a connection to
-                         ;; an external web service.
-                         "and not test_set_default_verify_paths "
-                         ;; Fails on i686-linux and possibly other 32-bit platforms
-                         ;; https://github.com/pyca/pyopenssl/issues/974
-                         "and not test_verify_with_time"))))))))
     (propagated-inputs (list python-cryptography))
     (inputs (list openssl))
-    (native-inputs (list libfaketime python-flaky python-pretend python-pytest))
+    (native-inputs (list libfaketime python-pretend python-pytest
+                         python-pytest-rerunfailures))
     (home-page "https://github.com/pyca/pyopenssl")
     (synopsis "Python wrapper module around the OpenSSL library")
     (description "PyOpenSSL is a high-level wrapper around a subset of the
 OpenSSL library.")
+    (properties `((updater-extra-inputs . ("openssl"))
+                  (updater-extra-native-inputs . ("libfaketime"))))
     (license license:asl2.0)))
 
 (define-public python-ed25519

gnu/packages/python-web.scm

@@ -65,6 +65,7 @@
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2024 normally_js <normally_js@posteo.net>
 ;;; Copyright © 2024 Markku Korkeala <markku.korkeala@iki.fi>
+;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -83,6 +84,7 @@
 
 (define-module (gnu packages python-web)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system cargo)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
@@ -96,6 +98,8 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages crates-io)
+  #:use-module (gnu packages crates-web)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages django)
@@ -122,6 +126,7 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages rdf)
   #:use-module (gnu packages rpc)
+  #:use-module (gnu packages rust-apps)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages texinfo)
@@ -3442,6 +3447,46 @@ verification of the SSL peer.")
     (home-page "https://github.com/cedadev/ndg_httpsclient/")
     (license license:bsd-3)))
 
+(define-public python-nh3
+  (package
+    (name "python-nh3")
+    (version "0.2.17")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "nh3" version))
+       (sha256
+        (base32 "0a7hrca5bbbrz20cbqy16n8vaxf4v2q1r9zv9vjlbmn334d79l20"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:imported-modules `(,@%cargo-build-system-modules
+                           ,@%pyproject-build-system-modules)
+      #:modules '((guix build cargo-build-system)
+                  ((guix build pyproject-build-system) #:prefix py:)
+                  (guix build utils))
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'build (assoc-ref py:%standard-phases 'build))
+          (replace 'install (assoc-ref py:%standard-phases 'install))
+          ;; cargo-build-system's %standard-phases has 'check before 'install.
+          (delete 'check)
+          (add-after 'install 'check
+            (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+              (when tests?
+                (py:add-installed-pythonpath inputs outputs)
+                (invoke "pytest" "-vv" "tests")))))
+      #:cargo-inputs
+      `(("rust-ammonia" ,rust-ammonia-4)
+        ("rust-pyo3" ,rust-pyo3-0.21))
+      #:install-source? #false))
+    (native-inputs (list maturin python-pytest python-wrapper))
+    (home-page "https://nh3.readthedocs.io")
+    (synopsis "Python bindings to Ammonia HTML sanitization library")
+    (description "This package provides Python bindings to Ammonia HTML
+sanitizer Rust crate.")
+    (license license:expat)))
+
 (define-public python-noiseprotocol
   (package
     (name "python-noiseprotocol")

gnu/packages/rust-apps.scm

@@ -6,7 +6,7 @@
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2020 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
-;;; Copyright © 2020-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.ccom>
@@ -112,7 +112,12 @@
        (uri (crate-uri "aardvark-dns" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0ldqv9v3v9a1m2kka660d5v15y2zasy5z7m4fh5hif74r089cx6x"))))
+        (base32 "0ldqv9v3v9a1m2kka660d5v15y2zasy5z7m4fh5hif74r089cx6x"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* (find-files "." "^Cargo\\.toml$")
+                  (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                   (string-append "\"^" version)))))))
     (build-system cargo-build-system)
     (arguments
      `(#:install-source? #f
@@ -139,20 +144,20 @@
 (define-public agate
   (package
     (name "agate")
-    (version "3.2.4")
+    (version "3.3.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "agate" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1wvbhzm4k3hdy8x7aq8rj3galhgfizdwf5fi419hzvg3kmvbawh1"))))
+        (base32 "0ja2lvlcvkcbjn8r9da4k0ppy7pb7xad8j4b0a4fhg0mbp244f9s"))))
     (build-system cargo-build-system)
     (arguments
      `(#:install-source? #f
        #:cargo-inputs
        (("rust-configparser" ,rust-configparser-3)
-        ("rust-env-logger" ,rust-env-logger-0.9)
+        ("rust-env-logger" ,rust-env-logger-0.11)
         ("rust-futures-util" ,rust-futures-util-0.3)
         ("rust-getopts" ,rust-getopts-0.2)
         ("rust-glob" ,rust-glob-0.3)
@@ -160,12 +165,10 @@
         ("rust-mime-guess" ,rust-mime-guess-2)
         ("rust-once-cell" ,rust-once-cell-1)
         ("rust-percent-encoding" ,rust-percent-encoding-2)
-        ("rust-rcgen" ,rust-rcgen-0.9)
+        ("rust-rcgen" ,rust-rcgen-0.12)
-        ("rust-rustls" ,rust-rustls-0.20)
         ("rust-tokio" ,rust-tokio-1)
-        ("rust-tokio-rustls" ,rust-tokio-rustls-0.23)
+        ("rust-tokio-rustls" ,rust-tokio-rustls-0.25)
-        ("rust-url" ,rust-url-2)
+        ("rust-url" ,rust-url-2))
-        ("rust-webpki" ,rust-webpki-0.22))
        #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1)
                                    ("rust-gemini-fetch" ,rust-gemini-fetch-0.2))))
     (home-page "https://github.com/mbrubeck/agate")
@@ -359,27 +362,28 @@ paging.")
 (define-public cargo-machete
   (package
     (name "cargo-machete")
-    (version "0.6.0")
+    (version "0.6.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri name version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0lbymfxgcizmj1c1ydpzinjbjhc7c9j0wb5y1xq33j80s5hzayaz"))))
+        (base32 "1an8d88njnk8hfsnwnx52zlzdmijscv7m20as1ci986rxz3vgpcl"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f ;Error: No such file or directory (os error 2)
+       #:install-source? #f
        #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
                        ("rust-argh" ,rust-argh-0.1)
                        ("rust-cargo-metadata" ,rust-cargo-metadata-0.18)
-                       ("rust-cargo-toml" ,rust-cargo-toml-0.16)
+                       ("rust-cargo-toml" ,rust-cargo-toml-0.19)
-                       ("rust-grep" ,rust-grep-0.2)
+                       ("rust-grep" ,rust-grep-0.3)
                        ("rust-log" ,rust-log-0.4)
                        ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.5)
                        ("rust-rayon" ,rust-rayon-1)
                        ("rust-serde" ,rust-serde-1)
-                       ("rust-toml-edit" ,rust-toml-edit-0.20)
+                       ("rust-toml-edit" ,rust-toml-edit-0.22)
                        ("rust-walkdir" ,rust-walkdir-2))))
     (home-page "https://github.com/est31/cargo-udeps")
     (synopsis "Find unused dependencies in Cargo.toml")
@@ -545,19 +549,20 @@ configuration instructions.")
 (define-public eza
   (package
     (name "eza")
-    (version "0.17.0")
+    (version "0.18.7")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "eza" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "026xagh42nrdy2yg9197mmb2bhm5mdvbf9vd9fk9iysrj1iay63r"))))
+        (base32 "1wnkbzaza0bcw5rld3baikpwwvnajz3j6nbpaic5mhv86rshqlcq"))))
     (build-system cargo-build-system)
     (arguments
      (list
       #:install-source? #f
-      #:cargo-inputs `(("rust-ansiterm" ,rust-ansiterm-0.12)
+      #:cargo-inputs `(("rust-ansi-width" ,rust-ansi-width-0.1)
+                       ("rust-ansiterm" ,rust-ansiterm-0.12)
                        ("rust-chrono" ,rust-chrono-0.4)
                        ("rust-git2" ,rust-git2-0.18)
                        ("rust-glob" ,rust-glob-0.3)
@@ -565,24 +570,24 @@ configuration instructions.")
                        ("rust-locale" ,rust-locale-0.2)
                        ("rust-log" ,rust-log-0.4)
                        ("rust-natord" ,rust-natord-1)
-                       ("rust-num-cpus" ,rust-num-cpus-1)
                        ("rust-number-prefix" ,rust-number-prefix-0.4)
                        ("rust-once-cell" ,rust-once-cell-1)
                        ("rust-palette" ,rust-palette-0.7)
+                       ("rust-path-clean" ,rust-path-clean-1)
                        ("rust-percent-encoding" ,rust-percent-encoding-2)
                        ("rust-phf" ,rust-phf-0.11)
                        ("rust-plist" ,rust-plist-1)
                        ("rust-proc-mounts" ,rust-proc-mounts-0.3)
-                       ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
+                       ("rust-rayon" ,rust-rayon-1)
                        ("rust-terminal-size" ,rust-terminal-size-0.3)
                        ("rust-timeago" ,rust-timeago-0.4)
                        ("rust-unicode-width" ,rust-unicode-width-0.1)
-                       ("rust-uutils-term-grid" ,rust-uutils-term-grid-0.3)
+                       ("rust-uutils-term-grid" ,rust-uutils-term-grid-0.6)
                        ("rust-uzers" ,rust-uzers-0.11)
                        ("rust-windows-sys" ,rust-windows-sys-0.52)
                        ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.5))
       #:cargo-development-inputs `(("rust-criterion" ,rust-criterion-0.5)
-                                   ("rust-trycmd" ,rust-trycmd-0.14))
+                                   ("rust-trycmd" ,rust-trycmd-0.15))
       #:phases #~(modify-phases %standard-phases
                    (add-after 'build 'build-manual
                      (lambda* (#:key inputs #:allow-other-keys)
@@ -594,7 +599,9 @@ configuration instructions.")
                                             "-f" "markdown"
                                             "-t" "man"
                                             (string-append "man/" page ".md")))))
-                              (list "eza.1" "eza_colors.5")))))
+                              (list "eza.1"
+                                    "eza_colors.5"
+                                    "eza_colors-explanation.5")))))
                    (add-after 'install 'install-extras
                      (lambda* (#:key outputs #:allow-other-keys)
                        (let* ((out (assoc-ref outputs "out"))
@@ -611,6 +618,8 @@ configuration instructions.")
                            (install-file "eza.1" man1))
                          (when (file-exists? "eza_colors.5")
                            (install-file "eza_colors.5" man5))
+                         (when (file-exists? "eza_colors-explanation.5")
+                           (install-file "eza_colors-explanation.5" man5))
                          (mkdir-p bash-completions-dir)
                          (mkdir-p zsh-completions-dir)
                          (mkdir-p fish-completions-dir)
@@ -723,6 +732,89 @@ While it does not seek to mirror all of find's powerful functionality, it provid
 defaults for 80% of the use cases.")
      (license (list license:expat license:asl2.0))))
 
+(define-public gitui
+  (package
+    (name "gitui")
+    (version "0.25.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "gitui" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "19xv6bvp0hs1m5y8a0myifvh8xrxrv14wd4gknlsrka0l7d8ijg7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(;; disable vendor-openssl from default flags
+       ;; use oniguruma regex lib which is faster and makes gitui 25% smaller
+       #:features '("ghemoji" "regex-onig" "trace-libgit")
+       #:cargo-build-flags
+       '("--release" "--no-default-features")
+       #:cargo-test-flags
+       '("--release" "--no-default-features"
+         "--features" "ghemoji regex-onig trace-libgit"
+         "--"
+         ;; this test fails with permission denied error
+         "--skip=test_symbolic_links")
+       #:install-source? #f
+       #:phases
+       (modify-phases %standard-phases
+          (replace 'install
+             ;; Add --no-default-features to the install phase.
+             (lambda* (#:key outputs features #:allow-other-keys)
+                (let ((out (assoc-ref outputs "out")))
+                  (invoke "cargo" "install" "--no-track"
+                          "--path" "."
+                          "--root" out
+                          "--no-default-features"
+                          "--features" (string-join features))))))
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-asyncgit" ,rust-asyncgit-0.25)
+                       ("rust-backtrace" ,rust-backtrace-0.3)
+                       ("rust-bitflags" ,rust-bitflags-2)
+                       ("rust-bugreport" ,rust-bugreport-0.5)
+                       ("rust-bwrap" ,rust-bwrap-1)
+                       ("rust-bytesize" ,rust-bytesize-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-clap" ,rust-clap-4)
+                       ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
+                       ("rust-crossterm" ,rust-crossterm-0.27)
+                       ("rust-dirs" ,rust-dirs-5)
+                       ("rust-easy-cast" ,rust-easy-cast-0.5)
+                       ("rust-filetreelist" ,rust-filetreelist-0.5)
+                       ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3)
+                       ("rust-gh-emoji" ,rust-gh-emoji-1)
+                       ("rust-indexmap" ,rust-indexmap-2)
+                       ("rust-itertools" ,rust-itertools-0.12)
+                       ("rust-log" ,rust-log-0.4)
+                       ("rust-notify" ,rust-notify-6)
+                       ("rust-notify-debouncer-mini" ,rust-notify-debouncer-mini-0.4)
+                       ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-ratatui" ,rust-ratatui-0.24)
+                       ("rust-rayon-core" ,rust-rayon-core-1)
+                       ("rust-ron" ,rust-ron-0.8)
+                       ("rust-scopeguard" ,rust-scopeguard-1)
+                       ("rust-scopetime" ,rust-scopetime-0.1)
+                       ("rust-serde" ,rust-serde-1)
+                       ("rust-shellexpand" ,rust-shellexpand-3)
+                       ("rust-simplelog" ,rust-simplelog-0.12)
+                       ("rust-struct-patch" ,rust-struct-patch-0.4)
+                       ("rust-syntect" ,rust-syntect-5)
+                       ("rust-tui-textarea" ,rust-tui-textarea-0.4)
+                       ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
+                       ("rust-unicode-truncate" ,rust-unicode-truncate-0.2)
+                       ("rust-unicode-width" ,rust-unicode-width-0.1)
+                       ("rust-which" ,rust-which-6))
+       #:cargo-development-inputs
+       (("rust-pretty-assertions" ,rust-pretty-assertions-1)
+        ("rust-tempfile" ,rust-tempfile-3))))
+    (native-inputs (list pkg-config))
+    (inputs (list libgit2-1.7 libssh2 openssl zlib))
+    (home-page "https://github.com/extrawurst/gitui")
+    (synopsis "Terminal UI for git")
+    (description "This package provides a fast Terminal UI for git.")
+    (license license:expat)))
+
 (define-public hexyl
   (package
     (name "hexyl")
@@ -1366,7 +1458,12 @@ on the terminal in a visually appealing way.")
        (uri (crate-uri "netavark" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1viyj9xqq9hkcsghrfx7wjmky3hkxfr96952f9favd4zg9ih64yw"))))
+        (base32 "1viyj9xqq9hkcsghrfx7wjmky3hkxfr96952f9favd4zg9ih64yw"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* (find-files "." "^Cargo\\.toml$")
+                  (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                   (string-append "\"^" version)))))))
     (build-system cargo-build-system)
     (arguments
      `(#:install-source? #f
@@ -2043,22 +2140,24 @@ of support files.")
 (define-public treefmt
   (package
     (name "treefmt")
-    (version "0.4.1")
+    (version "0.6.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "treefmt" version))
-       (file-name
+       (file-name (string-append name "-" version ".tar.gz"))
-        (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1rarg6rffzl1cf6r167h9p14wr696kwnzr85kwbdy7x7x5zpj5li"))))
+        (base32 "1pfx8kgaf0rc8ijps2fqb61gjnak3sf430hvg52bnby9qqyd51h8"))))
     (build-system cargo-build-system)
     (arguments
      `(#:install-source? #f
        #:cargo-inputs
        (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-clap" ,rust-clap-4)
+        ("rust-clap-verbosity-flag" ,rust-clap-verbosity-flag-2)
         ("rust-console" ,rust-console-0.13)
         ("rust-directories" ,rust-directories-3)
+        ("rust-env-logger" ,rust-env-logger-0.10)
         ("rust-filetime" ,rust-filetime-0.2)
         ("rust-globset" ,rust-globset-0.4)
         ("rust-ignore" ,rust-ignore-0.4)
@@ -2068,12 +2167,12 @@ of support files.")
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-sha-1" ,rust-sha-1-0.9)
-        ("rust-structopt" ,rust-structopt-0.3)
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-toml" ,rust-toml-0.5)
         ("rust-which" ,rust-which-4))
        #:cargo-development-inputs
-       (("rust-criterion" ,rust-criterion-0.3))))
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-mockall" ,rust-mockall-0.11))))
     (home-page "https://numtide.github.io/treefmt")
     (synopsis "Command-line application to format the code tree")
     (description
@@ -2405,19 +2504,20 @@ background agent taking care of maintaining the necessary state.")
 (define-public rust-cargo
   (package
     (name "rust-cargo")
-    (version "0.76.0")
+    (version "0.78.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "cargo" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "14yjyvj9bl6mlzx6bbi3igflgdrx1hil9ifnf1dl9xnm4mb2gjw6"))))
+        (base32 "1p6564hg38xxbpjiiqxmnm1kmysxfjh0kbm5g56n85c3s0wmwc6n"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; unresolved import `cargo_test_support`
        #:cargo-inputs
-       (("rust-anstream" ,rust-anstream-0.6)
+       (("rust-annotate-snippets" ,rust-annotate-snippets-0.10)
+        ("rust-anstream" ,rust-anstream-0.6)
         ("rust-anstyle" ,rust-anstyle-1)
         ("rust-anyhow" ,rust-anyhow-1)
         ("rust-base64" ,rust-base64-0.21)
@@ -2428,18 +2528,18 @@ background agent taking care of maintaining the necessary state.")
         ("rust-cargo-credential-wincred" ,rust-cargo-credential-wincred-0.4)
         ("rust-cargo-platform" ,rust-cargo-platform-0.1)
         ("rust-cargo-util" ,rust-cargo-util-0.2)
+        ("rust-cargo-util-schemas" ,rust-cargo-util-schemas-0.2)
         ("rust-clap" ,rust-clap-4)
         ("rust-color-print" ,rust-color-print-0.3)
-        ("rust-crates-io" ,rust-crates-io-0.39)
+        ("rust-crates-io" ,rust-crates-io-0.40)
         ("rust-curl" ,rust-curl-0.4)
         ("rust-curl-sys" ,rust-curl-sys-0.4)
         ("rust-filetime" ,rust-filetime-0.2)
         ("rust-flate2" ,rust-flate2-1)
-        ("rust-flate2" ,rust-flate2-1)
         ("rust-git2" ,rust-git2-0.18)
         ("rust-git2-curl" ,rust-git2-curl-0.19)
-        ("rust-gix" ,rust-gix-0.55)
+        ("rust-gix" ,rust-gix-0.57)
-        ("rust-gix-features" ,rust-gix-features-0.35)
+        ("rust-gix-features" ,rust-gix-features-0.37)
         ("rust-glob" ,rust-glob-0.3)
         ("rust-hex" ,rust-hex-0.4)
         ("rust-hmac" ,rust-hmac-0.12)
@@ -2449,7 +2549,7 @@ background agent taking care of maintaining the necessary state.")
         ("rust-ignore" ,rust-ignore-0.4)
         ("rust-im-rc" ,rust-im-rc-15)
         ("rust-indexmap" ,rust-indexmap-2)
-        ("rust-itertools" ,rust-itertools-0.11)
+        ("rust-itertools" ,rust-itertools-0.12)
         ("rust-jobserver" ,rust-jobserver-0.1)
         ("rust-lazycell" ,rust-lazycell-1)
         ("rust-libc" ,rust-libc-0.2)
@@ -2460,33 +2560,30 @@ background agent taking care of maintaining the necessary state.")
         ("rust-os-info" ,rust-os-info-3)
         ("rust-pasetors" ,rust-pasetors-0.6)
         ("rust-pathdiff" ,rust-pathdiff-0.2)
-        ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9)
         ("rust-rand" ,rust-rand-0.8)
-        ("rust-rustfix" ,rust-rustfix-0.6)
+        ("rust-regex" ,rust-regex-1)
+        ("rust-rusqlite" ,rust-rusqlite-0.30)
+        ("rust-rustfix" ,rust-rustfix-0.8)
         ("rust-semver" ,rust-semver-1)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-untagged" ,rust-serde-untagged-0.1)
-        ("rust-serde-value" ,rust-serde-value-0.7)
         ("rust-serde-ignored" ,rust-serde-ignored-0.1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-sha1" ,rust-sha1-0.10)
         ("rust-shell-escape" ,rust-shell-escape-0.1)
         ("rust-supports-hyperlinks" ,rust-supports-hyperlinks-2)
-        ("rust-syn" ,rust-syn-2)
-        ("rust-tar" ,rust-tar-0.4)
         ("rust-tar" ,rust-tar-0.4)
         ("rust-tempfile" ,rust-tempfile-3)
         ("rust-time" ,rust-time-0.3)
         ("rust-toml" ,rust-toml-0.8)
-        ("rust-toml-edit" ,rust-toml-edit-0.20)
+        ("rust-toml-edit" ,rust-toml-edit-0.21)
         ("rust-tracing" ,rust-tracing-0.1)
         ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
         ("rust-unicase" ,rust-unicase-2)
         ("rust-unicode-width" ,rust-unicode-width-0.1)
-        ("rust-unicode-xid" ,rust-unicode-xid-0.2)
         ("rust-url" ,rust-url-2)
         ("rust-walkdir" ,rust-walkdir-2)
-        ("rust-windows-sys" ,rust-windows-sys-0.48))
+        ("rust-windows-sys" ,rust-windows-sys-0.52))
        #:cargo-development-inputs (("rust-same-file" ,rust-same-file-1)
                                    ("rust-snapbox" ,rust-snapbox-0.4))))
     (native-inputs
@@ -2502,19 +2599,19 @@ the library crate of Cargo.")
 (define-public rust-cargo-c
   (package
     (name "rust-cargo-c")
-    (version "0.9.29+cargo-0.76.0")
+    (version "0.9.31+cargo-0.78.0")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "cargo-c" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "03ks9rl2skvf5j93sbmbz6l72k5cgvf4hc0nhnp7aadrvb05v5sr"))))
+         (base32 "1y60hhjikkzk5s36gskgbxbyzr6ik7w0dn5j84mvqlilcs3ab0lj"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-anyhow" ,rust-anyhow-1)
-        ("rust-cargo" ,rust-cargo-0.76)
+        ("rust-cargo" ,rust-cargo)
         ("rust-cargo-util" ,rust-cargo-util-0.2)
         ("rust-cbindgen" ,rust-cbindgen-0.26)
         ("rust-cc" ,rust-cc-1)
@@ -2527,7 +2624,7 @@ the library crate of Cargo.")
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-derive" ,rust-serde-derive-1)
         ("rust-serde-json" ,rust-serde-json-1)
-        ("rust-toml" ,rust-toml-0.7)
+        ("rust-toml" ,rust-toml-0.8)
         ("rust-windows-sys" ,rust-windows-sys-0.52))))
     (native-inputs
      (list pkg-config))
@@ -3027,7 +3124,7 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for
 (define-public rust-xremap
   (package
     (name "rust-xremap")
-    (version "0.8.14")
+    (version "0.10.0")
     (source
      (origin
        (method url-fetch)
@@ -3035,7 +3132,7 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1691clzqbwcywz66k0lf5wjz3q5cpbks0l090bfv42idzr5a0ghl"))))
+         "13pvlc40zha7c9ma30s32x65c8qciqcnsznw43crx3wymlaqc9sn"))))
     (build-system cargo-build-system)
     (arguments
      `(#:features '()
@@ -3048,7 +3145,6 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for
         ("rust-env-logger" ,rust-env-logger-0.10)
         ("rust-evdev" ,rust-evdev-0.12)
         ("rust-fork" ,rust-fork-0.1)
-        ("rust-hyprland" ,rust-hyprland-0.3)
         ("rust-indoc" ,rust-indoc-2)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-log" ,rust-log-0.4)
@@ -3058,7 +3154,6 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-serde-with" ,rust-serde-with-3)
         ("rust-serde-yaml" ,rust-serde-yaml-0.9)
-        ("rust-swayipc" ,rust-swayipc-3)
         ("rust-toml" ,rust-toml-0.8)
         ("rust-wayland-client" ,rust-wayland-client-0.30)
         ("rust-wayland-protocols-wlr" ,rust-wayland-protocols-wlr-0.1)
@@ -3073,19 +3168,19 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for
                     (xremap (string-append out "/bin/xremap")))
                (mkdir-p (string-append share "/bash-completion/completions"))
                (with-output-to-file
-                 (string-append share "/bash-completion/completions/xremap")
+                   (string-append share "/bash-completion/completions/xremap")
                  (lambda _ (invoke xremap "--completions" "bash")))
                (mkdir-p (string-append share "/fish/vendor_completions.d"))
                (with-output-to-file
-                 (string-append share "/fish/vendor_completions.d/xremap.fish")
+                   (string-append share "/fish/vendor_completions.d/xremap.fish")
                  (lambda _ (invoke xremap "--completions" "fish")))
                (mkdir-p (string-append share "/zsh/site-functions"))
                (with-output-to-file
-                 (string-append share "/zsh/site-functions/_xremap")
+                   (string-append share "/zsh/site-functions/_xremap")
                  (lambda _ (invoke xremap "--completions" "zsh")))
                (mkdir-p (string-append share "/elvish/lib"))
                (with-output-to-file
-                 (string-append share "/elvish/lib/xremap")
+                   (string-append share "/elvish/lib/xremap")
                  (lambda _ (invoke xremap "--completions" "elvish")))))))))
     (home-page "https://github.com/k0kubun/xremap")
     (synopsis "Dynamic key remapp for X and Wayland")
@@ -3100,14 +3195,6 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for
      (substitute-keyword-arguments (package-arguments rust-xremap)
        ((#:features _) '(list "gnome"))))))
 
-(define-public xremap-sway
-  (package
-    (inherit rust-xremap)
-    (name "xremap-sway")
-    (arguments
-     (substitute-keyword-arguments (package-arguments rust-xremap)
-       ((#:features _) '(list "sway"))))))
-
 (define-public xremap-wlroots
   (package
     (inherit rust-xremap)
@@ -3116,6 +3203,12 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for
      (substitute-keyword-arguments (package-arguments rust-xremap)
        ((#:features _) '(list "wlroots"))))))
 
+(define-public xremap-hyprland
+  (deprecated-package "xremap-hyprland" xremap-wlroots))
+
+(define-public xremap-sway
+  (deprecated-package "xremap-sway" xremap-wlroots))
+
 (define-public xremap-x11
   (package
     (inherit rust-xremap)

gnu/packages/rust.scm

@@ -960,8 +960,8 @@ safety and thread safety guarantees.")
                              (replace "llvm" llvm-17))))))
 
 (define-public rust-1.77
-  (let ((base-rust (rust-bootstrapped-package rust-1.76 "1.77.0"
+  (let ((base-rust (rust-bootstrapped-package rust-1.76 "1.77.1"
-                    "11rda8d8qj24a5mkjzj1x6x9pkvaq0zlhkgdp5b39zj5m0gwsv0d")))
+                    "18d4ncdzp0nfimmw029xdf7vv1hgh82v30mjnnixnllzar66w47f")))
     (package
       (inherit base-rust)
       (arguments
@@ -1027,12 +1027,12 @@ safety and thread safety guarantees.")
 ;;; Here we take the latest included Rust, make it public, and re-enable tests
 ;;; and extra components such as rustfmt.
 (define-public rust
-  (let ((base-rust rust-1.75))
+  (let ((base-rust rust-1.77))
     (package
       (inherit base-rust)
       (properties (append
                     (alist-delete 'hidden? (package-properties base-rust))
-                    (clang-compiler-cpu-architectures "15")))
+                    (clang-compiler-cpu-architectures "17")))
       (outputs (cons* "rust-src" "tools" (package-outputs base-rust)))
       (source
        (origin
@@ -1041,6 +1041,7 @@ safety and thread safety guarantees.")
           '(begin
              (for-each delete-file-recursively
                        '("src/llvm-project"
+                         "vendor/jemalloc-sys/jemalloc"
                          "vendor/openssl-src/openssl"
                          "vendor/tikv-jemalloc-sys/jemalloc"
                          ;; These are referenced by the cargo output
@@ -1049,7 +1050,8 @@ safety and thread safety guarantees.")
                          "vendor/curl-sys-0.4.63+curl-8.1.2/curl"
                          "vendor/libffi-sys/libffi"
                          "vendor/libnghttp2-sys/nghttp2"
-                         "vendor/libz-sys/src/zlib"))
+                         "vendor/libz-sys/src/zlib"
+                         "vendor/libz-sys-1.1.9/src/zlib"))
              ;; Use the packaged nghttp2
              (delete-file "vendor/libnghttp2-sys/build.rs")
              (with-output-to-file "vendor/libnghttp2-sys/build.rs"
@@ -1140,7 +1142,12 @@ safety and thread safety guarantees.")
                                  '("fn uplift_dwp_of_bin_on_linux")))
                            (substitute* "cache_lock.rs"
                              ,@(make-ignore-test-list
-                                 '("fn multiple_download")))))))
+                                 '("fn multiple_shared"
+                                   "fn multiple_download"
+                                   "fn download_then_mutate")))
+                           (substitute* "global_cache_tracker.rs"
+                             ,@(make-ignore-test-list
+                                 '("fn package_cache_lock_during_build")))))))
                    `())
              (add-after 'unpack 'disable-tests-broken-on-aarch64
                (lambda _
@@ -1193,7 +1200,7 @@ safety and thread safety guarantees.")
                      ;; The three tests which are known to fail upstream on QEMU
                      ;; emulation on aarch64 and riscv64 also fail on x86_64 in
                      ;; Guix's build system.  Skip them on all builds.
-                     (substitute* "sys/unix/process/process_common/tests.rs"
+                     (substitute* "sys/pal/unix/process/process_common/tests.rs"
                        ;; We can't use make-ignore-test-list because we will get
                        ;; build errors due to the double [ignore] block.
                        (("target_arch = \"arm\"" arm)

gnu/packages/sequoia.scm

@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019, 2020, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,25 +36,57 @@
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages serialization)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tls))
 
+(define-public rust-openpgp-cert-d-0.3
+  (package
+    (name "rust-openpgp-cert-d")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "openpgp-cert-d" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1kk2mr4rsib04cygv7jg55wvdxivakggqsfrn4apnaxxl5aknb0c"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Not all files included.
+       #:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-dirs" ,rust-dirs-5)
+        ("rust-fd-lock" ,rust-fd-lock-3)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-sha1collisiondetection" ,rust-sha1collisiondetection-0.3)
+        ("rust-tempfile" ,rust-tempfile-3)
+        ("rust-thiserror" ,rust-thiserror-1)
+        ("rust-walkdir" ,rust-walkdir-2))
+       #:cargo-development-inputs (("rust-assert-fs" ,rust-assert-fs-1)
+                                   ("rust-predicates" ,rust-predicates-3))))
+    (home-page "https://gitlab.com/sequoia-pgp/pgp-cert-d")
+    (synopsis "Shared OpenPGP Certificate Directory")
+    (description "This package provides the shared code for a @code{OpenPGP}
+Certificate Directory.")
+    (license license:expat)))
+
 (define-public rust-sequoia-autocrypt-0.25
   (package
     (name "rust-sequoia-autocrypt")
-    (version "0.25.0")
+    (version "0.25.1")
     (source (origin
               (method url-fetch)
               (uri (crate-uri "sequoia-autocrypt" version))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0796mn8kwrpfc8qzliwyyy62mrg2w0j6ax8929jwrkibvwy2axi2"))))
+                "0ns121ggmx690m8czhc7zbb7rwz0jjv3l5gw4igs6mn1hznc0kz2"))))
     (build-system cargo-build-system)
     (arguments
      `(#:features '("sequoia-openpgp/crypto-nettle")
        #:cargo-inputs
-       (("rust-base64" ,rust-base64-0.13)
+       (("rust-base64" ,rust-base64-0.21)
         ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))
        #:cargo-development-inputs
        (("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))))
@@ -69,37 +101,34 @@ and decoding of Autocrypt headers and setup messages.  Note: Autocrypt is more
 than just headers; it requires tight integration with the MUA.")
     (license license:lgpl2.0+)))
 
-(define-public rust-sequoia-cert-store-0.3
+(define-public rust-sequoia-cert-store-0.5
   (package
     (name "rust-sequoia-cert-store")
-    (version "0.3.2")
+    (version "0.5.0")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (crate-uri "sequoia-cert-store" version))
+       (method url-fetch)
-              (file-name (string-append name "-" version ".tar.gz"))
+       (uri (crate-uri "sequoia-cert-store" version))
-              (sha256
+       (file-name (string-append name "-" version ".tar.gz"))
-               (base32
+       (sha256
-                "0gmkqn2f23i2xwjwmnaj3dx9l4ir74dyylkw1qsxawxd95i8dk02"))))
+        (base32 "1rjakcnhwdvwrm0952rpi9ky8cxvv5bnmylval49s3a087jqcm76"))))
     (build-system cargo-build-system)
     (arguments
      `(#:features '("sequoia-openpgp/crypto-nettle")
-       #:cargo-inputs
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
-       (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-crossbeam" ,rust-crossbeam-0.8)
-        ("rust-crossbeam" ,rust-crossbeam-0.8)
+                       ("rust-dirs" ,rust-dirs-5)
-        ("rust-dirs" ,rust-dirs-5)
+                       ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-num-cpus" ,rust-num-cpus-1)
+                       ("rust-openpgp-cert-d" ,rust-openpgp-cert-d-0.3)
-        ("rust-once-cell" ,rust-once-cell-1)
+                       ("rust-rayon" ,rust-rayon-1)
-        ("rust-openpgp-cert-d" ,rust-openpgp-cert-d-0.1)
+                       ("rust-rusqlite" ,rust-rusqlite-0.29)
-        ("rust-rayon" ,rust-rayon-1)
+                       ("rust-sequoia-net" ,rust-sequoia-net-0.28)
-        ("rust-rusqlite" ,rust-rusqlite-0.29)
+                       ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
-        ("rust-sequoia-net" ,rust-sequoia-net-0.27)
+                       ("rust-smallvec" ,rust-smallvec-1)
-        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+                       ("rust-thiserror" ,rust-thiserror-1)
-        ("rust-smallvec" ,rust-smallvec-1)
+                       ("rust-tokio" ,rust-tokio-1))
-        ("rust-thiserror" ,rust-thiserror-1)
+       #:cargo-development-inputs (("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
-        ("rust-tokio" ,rust-tokio-1))
+                                   ("rust-tempfile" ,rust-tempfile-3))))
-       #:cargo-development-inputs
-       (("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
-        ("rust-tempfile" ,rust-tempfile-3))))
     (native-inputs
      (list clang pkg-config))
     (inputs
@@ -109,92 +138,197 @@ than just headers; it requires tight integration with the MUA.")
     (description "This package provides a certificate database interface.")
     (license license:lgpl2.0+)))
 
-(define-public rust-sequoia-ipc-0.30
+(define-public rust-sequoia-ipc-0.33
   (package
     (name "rust-sequoia-ipc")
-    (version "0.30.1")
+    (version "0.33.0")
     (source
-      (origin
+     (origin
-        (method url-fetch)
+       (method url-fetch)
-        (uri (crate-uri "sequoia-ipc" version))
+       (uri (crate-uri "sequoia-ipc" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
+       (sha256
-          (base32 "1fgqjwaw9rz74y394i3n2a6y2vvy0214daamzswn5ahidhycm3x3"))))
+        (base32 "0h4b675m6r9r64ibv472fsyqkfh9xbx2wz4jaa4v01ivgsd7k3r1"))))
     (build-system cargo-build-system)
     (arguments
      `(#:features '("sequoia-openpgp/crypto-nettle")
-       #:cargo-inputs
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
-       (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-buffered-reader" ,rust-buffered-reader-1)
-        ("rust-buffered-reader" ,rust-buffered-reader-1)
+                       ("rust-capnp-rpc" ,rust-capnp-rpc-0.19)
-        ("rust-capnp-rpc" ,rust-capnp-rpc-0.14)
+                       ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
-        ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+                       ("rust-ctor" ,rust-ctor-0.2)
-        ("rust-ctor" ,rust-ctor-0.1)
+                       ("rust-dirs" ,rust-dirs-5)
-        ("rust-dirs" ,rust-dirs-4)
+                       ("rust-fs2" ,rust-fs2-0.4)
-        ("rust-fs2" ,rust-fs2-0.4)
+                       ("rust-futures" ,rust-futures-0.3)
-        ("rust-futures" ,rust-futures-0.3)
+                       ("rust-lalrpop" ,rust-lalrpop-0.17)
-        ("rust-lalrpop" ,rust-lalrpop-0.19)
+                       ("rust-lalrpop-util" ,rust-lalrpop-util-0.17)
-        ("rust-lalrpop-util" ,rust-lalrpop-util-0.19)
+                       ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-libc" ,rust-libc-0.2)
-        ("rust-libc" ,rust-libc-0.2)
+                       ("rust-memsec" ,rust-memsec-0.5)
-        ("rust-memsec" ,rust-memsec-0.6)
+                       ("rust-rand" ,rust-rand-0.8)
-        ("rust-rand" ,rust-rand-0.8)
+                       ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
-        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+                       ("rust-socket2" ,rust-socket2-0.5)
-        ("rust-socket2" ,rust-socket2-0.4)
+                       ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-tempfile" ,rust-tempfile-3)
+                       ("rust-thiserror" ,rust-thiserror-1)
-        ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tokio" ,rust-tokio-1)
-        ("rust-tokio" ,rust-tokio-1)
+                       ("rust-tokio-util" ,rust-tokio-util-0.7)
-        ("rust-tokio-util" ,rust-tokio-util-0.7)
+                       ("rust-winapi" ,rust-winapi-0.3))
-        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs (("rust-clap" ,rust-clap-4)
-       #:cargo-development-inputs
+                                   ("rust-quickcheck" ,rust-quickcheck-1)
-       (("rust-clap" ,rust-clap-3)
+                                   ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
-        ("rust-quickcheck" ,rust-quickcheck-1)
+                                   ("rust-tokio" ,rust-tokio-1))))
-        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
-        ("rust-tokio" ,rust-tokio-1))))
     (native-inputs
      (list clang pkg-config))
     (inputs
      (list nettle))
     (home-page "https://sequoia-pgp.org/")
     (synopsis "Interprocess communication infrastructure for Sequoia")
-    (description "Interprocess communication infrastructure for Sequoia")
+    (description
+     "This package provides interprocess communication infrastructure for Sequoia.")
     (license license:lgpl2.0+)))
 
-(define-public rust-sequoia-net-0.27
+(define-public rust-sequoia-keystore-0.2
   (package
-    (name "rust-sequoia-net")
+    (name "rust-sequoia-keystore")
-    (version "0.27.0")
+    (version "0.2.0")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (crate-uri "sequoia-net" version))
+       (method url-fetch)
-              (file-name (string-append name "-" version ".tar.gz"))
+       (uri (crate-uri "sequoia-keystore" version))
-              (sha256
+       (file-name (string-append name "-" version ".tar.gz"))
-               (base32
+       (sha256
-                "0gyk5765hi3s05l64a744f9a4vynfisja92l51az9dpqgfkiw3wn"))))
+        (base32 "11rb2k5v2mc5nf2bafp78nydgcx4gizyxqa9b9lc3d1b73mqv2ad"))))
     (build-system cargo-build-system)
     (arguments
      `(#:features '("sequoia-openpgp/crypto-nettle")
        #:cargo-inputs
        (("rust-anyhow" ,rust-anyhow-1)
-        ("rust-base64" ,rust-base64-0.13)
+        ("rust-capnp" ,rust-capnp-0.19)
-        ("rust-futures-util" ,rust-futures-util-0.3)
+        ("rust-capnpc" ,rust-capnpc-0.19)
-        ("rust-http" ,rust-http-0.2)
+        ("rust-dirs" ,rust-dirs-5)
-        ("rust-hyper" ,rust-hyper-0.14)
+        ("rust-env-logger" ,rust-env-logger-0.10)
-        ("rust-hyper-tls" ,rust-hyper-tls-0.5)
+        ("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-libc" ,rust-libc-0.2)
+        ("rust-log" ,rust-log-0.4)
-        ("rust-native-tls" ,rust-native-tls-0.2)
+        ("rust-paste" ,rust-paste-1)
-        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-sequoia-ipc" ,rust-sequoia-ipc-0.33)
+        ("rust-sequoia-keystore-backend" ,rust-sequoia-keystore-backend-0.2)
+        ("rust-sequoia-keystore-softkeys" ,rust-sequoia-keystore-softkeys-0.2)
         ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
-        ("rust-tempfile" ,rust-tempfile-3)
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-tokio" ,rust-tokio-1)
-        ("rust-trust-dns-client" ,rust-trust-dns-client-0.22)
+        ("rust-tokio-util" ,rust-tokio-util-0.7))
-        ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.22)
-        ("rust-url" ,rust-url-2)
-        ("rust-zbase32" ,rust-zbase32-0.1))
        #:cargo-development-inputs
-       (("rust-hyper" ,rust-hyper-0.14)
+       (("rust-dircpy" ,rust-dircpy-0.3)
-        ("rust-rand" ,rust-rand-0.8)
+        ("rust-env-logger" ,rust-env-logger-0.10)
-        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))))
+        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+        ("rust-test-log" ,rust-test-log-0.2)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+    (native-inputs (list capnproto clang pkg-config))
+    (inputs (list nettle))
+    (home-page "https://sequoia-pgp.org/")
+    (synopsis "Sequoia's private key store server")
+    (description "This package contains sequoia's private key store server.")
+    (license license:lgpl2.0+)))
+
+(define-public rust-sequoia-keystore-backend-0.2
+  (package
+    (name "rust-sequoia-keystore-backend")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sequoia-keystore-backend" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "07v6rc27v0di2v59mixshhc4fkkf1ig0yqkzgqz0v2si4z8slv3s"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:features '("sequoia-openpgp/crypto-nettle")
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-blanket" ,rust-blanket-0.3)
+                       ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+                       ("rust-thiserror" ,rust-thiserror-1))
+       #:cargo-development-inputs
+       (("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))))
+    (native-inputs (list clang pkg-config))
+    (inputs (list nettle))
+    (home-page "https://sequoia-pgp.org/")
+    (synopsis "Traits for private key store backends")
+    (description "This package contains traits for private key store backends.")
+    (license license:lgpl2.0+)))
+
+(define-public rust-sequoia-keystore-softkeys-0.2
+  (package
+    (name "rust-sequoia-keystore-softkeys")
+    (version "0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sequoia-keystore-softkeys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "151f1ai0bxvab8fi314qcybilv4vq26gfdcs3yp7r28xqn9hldw0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:features '("sequoia-openpgp/crypto-nettle")
+       #:cargo-inputs
+       (("rust-anyhow" ,rust-anyhow-1)
+        ("rust-dirs" ,rust-dirs-5)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-sequoia-keystore-backend" ,rust-sequoia-keystore-backend-0.2)
+        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.10)
+        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+        ("rust-test-log" ,rust-test-log-0.2)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3))))
+    (native-inputs (list clang pkg-config))
+    (inputs (list nettle))
+    (home-page "https://sequoia-pgp.org/")
+    (synopsis "In-memory backend for Sequoia's private key store")
+    (description
+     "This package provides a soft key (in-memory key) backend for Sequoia's
+private key store.")
+    (license license:lgpl2.0+)))
+
+(define-public rust-sequoia-net-0.28
+  (package
+    (name "rust-sequoia-net")
+    (version "0.28.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "sequoia-net" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0jw1p8gwf505q6dh1281fl7kmh8mr1f4hswl5crrycwqlq5q3gva"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:features '("sequoia-openpgp/crypto-nettle")
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-base64" ,rust-base64-0.21)
+                       ("rust-futures-util" ,rust-futures-util-0.3)
+                       ("rust-hickory-client" ,rust-hickory-client-0.24)
+                       ("rust-hickory-resolver" ,rust-hickory-resolver-0.24)
+                       ("rust-http" ,rust-http-0.2)
+                       ("rust-hyper" ,rust-hyper-0.14)
+                       ("rust-hyper-tls" ,rust-hyper-tls-0.5)
+                       ("rust-libc" ,rust-libc-0.2)
+                       ("rust-percent-encoding" ,rust-percent-encoding-2)
+                       ("rust-reqwest" ,rust-reqwest-0.11)
+                       ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+                       ("rust-tempfile" ,rust-tempfile-3)
+                       ("rust-thiserror" ,rust-thiserror-1)
+                       ("rust-tokio" ,rust-tokio-1)
+                       ("rust-url" ,rust-url-2)
+                       ("rust-z-base-32" ,rust-z-base-32-0.1))
+       #:cargo-development-inputs (("rust-hyper" ,rust-hyper-0.14)
+                                   ("rust-rand" ,rust-rand-0.8)
+                                   ("rust-reqwest" ,rust-reqwest-0.11)
+                                   ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1))))
     (native-inputs
      (list clang pkg-config))
     (inputs
@@ -208,27 +342,23 @@ HKP protocol, and searching and publishing Web Key Directories.")
 (define-public rust-sequoia-openpgp-1
   (package
     (name "rust-sequoia-openpgp")
-    (version "1.16.0")
+    (version "1.19.0")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "sequoia-openpgp" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "1z0xl7hnm1p51pyhwdqyzcnl2dhzfjnvssz7hi15ps1hk4zzzvrh"))))
+         (base32 "1x3d4yj8mhra8yhcxz6z73pb77pzk0zl1vgxx0yrimzk9b759wgb"))))
     (build-system cargo-build-system)
-    (native-inputs
-     (list clang pkg-config))
-    (inputs
-     (list gmp nettle))
     (arguments
      `(#:features '("crypto-nettle")
        #:cargo-test-flags
        (list "--release" "--"
-             ;; TODO: Figure out how this test is supposed to fail.
+             "--skip=leak_tests::test_ed25519")
-             "--skip=parse::test::panic_on_short_zip")
        #:cargo-inputs
        (("rust-aes" ,rust-aes-0.8)
+        ("rust-aes-gcm" ,rust-aes-gcm-0.10)
         ("rust-anyhow" ,rust-anyhow-1)
         ("rust-base64" ,rust-base64-0.21)
         ("rust-block-padding" ,rust-block-padding-0.3)
@@ -236,25 +366,26 @@ HKP protocol, and searching and publishing Web Key Directories.")
         ("rust-botan" ,rust-botan-0.10)
         ("rust-buffered-reader" ,rust-buffered-reader-1)
         ("rust-bzip2" ,rust-bzip2-0.4)
+        ("rust-camellia" ,rust-camellia-0.1)
         ("rust-cast5" ,rust-cast5-0.11)
         ("rust-cfb-mode" ,rust-cfb-mode-0.8)
         ("rust-chrono" ,rust-chrono-0.4)
         ("rust-cipher" ,rust-cipher-0.4)
         ("rust-des" ,rust-des-0.8)
         ("rust-digest" ,rust-digest-0.10)
+        ("rust-dsa" ,rust-dsa-0.6)
         ("rust-dyn-clone" ,rust-dyn-clone-1)
         ("rust-eax" ,rust-eax-0.5)
         ("rust-ecb" ,rust-ecb-0.1)
         ("rust-ecdsa" ,rust-ecdsa-0.16)
-        ("rust-ed25519" ,rust-ed25519-1)
+        ("rust-ed25519" ,rust-ed25519-2)
-        ("rust-ed25519-dalek" ,rust-ed25519-dalek-1)
+        ("rust-ed25519-dalek" ,rust-ed25519-dalek-2)
         ("rust-flate2" ,rust-flate2-1)
-        ("rust-generic-array" ,rust-generic-array-0.14)
         ("rust-getrandom" ,rust-getrandom-0.2)
         ("rust-idea" ,rust-idea-0.5)
-        ("rust-idna" ,rust-idna-0.3)
+        ("rust-idna" ,rust-idna-0.5)
-        ("rust-lalrpop" ,rust-lalrpop-0.19)
+        ("rust-lalrpop" ,rust-lalrpop-0.20)
-        ("rust-lalrpop-util" ,rust-lalrpop-util-0.19)
+        ("rust-lalrpop-util" ,rust-lalrpop-util-0.20)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-md-5" ,rust-md-5-0.10)
@@ -265,29 +396,30 @@ HKP protocol, and searching and publishing Web Key Directories.")
         ("rust-openssl" ,rust-openssl-0.10)
         ("rust-openssl-sys" ,rust-openssl-sys-0.9)
         ("rust-p256" ,rust-p256-0.13)
-        ("rust-rand" ,rust-rand-0.7)
-        ("rust-rand" ,rust-rand-0.7)
         ("rust-rand" ,rust-rand-0.8)
         ("rust-rand-core" ,rust-rand-core-0.6)
         ("rust-regex" ,rust-regex-1)
-        ("rust-regex-syntax" ,rust-regex-syntax-0.6)
+        ("rust-regex-syntax" ,rust-regex-syntax-0.8)
         ("rust-ripemd" ,rust-ripemd-0.1)
         ("rust-rsa" ,rust-rsa-0.9)
-        ("rust-sha-1" ,rust-sha-1-0.10)
+        ("rust-sha1collisiondetection" ,rust-sha1collisiondetection-0.3)
-        ("rust-sha1collisiondetection" ,rust-sha1collisiondetection-0.2)
         ("rust-sha2" ,rust-sha2-0.10)
         ("rust-thiserror" ,rust-thiserror-1)
         ("rust-twofish" ,rust-twofish-0.7)
         ("rust-typenum" ,rust-typenum-1)
         ("rust-win-crypto-ng" ,rust-win-crypto-ng-0.5)
         ("rust-winapi" ,rust-winapi-0.3)
-        ("rust-x25519-dalek-ng" ,rust-x25519-dalek-ng-1)
+        ("rust-x25519-dalek" ,rust-x25519-dalek-2)
         ("rust-xxhash-rust" ,rust-xxhash-rust-0.8))
        #:cargo-development-inputs
-       (("rust-criterion" ,rust-criterion-0.4)
+       (("rust-criterion" ,rust-criterion-0.5)
         ("rust-quickcheck" ,rust-quickcheck-1)
         ("rust-rand" ,rust-rand-0.8)
-        ("rust-rpassword" ,rust-rpassword-6))))
+        ("rust-rpassword" ,rust-rpassword-7))))
+    (native-inputs
+     (list clang pkg-config))
+    (inputs
+     (list gmp nettle))
     (home-page "https://sequoia-pgp.org/")
     (synopsis "OpenPGP data types and associated machinery")
     (description "This crate aims to provide a complete implementation of
@@ -397,47 +529,43 @@ Although the above appear simple to parse, RFC 2822's whitespace and comment
 rules are rather complex.  This crate implements the whole grammar." )
     (license license:gpl3)))
 
-(define-public rust-sequoia-wot-0.8
+(define-public rust-sequoia-wot-0.11
   (package
     (name "rust-sequoia-wot")
-    (version "0.8.1")
+    (version "0.11.0")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (crate-uri "sequoia-wot" version))
+       (method url-fetch)
-              (file-name (string-append name "-" version ".tar.gz"))
+       (uri (crate-uri "sequoia-wot" version))
-              (sha256
+       (file-name (string-append name "-" version ".tar.gz"))
-               (base32
+       (sha256
-                "0rcp7ndjpdd4dkryhkkhakc8axbj93c1gr9qxxksdvrik803alfg"))))
+        (base32 "0hb17adcqz357ci3d4v57pmywy4giq8591p1vb7p83h56zdk0sfi"))))
     (build-system cargo-build-system)
     (arguments
      `(#:features '("sequoia-openpgp/crypto-nettle")
-       #:cargo-test-flags
+       #:cargo-test-flags '("--release" "--"
-       (list "--release" "--"
+                            ;; Not all files included.
-             ;; Not all files included.
+                            "--skip=gpg_trust_roots")
-             "--skip=gpg_trust_roots")
+       #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1)
-       #:cargo-inputs
+                       ("rust-anyhow" ,rust-anyhow-1)
-       (("rust-anyhow" ,rust-anyhow-1)
+                       ("rust-chrono" ,rust-chrono-0.4)
-        ("rust-chrono" ,rust-chrono-0.4)
+                       ("rust-clap" ,rust-clap-4)
-        ("rust-clap" ,rust-clap-4)
+                       ("rust-clap" ,rust-clap-4)
-        ("rust-clap-complete" ,rust-clap-complete-4)
+                       ("rust-clap-complete" ,rust-clap-complete-4)
-        ("rust-clap-mangen" ,rust-clap-mangen-0.2)
+                       ("rust-clap-mangen" ,rust-clap-mangen-0.2)
-        ("rust-crossbeam" ,rust-crossbeam-0.8)
+                       ("rust-crossbeam" ,rust-crossbeam-0.8)
-        ("rust-dot-writer" ,rust-dot-writer-0.1)
+                       ("rust-dot-writer" ,rust-dot-writer-0.1)
-        ("rust-enumber" ,rust-enumber-0.3)
+                       ("rust-enumber" ,rust-enumber-0.3)
-        ("rust-lazy-static" ,rust-lazy-static-1)
+                       ("rust-num-cpus" ,rust-num-cpus-1)
-        ("rust-num-cpus" ,rust-num-cpus-1)
+                       ("rust-sequoia-cert-store" ,rust-sequoia-cert-store-0.5)
-        ("rust-openpgp-cert-d" ,rust-openpgp-cert-d-0.1)
+                       ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
-        ("rust-sequoia-cert-store" ,rust-sequoia-cert-store-0.3)
+                       ("rust-sequoia-policy-config" ,rust-sequoia-policy-config-0.6)
-        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
+                       ("rust-thiserror" ,rust-thiserror-1))
-        ("rust-sequoia-policy-config" ,rust-sequoia-policy-config-0.6)
+       #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-2)
-        ("rust-thiserror" ,rust-thiserror-1)
+                                   ("rust-predicates" ,rust-predicates-2)
-        ("rust-tokio" ,rust-tokio-1))
+                                   ("rust-quickcheck" ,rust-quickcheck-1)
-       #:cargo-development-inputs
+                                   ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
-       (("rust-assert-cmd" ,rust-assert-cmd-2)
+                                   ("rust-tempfile" ,rust-tempfile-3))))
-        ("rust-predicates" ,rust-predicates-2)
-        ("rust-quickcheck" ,rust-quickcheck-1)
-        ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
-        ("rust-tempfile" ,rust-tempfile-3))))
     (inputs
      (list nettle openssl sqlite))
     (native-inputs
@@ -450,22 +578,17 @@ rules are rather complex.  This crate implements the whole grammar." )
 (define-public sequoia-sq
   (package
     (name "sequoia-sq")
-    (version "0.30.0")
+    (version "0.34.0")
     (source
-      (origin
+     (origin
-        (method url-fetch)
+       (method url-fetch)
-        (uri (crate-uri "sequoia-sq" version))
+       (uri (crate-uri "sequoia-sq" version))
-        (file-name (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
+       (sha256
-          (base32 "0l3mlhvh93b8s1853gyzzfh1dznjdhbsbyxxcm3bbyxmkyr74wkd"))))
+        (base32 "0394xr4wxf5ymc8difnih5s9dpw7rpz9b0n7nnp6782gw65ch6lx"))))
     (build-system cargo-build-system)
-    (inputs
-     (list nettle openssl sqlite))
-    (native-inputs
-     (list clang pkg-config))
     (arguments
-     `(#:tests? #f  ; `(dyn std::fmt::Display + 'static)` cannot be sent between threads safely
+     `(#:install-source? #f
-       #:install-source? #f
        #:cargo-inputs
        (("rust-anyhow" ,rust-anyhow-1)
         ("rust-buffered-reader" ,rust-buffered-reader-1)
@@ -473,27 +596,73 @@ rules are rather complex.  This crate implements the whole grammar." )
         ("rust-chrono" ,rust-chrono-0.4)
         ("rust-clap" ,rust-clap-4)
         ("rust-clap-complete" ,rust-clap-complete-4)
-        ("rust-clap-mangen" ,rust-clap-mangen-0.2)
         ("rust-dirs" ,rust-dirs-5)
         ("rust-dot-writer" ,rust-dot-writer-0.1)
+        ("rust-humantime" ,rust-humantime-2)
+        ("rust-indicatif" ,rust-indicatif-0.17)
         ("rust-itertools" ,rust-itertools-0.10)
-        ("rust-rpassword" ,rust-rpassword-6)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-roff" ,rust-roff-0.2)
+        ("rust-rpassword" ,rust-rpassword-7)
         ("rust-sequoia-autocrypt" ,rust-sequoia-autocrypt-0.25)
-        ("rust-sequoia-cert-store" ,rust-sequoia-cert-store-0.3)
+        ("rust-sequoia-cert-store" ,rust-sequoia-cert-store-0.5)
-        ("rust-sequoia-net" ,rust-sequoia-net-0.27)
+        ("rust-sequoia-keystore" ,rust-sequoia-keystore-0.2)
+        ("rust-sequoia-net" ,rust-sequoia-net-0.28)
         ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
-        ("rust-sequoia-wot" ,rust-sequoia-wot-0.8)
+        ("rust-sequoia-policy-config" ,rust-sequoia-policy-config-0.6)
+        ("rust-sequoia-wot" ,rust-sequoia-wot-0.11)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-subplot-build" ,rust-subplot-build-0.7)
         ("rust-tempfile" ,rust-tempfile-3)
-        ("rust-term-size" ,rust-term-size-0.3)
+        ("rust-termcolor" ,rust-termcolor-1)
+        ("rust-terminal-size" ,rust-terminal-size-0.2)
+        ("rust-textwrap" ,rust-textwrap-0.15)
         ("rust-tokio" ,rust-tokio-1))
        #:cargo-development-inputs
        (("rust-assert-cmd" ,rust-assert-cmd-2)
+        ("rust-dircpy" ,rust-dircpy-0.3)
         ("rust-fehler" ,rust-fehler-1)
+        ("rust-libc" ,rust-libc-0.2)
         ("rust-predicates" ,rust-predicates-2)
-        ("rust-subplotlib" ,rust-subplotlib-0.7))))
+        ("rust-regex" ,rust-regex-1)
+        ("rust-subplotlib" ,rust-subplotlib-0.7))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'set-asset-out-dir
+           (lambda _
+             (setenv "ASSET_OUT_DIR" "target/assets")))
+         (add-after 'install 'install-more
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (share (string-append out "/share"))
+                    (bash-completions-dir
+                     (string-append out "/etc/bash_completion.d"))
+                    (zsh-completions-dir
+                     (string-append share "/zsh/site-functions"))
+                    (fish-completions-dir
+                     (string-append share "/fish/vendor_completions.d"))
+                    (elvish-completions-dir
+                     (string-append share "/elvish/lib"))
+                    (man1 (string-append share "/man/man1")))
+               ;; The completions are generated in build.rs.
+               (mkdir-p bash-completions-dir)
+               (mkdir-p elvish-completions-dir)
+               (for-each (lambda (file)
+                           (install-file file man1))
+                         (find-files "target/assets/man-pages" "\\.1$"))
+               (copy-file "target/assets/shell-completions/sq.bash"
+                          (string-append bash-completions-dir "/sq"))
+               (install-file "target/assets/shell-completions/_sq"
+                             zsh-completions-dir)
+               (install-file "target/assets/shell-completions/sq.fish"
+                             fish-completions-dir)
+               (copy-file "target/assets/shell-completions/sq.elv"
+                          (string-append elvish-completions-dir "/sq"))))))))
+    (inputs
+     (list nettle openssl sqlite))
+    (native-inputs
+     (list capnproto clang pkg-config))
     (home-page "https://sequoia-pgp.org/")
     (synopsis "Command-line frontend for Sequoia OpenPGP")
     (description "This package provides the command-line frontend for Sequoia
@@ -538,10 +707,10 @@ This Guix package is built to use the nettle cryptographic library.")
 
 (define-public sequoia-wot
   (package
-    (inherit rust-sequoia-wot-0.8)
+    (inherit rust-sequoia-wot-0.11)
     (name "sequoia-wot")
     (arguments
-     (substitute-keyword-arguments (package-arguments rust-sequoia-wot-0.8)
+     (substitute-keyword-arguments (package-arguments rust-sequoia-wot-0.11)
        ((#:install-source? _ #t) #f)
        ((#:phases phases '%standard-phases)
         `(modify-phases ,phases
@@ -553,14 +722,16 @@ This Guix package is built to use the nettle cryptographic library.")
                  (for-each (lambda (file)
                              (install-file file man1))
                            (find-files "target/release" "\\.1$"))
-                 ;; TODO: Install _sq-wot.ps1, sq-wot.elv
                  (mkdir-p (string-append out "/etc/bash_completion.d"))
                  (mkdir-p (string-append share "/fish/vendor_completions.d"))
+                 (mkdir-p (string-append share "/elvish/lib"))
                  (copy-file (car (find-files "target/release" "sq-wot.bash"))
                             (string-append out "/etc/bash_completion.d/sq-wot"))
                  (copy-file (car (find-files "target/release" "sq-wot.fish"))
                             (string-append
                               share "/fish/vendor_completions.d/sq-wot.fish"))
+                 (copy-file (car (find-files "target/release" "sq-wot.elv"))
+                            (string-append share "/elvish/lib/sq-wot"))
                  (install-file (car (find-files "target/release" "_sq-wot"))
                                (string-append
                                  share "/zsh/site-functions")))))))))
@@ -573,7 +744,7 @@ This Guix package is built to use the nettle cryptographic library.")))
 (define-public sequoia
   (package
     (name "sequoia")
-    (version "1.16.0")
+    (version "1.19.0")
     (source #f)
     (build-system trivial-build-system)
     (arguments

gnu/packages/syndication.scm

@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2019-2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020, 2023 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
@@ -224,14 +224,14 @@ cards.")
 (define-public newsboat
   (package
     (name "newsboat")
-    (version "2.34")
+    (version "2.35")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://newsboat.org/releases/" version
                            "/newsboat-" version ".tar.xz"))
        (sha256
-        (base32 "0kj3qbm3881fkrplvgnng4747bh29a8f2hhm7a2gc1n9n0wvbmvk"))))
+        (base32 "1i5nil0lwa621ixxp1vwkic56sxsqp46pyq1xw7lrr1qrbv07w7l"))))
     (build-system cargo-build-system)
     (native-inputs
      `(("gettext" ,gettext-minimal)

gnu/packages/version-control.scm

@@ -1635,7 +1635,12 @@ lot easier.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0cgv7chxqkjaqmzi4691in26j2fm8r0vanw8xzb9cqnz6350wvvj"))))
+        (base32 "0cgv7chxqkjaqmzi4691in26j2fm8r0vanw8xzb9cqnz6350wvvj"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin (substitute* (find-files "." "^Cargo\\.toml$")
+                  (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+                   (string-append "\"^" version)))))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-anstyle" ,rust-anstyle-1)

gnu/packages/web.scm

@@ -468,24 +468,24 @@ replacing them with data URIs.")
 (define-public monolith
   (package
     (name "monolith")
-    (version "2.7.0")
+    (version "2.8.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Y2Z/monolith.git")
+             (url "https://github.com/Y2Z/monolith")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ccwjsp8gdgp0wafc3zvlfmx3f58axc1k1ac80qha3g60xccqn56"))))
+        (base32 "0xr63302yb5k9c2sihd1iy97j5c44d4jrzfaiwm81d9li577ih58"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-atty" ,rust-atty-0.2)
-        ("rust-base64" ,rust-base64-0.13)
+        ("rust-base64" ,rust-base64-0.21)
         ("rust-chrono" ,rust-chrono-0.4)
         ("rust-clap" ,rust-clap-3)
-        ("rust-cssparser" ,rust-cssparser-0.29)
+        ("rust-cssparser" ,rust-cssparser-0.33)
         ("rust-encoding-rs" ,rust-encoding-rs-0.8)
         ("rust-html5ever" ,rust-html5ever-0.24)
         ("rust-percent-encoding" ,rust-percent-encoding-2)

guix/build/cargo-build-system.scm

@@ -219,6 +219,7 @@ directory = '" vendor-dir "'") port)
 
   (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
   (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
+  (setenv "ZSTD_SYS_USE_PKG_CONFIG" "1")
   (when (assoc-ref inputs "openssl")
     (setenv "OPENSSL_DIR" (assoc-ref inputs "openssl")))
   (when (assoc-ref inputs "gettext")