From 242062d69b0a7661656a435e12d4049efd3105fa Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 22 Feb 2023 22:37:16 +0200
Subject: gnu: Remove rust-gl-0.11.

* gnu/packages/crates-graphics.scm (rust-gl-0.11): Delete variable.
---
 gnu/packages/crates-graphics.scm | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 2f072354a0..52191fd15a 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -794,25 +794,6 @@ (define-public rust-gl-0.14
     (description "This package provides OpenGL bindings for rust.")
     (license license:asl2.0)))
 
-(define-public rust-gl-0.11
-  (package
-    (inherit rust-gl-0.14)
-    (name "rust-gl")
-    (version "0.11.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "gl" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1wcqpyhck0xriffkmgmldy33lwk2044hb4l02d44vm4fbvicin6p"))))
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-gl-generator" ,rust-gl-generator-0.10))))))
-
 (define-public rust-gl-generator-0.14
   (package
     (name "rust-gl-generator")
-- 
cgit v1.2.3


From 3826ffd107cb6f0adeaeb882ab88a60da4c9ab8b Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 15:49:18 +0200
Subject: gnu: rust-imgref-1: Update to 1.9.4.

* gnu/packages/crates-graphics.scm (rust-imgref-1): Update to 1.9.4.
[arguments]: Don't skip build.
---
 gnu/packages/crates-graphics.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 52191fd15a..324a624ceb 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1305,16 +1305,15 @@ (define-public rust-image-0.20
 (define-public rust-imgref-1
   (package
     (name "rust-imgref")
-    (version "1.7.1")
+    (version "1.9.4")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "imgref" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "19dd5xss3nd40avv8az2kzicpxx71c2akiqznr616hki30w9vj07"))))
+        (base32 "0b3czpz206z4nvpq7yq0v58bwjmqjwjmkr302hbzpp4523glkkxj"))))
     (build-system cargo-build-system)
-    (arguments `(#:skip-build? #t))
     (home-page "https://github.com/kornelski/imgref")
     (synopsis "2D slice of a @code{Vec}")
     (description
-- 
cgit v1.2.3


From 399b091800f66f1123234f8a10a217b17c8dd8e6 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 15:53:05 +0200
Subject: gnu: rust-aom-sys-0.3: Update to 0.3.2.

* gnu/packages/crates-graphics.scm (rust-aom-sys-0.3): Update to 0.3.2.
[cargo-inputs]: Add rust-system-deps-6. Remove rust-metadeps-1. Replace
rust-bindgen-0.54 with 0.61.
---
 gnu/packages/crates-graphics.scm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 324a624ceb..688a61621b 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com>
 ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020, 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com>
 ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
@@ -199,7 +199,7 @@ (define-public rust-ansi-term-0.9
 (define-public rust-aom-sys-0.3
   (package
     (name "rust-aom-sys")
-    (version "0.3.0")
+    (version "0.3.2")
     (source
       (origin
         (method url-fetch)
@@ -207,17 +207,16 @@ (define-public rust-aom-sys-0.3
         (file-name
           (string-append name "-" version ".tar.gz"))
         (sha256
-          (base32
-            "0dhikfl7l5nacspajbllbhhysad3vl845cpfplqgm5mf67nmx9w8"))))
+         (base32 "0swg90iwypakh7vq77zwh34238c1r7vd5smj0vza7dv7xa22wh0g"))))
     (build-system cargo-build-system)
     (arguments
       `(#:cargo-inputs
-        (("rust-bindgen" ,rust-bindgen-0.54)
-         ("rust-metadeps" ,rust-metadeps-1))))
+        (("rust-bindgen" ,rust-bindgen-0.61)
+         ("rust-system-deps" ,rust-system-deps-6))))
     (native-inputs
      (list pkg-config))
     (inputs
-     (list libaom clang llvm))
+     (list clang libaom llvm))
     (home-page "https://github.com/rust-av/aom-rs")
     (synopsis "FFI bindings to aom")
     (description "This package provides FFI bindings to aom.")
-- 
cgit v1.2.3


From 9b4fe91fdf4a5659b3c36f14fb7837aeb1c4f139 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 15:54:28 +0200
Subject: gnu: Add rust-avif-parse-1.

* gnu/packages/crates-graphics.scm (rust-avif-parse-1): New variable.
(rust-avif-parse-0.13): Inherit from rust-avif-parse-1.
---
 gnu/packages/crates-graphics.scm | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 688a61621b..759dfb84a6 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -247,8 +247,38 @@ (define-public rust-ascii-canvas-2
 Mac, and Unix.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-avif-parse-1
+  (package
+    (name "rust-avif-parse")
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "avif-parse" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1vhd4n06g5mbf4sznz67mk352pw9hh97f4ysafp737xvzfd3zyw7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitreader" ,rust-bitreader-0.3)
+        ("rust-byteorder" ,rust-byteorder-1)
+        ("rust-fallible-collections" ,rust-fallible-collections-0.4)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-static-assertions" ,rust-static-assertions-1))
+       #:cargo-development-inputs
+       (("rust-env-logger" ,rust-env-logger-0.9)
+        ("rust-walkdir" ,rust-walkdir-2))))
+    (home-page "https://github.com/kornelski/avif-parse")
+    (synopsis "Parser for AVIF image files")
+    (description "This AVIF parser allows extracting the AV1 payload and alpha
+channel metadata out of AVIF image files.  The parser is a fork of Mozilla's
+MP4 parser used in Firefox, so it's designed to be robust and safely handle
+untrusted data.")
+    (license license:mpl2.0)))
+
 (define-public rust-avif-parse-0.13
   (package
+    (inherit rust-avif-parse-1)
     (name "rust-avif-parse")
     (version "0.13.2")
     (source
@@ -260,7 +290,6 @@ (define-public rust-avif-parse-0.13
        (sha256
         (base32
          "1vylrjq77mpl6flmd85j5f2qimh6vjn03syvq8agb62x56khm0xj"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-bitreader" ,rust-bitreader-0.3)
@@ -270,14 +299,7 @@ (define-public rust-avif-parse-0.13
         ("rust-static-assertions" ,rust-static-assertions-1))
        #:cargo-development-inputs
        (("rust-env-logger" ,rust-env-logger-0.8)
-        ("rust-walkdir" ,rust-walkdir-2))))
-    (home-page "https://github.com/kornelski/avif-parse")
-    (synopsis "Parser for AVIF image files")
-    (description "This AVIF parser allows extracting the AV1 payload and alpha
-channel metadata out of AVIF image files.  The parser is a fork of Mozilla's
-MP4 parser used in Firefox, so it's designed to be robust and safely handle
-untrusted data.")
-    (license license:mpl2.0)))
+        ("rust-walkdir" ,rust-walkdir-2))))))
 
 (define-public rust-avif-serialize-0.6
   (package
-- 
cgit v1.2.3


From 513fbeb22c2c11df4f7015e6e26087128b453bf8 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 15:56:38 +0200
Subject: gnu: Add rust-ravif-0.8.

* gnu/packages/crates-graphics.scm (rust-ravif-0.8): New variable.
(rust-ravif-0.6): Inherit from rust-ravif-0.8.
---
 gnu/packages/crates-graphics.scm | 44 ++++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 759dfb84a6..f8526d5237 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -36,12 +36,14 @@ (define-module (gnu packages crates-graphics)
   #:use-module (guix packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages assembly)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages crates-io)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages video))
 
 ;;;
@@ -1853,8 +1855,43 @@ (define-public rust-png-0.12
         ("rust-glob" ,rust-glob-0.2)
         ("rust-term" ,rust-term-0.4))))))
 
+(define-public rust-ravif-0.8
+  (package
+    (name "rust-ravif")
+    (version "0.8.10+rust-1.67.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "ravif" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1r3s78781kb9lwysdvpdc80gavly33dcs4inhhp2dawml9g3rjss"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-avif-serialize" ,rust-avif-serialize-0.7)
+        ("rust-imgref" ,rust-imgref-1)
+        ("rust-loop9" ,rust-loop9-0.1)
+        ("rust-num-cpus" ,rust-num-cpus-1)
+        ("rust-quick-error" ,rust-quick-error-2)
+        ("rust-rav1e" ,rav1e)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-rgb" ,rust-rgb-0.8))
+       #:cargo-development-inputs
+       (("rust-avif-parse" ,rust-avif-parse-1))))
+    (native-inputs
+     (list nasm pkg-config))
+    (inputs
+     (list libgit2 zlib))
+    (home-page "https://lib.rs/ravif")
+    (synopsis "Rust library for encoding images in AVIF format")
+    (description
+     "This package provides a rav1e-based pure Rust library for encoding images in
+AVIF format (powers the `cavif` tool).")
+    (license license:bsd-3)))
+
 (define-public rust-ravif-0.6
   (package
+    (inherit rust-ravif-0.8)
     (name "rust-ravif")
     (version "0.6.4")
     (source
@@ -1864,7 +1901,6 @@ (define-public rust-ravif-0.6
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1gyc7w1fz3qdk95cdpkj185dm6lskxfp329xm69waxc565fcz9rx"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-avif-serialize" ,rust-avif-serialize-0.6)
@@ -1878,11 +1914,7 @@ (define-public rust-ravif-0.6
        (("rust-avif-parse" ,rust-avif-parse-0.13))))
     (native-inputs
      (list nasm))                 ;for building rav1e
-    (home-page "https://lib.rs/ravif")
-    (synopsis "Library for encoding images in AVIF format")
-    (description "This package is a rav1e-based pure Rust library for encoding
-images in AVIF format.")
-    (license license:bsd-3)))
+    (inputs '())))
 
 (define-public rust-raw-window-handle-0.4
   (package
-- 
cgit v1.2.3


From 0a21d32b5def80a8292c2176c95cfe79ea292259 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 15:57:35 +0200
Subject: gnu: Add rust-avif-serialize-0.7.

* gnu/packages/crates-graphics.scm (rust-avif-serialize-0.7): New
variable.
(rust-avif-serialize-0.6): Inherit from rust-avif-serialize-0.7.
---
 gnu/packages/crates-graphics.scm | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index f8526d5237..7051e7dba6 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -303,8 +303,33 @@ (define-public rust-avif-parse-0.13
        (("rust-env-logger" ,rust-env-logger-0.8)
         ("rust-walkdir" ,rust-walkdir-2))))))
 
+(define-public rust-avif-serialize-0.7
+  (package
+    (name "rust-avif-serialize")
+    (version "0.7.7")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "avif-serialize" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "0d2makdw756978i8s3qhlhh1h91y5maxriay6r4kmsmk8pky2qfc"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f              ; Undeclared dependencies
+       #:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.7))
+       #:cargo-development-inputs (("rust-avif-parse" ,rust-avif-parse-1))))
+    (home-page "https://lib.rs/avif-serialize")
+    (synopsis "Writer for AVIF header structure (MPEG/HEIF/MIAF/ISO-BMFF)")
+    (description
+     "This package provides a minimal writer for AVIF header structure.  This
+is a tiny alternative to @code{libavif}.  It creates the jungle of
+MPEG/HEIF/MIAF/ISO-BMFF ``boxes'' as appropriate for AVIF files.  It supports
+alpha channel embedding.")
+    (license license:bsd-3)))
+
 (define-public rust-avif-serialize-0.6
   (package
+    (inherit rust-avif-serialize-0.7)
     (name "rust-avif-serialize")
     (version "0.6.5")
     (source
@@ -314,19 +339,10 @@ (define-public rust-avif-serialize-0.6
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "130wq838lslkcqcp2kjci7q3aq9qpir07pvxndc81xqbn63wvdjg"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-arrayvec" ,rust-arrayvec-0.5))))
-    (home-page "https://lib.rs/avif-serialize")
-    (synopsis "Writer for AVIF header structure (MPEG/HEIF/MIAF/ISO-BMFF)")
-    (description
-     "This package provides a minimal writer for AVIF header structure.  This
-is a tiny alternative to @code{libavif}.  It creates the jungle of
-MPEG/HEIF/MIAF/ISO-BMFF ``boxes'' as appropriate for AVIF files.  It supports
-alpha channel embedding.")
-    (license license:bsd-3)))
+       (("rust-arrayvec" ,rust-arrayvec-0.5))))))
 
 (define-public rust-cgl-0.3
   (package
-- 
cgit v1.2.3


From 89fb778831206863f44cf5a70529e58cad1189d1 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 15:58:52 +0200
Subject: gnu: Add rust-dav1d-sys-0.7.

* gnu/packages/crates-graphics.scm (rust-dav1d-sys-0.7): New variable.
(rust-dav1d-sys-0.3): Inherit from rust-dav1d-sys-0.7.
---
 gnu/packages/crates-graphics.scm | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 7051e7dba6..ed18568579 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -613,10 +613,35 @@ (define-public rust-core-video-sys-0.1
 and iOS.")
     (license license:expat)))
 
+(define-public rust-dav1d-sys-0.7
+  (package
+    (name "rust-dav1d-sys")
+    (version "0.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "dav1d-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "16gzjsfnvfd5zr8mrx5n9mdd4vjvwfwpk9hfscgz7sjyzjdjzcm0"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-system-deps" ,rust-system-deps-6))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list dav1d))
+    (home-page "https://github.com/rust-av/dav1d-rs")
+    (synopsis "FFI bindings to dav1d")
+    (description "This package provides FFI bindings to dav1d.")
+    (license license:expat)))
+
 (define-public rust-dav1d-sys-0.3
   (package
+    (inherit rust-dav1d-sys-0.7)
     (name "rust-dav1d-sys")
-    (version "0.3.4")
+    (version "0.3.5")
     (source
      (origin
        (method url-fetch)
@@ -624,20 +649,15 @@ (define-public rust-dav1d-sys-0.3
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "020lla2l703iy69gbksq18snj2b1sp7vmjf39qqykd4242d4msr5"))))
-    (build-system cargo-build-system)
+        (base32 "10y8637snqc3kb9mhs8p9zi8171ba2hlbvhk06vs6hfifx60rr48"))))
     (arguments
      `(#:cargo-inputs
-       (("rust-bindgen" ,rust-bindgen-0.58)
-        ("rust-system-deps" ,rust-system-deps-3))))
+       (("rust-bindgen" ,rust-bindgen-0.59)
+        ("rust-system-deps" ,rust-system-deps-6))))
     (native-inputs
      (list pkg-config))
     (inputs
-     (list dav1d clang llvm))
-    (home-page "https://github.com/rust-av/dav1d-rs")
-    (synopsis "FFI bindings to dav1d")
-    (description "This package provides FFI bindings to dav1d.")
-    (license license:expat)))
+     (list dav1d clang llvm))))
 
 (define-public rust-euclid-0.22
   (package
-- 
cgit v1.2.3


From 43d8c6b5717ee680f2ec6cd095a2335cf7854a9c Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 15:59:23 +0200
Subject: gnu: Add rust-dcv-color-primitives-0.4.

* gnu/packages/crates-graphics.scm (rust-dcv-color-primitives-0.4): New
variable.
---
 gnu/packages/crates-graphics.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index ed18568579..739301296d 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -659,6 +659,33 @@ (define-public rust-dav1d-sys-0.3
     (inputs
      (list dav1d clang llvm))))
 
+(define-public rust-dcv-color-primitives-0.4
+  (package
+    (name "rust-dcv-color-primitives")
+    (version "0.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "dcv-color-primitives" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "01c0ag8dwzz00hyq9qam9d5j6yzdh8xpidcn37vgkzlmhgfz8mql"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-paste" ,rust-paste-1)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-getrandom" ,rust-getrandom-0.2)
+        ("rust-itertools" ,rust-itertools-0.10)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/aws/dcv-color-primitives")
+    (synopsis "Library to perform image color model conversion")
+    (description
+     "This package provides a library to perform image color model conversion.")
+    (license license:expat-0)))
+
 (define-public rust-euclid-0.22
   (package
     (name "rust-euclid")
-- 
cgit v1.2.3


From 1bbddd411e8745187b027126755e5a78902585cb Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 16:00:12 +0200
Subject: gnu: Add rust-image-0.24.

* gnu/packages/crates-graphics.scm (rust-image-0.24): New variable.
(rust-image-0.23): Inherit from rust-image-0.24.
---
 gnu/packages/crates-graphics.scm | 55 ++++++++++++++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 8 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 739301296d..ba517cdaa8 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1259,8 +1259,54 @@ (define-public rust-ical-0.7
 similar formats like VCard.")
     (license license:asl2.0)))
 
+(define-public rust-image-0.24
+  (package
+    (name "rust-image")
+    (version "0.24.5")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "image" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "0iarjrn9rimnri1g0hagdzljq3v9fy6gy7qlmz80yyskkfafmdv9"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f              ; Not all files included.
+       #:cargo-inputs
+       (("rust-bytemuck" ,rust-bytemuck-1)
+        ("rust-byteorder" ,rust-byteorder-1)
+        ("rust-color-quant" ,rust-color-quant-1)
+        ("rust-dav1d" ,rust-dav1d-0.6)
+        ("rust-dcv-color-primitives" ,rust-dcv-color-primitives-0.4)
+        ("rust-exr" ,rust-exr-1)
+        ("rust-gif" ,rust-gif-0.11)
+        ("rust-jpeg-decoder" ,rust-jpeg-decoder-0.3)
+        ("rust-mp4parse" ,rust-mp4parse-0.12)
+        ("rust-num-rational" ,rust-num-rational-0.4)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-png" ,rust-png-0.17)
+        ("rust-ravif" ,rust-ravif-0.8)
+        ("rust-rgb" ,rust-rgb-0.8)
+        ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
+        ("rust-tiff" ,rust-tiff-0.8)
+        ("rust-webp" ,rust-webp-0.2))
+       #:cargo-development-inputs
+       (("rust-crc32fast" ,rust-crc32fast-1)
+        ("rust-criterion" ,rust-criterion-0.3)
+        ("rust-glob" ,rust-glob-0.3)
+        ("rust-jpeg-decoder" ,rust-jpeg-decoder-0.3)
+        ("rust-num-complex" ,rust-num-complex-0.4)
+        ("rust-quickcheck" ,rust-quickcheck-1))))
+    (home-page "https://github.com/image-rs/image")
+    (synopsis "Imaging library written in Rust")
+    (description
+     "This package is an imaging library written in Rust.  It provides basic
+filters and decoders for the most common image formats.")
+    (license license:expat)))
+
 (define-public rust-image-0.23
   (package
+    (inherit rust-image-0.24)
     (name "rust-image")
     (version "0.23.14")
     (source
@@ -1270,7 +1316,6 @@ (define-public rust-image-0.23
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "18gn2f7xp30pf9aqka877knlq308khxqiwjvsccvzaa4f9zcpzr4"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -1286,13 +1331,7 @@ (define-public rust-image-0.23
         ("rust-ravif" ,rust-ravif-0.6)
         ("rust-rgb" ,rust-rgb-0.8)
         ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)
-        ("rust-tiff" ,rust-tiff-0.6))))
-    (home-page "https://github.com/image-rs/image")
-    (synopsis "Imaging library written in Rust")
-    (description
-     "This package is an imaging library written in Rust.  It provides basic
-filters and decoders for the most common image formats.")
-    (license license:expat)))
+        ("rust-tiff" ,rust-tiff-0.6))))))
 
 (define-public rust-image-0.22
   (package
-- 
cgit v1.2.3


From 8a842b531a38b6d837a73fcf36c9b9c3bfe82790 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 16:01:05 +0200
Subject: gnu: Add rust-jpeg-decoder-0.3.

* gnu/packages/crates-graphics.scm (rust-jpeg-decoder-0.3): New variable.
(rust-jpeg-decoder-0.1): Inherit from rust-jpeg-decoder-0.3.
---
 gnu/packages/crates-graphics.scm | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index ba517cdaa8..18b852a8a8 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1446,8 +1446,40 @@ (define-public rust-imgref-1
 pixel buffers with width, height and stride.")
     (license license:cc0)))
 
+(define-public rust-jpeg-decoder-0.3
+  (package
+    (name "rust-jpeg-decoder")
+    (version "0.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "jpeg-decoder" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "0gkv0zx95i4fr40fj1a10d70lqi6lfyia8r5q8qjxj8j4pj0005w"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (substitute* "Cargo.toml"
+                    (("=0\\.2\\.83") "^0.2.83"))))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f                  ; Not all files included
+       #:cargo-inputs
+       (("rust-rayon" ,rust-rayon-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-png" ,rust-png-0.16)
+        ("rust-walkdir" ,rust-walkdir-2)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+    (home-page "https://github.com/image-rs/jpeg-decoder")
+    (synopsis "JPEG decoder")
+    (description "JPEG decoder written in Rust.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-jpeg-decoder-0.1
   (package
+    (inherit rust-jpeg-decoder-0.3)
     (name "rust-jpeg-decoder")
     (version "0.1.22")
     (source
@@ -1458,7 +1490,6 @@ (define-public rust-jpeg-decoder-0.1
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1wnh0bmmswpgwhgmlizz545x8334nlbmkq8imy9k224ri3am7792"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:tests? #f      ; Some test files missing.
        #:cargo-inputs
@@ -1467,11 +1498,7 @@ (define-public rust-jpeg-decoder-0.1
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
         ("rust-png" ,rust-png-0.14)
-        ("rust-walkdir" ,rust-walkdir-2))))
-    (home-page "https://github.com/image-rs/jpeg-decoder")
-    (synopsis "JPEG decoder")
-    (description "JPEG decoder written in Rust.")
-    (license (list license:expat license:asl2.0))))
+        ("rust-walkdir" ,rust-walkdir-2))))))
 
 (define-public rust-line-drawing-0.7
   (package
-- 
cgit v1.2.3


From ecea49426c4dc68ca339be36d9fbcbc9b5d5a904 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 16:01:49 +0200
Subject: gnu: rust-png-0.17: Update to 0.17.7.

* gnu/packages/crates-graphics.scm (rust-png-0.17): Update to 0.17.7.
[cargo-inputs]: Replace rust-miniz-oxide-0.5 with 0.6.
---
 gnu/packages/crates-graphics.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 18b852a8a8..1d49d37ad7 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1849,14 +1849,14 @@ (define-public rust-pistoncore-window-0.44
 (define-public rust-png-0.17
   (package
     (name "rust-png")
-    (version "0.17.5")
+    (version "0.17.7")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "png" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1fp3vnaxmjdv71dcakc21k07ir5s31dlx1mrazfqddzgaynw0f6w"))))
+        (base32 "0f66slx641p7an277xskz8vq7syy9cmhsx1qwnfb268ahspqww2x"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #false                  ;XXX missing files in tarball
@@ -1864,7 +1864,7 @@ (define-public rust-png-0.17
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-crc32fast" ,rust-crc32fast-1)
         ("rust-deflate" ,rust-deflate-1)
-        ("rust-miniz-oxide" ,rust-miniz-oxide-0.5))
+        ("rust-miniz-oxide" ,rust-miniz-oxide-0.6))
        #:cargo-development-inputs
        (("rust-criterion" ,rust-criterion-0.3)
         ("rust-getopts" ,rust-getopts-0.2)
-- 
cgit v1.2.3


From 2188e64c38e7e19a594938c9faac09c5226c6e4f Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 16:02:41 +0200
Subject: gnu: rust-rgb-0.8: Update to 0.8.36.

* gnu/packages/crates-graphics.scm (rust-rgb-0.8): Update to 0.8.36.
---
 gnu/packages/crates-graphics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 1d49d37ad7..d924b5824d 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2087,7 +2087,7 @@ (define-public rust-raw-window-handle-0.3
 (define-public rust-rgb-0.8
   (package
     (name "rust-rgb")
-    (version "0.8.25")
+    (version "0.8.36")
     (source
      (origin
        (method url-fetch)
@@ -2095,7 +2095,7 @@ (define-public rust-rgb-0.8
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1lrv3x5h1lvdzg1qqr8aiysz978m35zpjdkyicnvkarnh8zkqzr8"))))
+         "0ncgzkgifbyfx7vpnygfl4mgpdhhbaywxybx6pnjraf77wz2vv10"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
cgit v1.2.3


From ca6aed0889e7284266347336587c7c08e95eb644 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 16:03:35 +0200
Subject: gnu: Add rust-tiff-0.8.

* gnu/packages/crates-graphics.scm (rust-tiff-0.8): New variable.
(rust-tiff-0.6): Inherit from rust-tiff-0.8.
---
 gnu/packages/crates-graphics.scm | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index d924b5824d..3f0c1bb8e8 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2256,8 +2256,34 @@ (define-public rust-smithay-clipboard-0.6
 applications.")
     (license license:expat)))
 
+(define-public rust-tiff-0.8
+  (package
+    (name "rust-tiff")
+    (version "0.8.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "tiff" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "0wg4a6w8sakyy0mggblg340mx8bgglx9hwsxsn8g5fpjkx7k6jbl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f              ; Not all files included
+       #:cargo-inputs
+       (("rust-flate2" ,rust-flate2-1)
+        ("rust-jpeg-decoder" ,rust-jpeg-decoder-0.3)
+        ("rust-weezl" ,rust-weezl-0.1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3))))
+    (home-page "https://github.com/image-rs/image-tiff")
+    (synopsis "TIFF decoding and encoding library in pure Rust")
+    (description
+     "This package provides TIFF decoding and encoding library in pure Rust.")
+    (license license:expat)))
+
 (define-public rust-tiff-0.6
   (package
+    (inherit rust-tiff-0.8)
     (name "rust-tiff")
     (version "0.6.1")
     (source
@@ -2267,18 +2293,12 @@ (define-public rust-tiff-0.6
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0ds48vs919ccxa3fv1www7788pzkvpg434ilqkq7sjb5dmqg8lws"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
        (("rust-jpeg-decoder" ,rust-jpeg-decoder-0.1)
         ("rust-miniz-oxide" ,rust-miniz-oxide-0.4)
-        ("rust-weezl" ,rust-weezl-0.1))))
-    (home-page "https://github.com/image-rs/image-tiff")
-    (synopsis "TIFF decoding and encoding library in pure Rust")
-    (description
-     "This package provides TIFF decoding and encoding library in pure Rust.")
-    (license license:expat)))
+        ("rust-weezl" ,rust-weezl-0.1))))))
 
 (define-public rust-tiff-0.5
   (package
-- 
cgit v1.2.3


From eb8f7f6c0c5297e83346e9a28eb1089804433440 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 17:15:14 +0200
Subject: gnu: Add rust-webp-0.2.

* gnu/packages/crates-graphics.scm (rust-webp-0.2): New variable.
---
 gnu/packages/crates-graphics.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 3f0c1bb8e8..7fd0187e82 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -3088,6 +3088,28 @@ (define-public rust-wayland-sys-0.21
         (base32
          "0a0ndgkg98pvmkv44yya4f7mxzjaxylknqh64bpa05w0azyv02jj"))))))
 
+(define-public rust-webp-0.2
+  (package
+    (name "rust-webp")
+    (version "0.2.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "webp" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1bhw6xp7vg4rx7flxgzvdzk21q2dx1bsn06h0yj7jq0n3y12y0ng"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-image" ,rust-image-0.24)
+        ("rust-libwebp-sys" ,rust-libwebp-sys-0.4))
+       #:cargo-development-inputs
+       (("rust-image" ,rust-image-0.24))))
+    (home-page "https://github.com/jaredforth/webp")
+    (synopsis "WebP conversion library")
+    (description "This package procides a WebP conversion library.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-winit-0.26
   (package
     (name "rust-winit")
-- 
cgit v1.2.3


From 62cfe906d79e3676ec95fe17fd82c2618a7cd43b Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 17:15:15 +0200
Subject: gnu: Add rust-mp4parse-0.12.

* gnu/packages/crates-graphics.scm (rust-mp4parse-0.12): New variable.
---
 gnu/packages/crates-graphics.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 7fd0187e82..52fa5a00f4 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1605,6 +1605,36 @@ (define-public rust-lyon-svg-0.17
     (description "This package provides SVG helpers for the lyon crates.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-mp4parse-0.12
+  (package
+    (name "rust-mp4parse")
+    (version "0.12.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "mp4parse" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1ppqv60qiyrnbb996gb1sik08c0j2i317llv3rrcwb1cjg3bdlk7"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f              ; Not all files included.
+       #:cargo-inputs
+       (("rust-bitreader" ,rust-bitreader-0.3)
+        ("rust-byteorder" ,rust-byteorder-1)
+        ("rust-env-logger" ,rust-env-logger-0.8)
+        ("rust-fallible-collections" ,rust-fallible-collections-0.4)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-num-traits" ,rust-num-traits-0.2)
+        ("rust-static-assertions" ,rust-static-assertions-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3)
+        ("rust-test-assembler" ,rust-test-assembler-0.1)
+        ("rust-walkdir" ,rust-walkdir-2))))
+    (home-page "https://github.com/mozilla/mp4parse-rust")
+    (synopsis "Parser for ISO base media file format (mp4)")
+    (description "Parser for ISO base media file format (mp4)")
+    (license license:mpl2.0)))
+
 (define-public rust-osmesa-sys-0.1
   (package
     (name "rust-osmesa-sys")
-- 
cgit v1.2.3


From b5e5b5c419747e1e2b72ea78c3cf11c40f6a1e70 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 17:15:15 +0200
Subject: gnu: Add rust-libwebp-sys-0.4.

* gnu/packages/crates-graphics.scm (rust-libwebp-sys-0.4): New variable.
---
 gnu/packages/crates-graphics.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 52fa5a00f4..eab90e3851 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1500,6 +1500,28 @@ (define-public rust-jpeg-decoder-0.1
         ("rust-png" ,rust-png-0.14)
         ("rust-walkdir" ,rust-walkdir-2))))))
 
+(define-public rust-libwebp-sys-0.4
+  (package
+    (name "rust-libwebp-sys")
+    (version "0.4.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "libwebp-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1gvjaqhjpzdskx8x4q1lfgw24jnbjgkx4s6dxpkkg2d2ba4d37s3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-test-flags
+       '("--release" "--"
+         "--skip=tests::poke")
+       #:cargo-inputs
+       (("rust-cc" ,rust-cc-1))))
+    (home-page "https://github.com/NoXF/libwebp-sys")
+    (synopsis "Bindings to libwebp (bindgen, static linking)")
+    (description "Bindings to libwebp (bindgen, static linking)")
+    (license license:expat)))
+
 (define-public rust-line-drawing-0.7
   (package
     (name "rust-line-drawing")
-- 
cgit v1.2.3


From 59f6ab72fa775d193b89f3e8f6d32f563cc2422f Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 17:15:15 +0200
Subject: gnu: Remove rust-gl-generator-0.10.

* gnu/packages/crates-graphics.scm (rust-gl-generator-0.10): Delete variable.
---
 gnu/packages/crates-graphics.scm | 27 ---------------------------
 1 file changed, 27 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index eab90e3851..568c5a5a98 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -935,33 +935,6 @@ (define-public rust-gl-generator-0.11
        (base32
         "1gdchvay0k0g931b2ki33mkfixcw4radk5b8sqsm29rahxg3v8ir"))))))
 
-(define-public rust-gl-generator-0.10
-  (package
-    (name "rust-gl-generator")
-    (version "0.10.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "gl_generator" version))
-        (file-name
-         (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "0146yd4i9wbgfrhnkc04w7n7civbanznc0q87skp6v7p7hbszzx0"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-log" ,rust-log-0.4)
-        ("rust-xml-rs" ,rust-xml-rs-0.8)
-        ("rust-khronos-api" ,rust-khronos-api-3))))
-    (home-page "https://github.com/brendanzab/gl-rs/")
-    (synopsis
-     "Code generators for creating bindings to the Khronos OpenGL APIs")
-    (description
-     "Code generators for creating bindings to the Khronos OpenGL APIs.")
-    (license license:asl2.0)))
-
 (define-public rust-gleam-0.6
   (package
     (name "rust-gleam")
-- 
cgit v1.2.3


From 2149f80dfec0c3a6225d0cd4d71a0c385556421b Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 17:15:16 +0200
Subject: gnu: Add rust-exr-1.

* gnu/packages/crates-graphics.scm (rust-exr-1): New variable.
---
 gnu/packages/crates-graphics.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 568c5a5a98..cee6b029fd 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -759,6 +759,39 @@ (define-public rust-eui48-0.3
        (("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
         ("rust-serde" ,rust-serde-1))))))
 
+(define-public rust-exr-1
+  (package
+    (name "rust-exr")
+    (version "1.5.3")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "exr" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1ssgq9zkf53mhwvhj9khvrlh0f9h3dl1pg7cs0irvn1fgvs5xbz8"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f                  ; Not all files included
+       #:cargo-inputs
+       (("rust-bit-field" ,rust-bit-field-0.10)
+        ("rust-flume" ,rust-flume-0.10)
+        ("rust-half" ,rust-half-2)
+        ("rust-lebe" ,rust-lebe-0.5)
+        ("rust-miniz-oxide" ,rust-miniz-oxide-0.6)
+        ("rust-smallvec" ,rust-smallvec-1)
+        ("rust-threadpool" ,rust-threadpool-1)
+        ("rust-zune-inflate" ,rust-zune-inflate-0.2))
+       #:cargo-development-inputs
+       (("rust-bencher" ,rust-bencher-0.1)
+        ("rust-image" ,rust-image-0.24)
+        ("rust-rand" ,rust-rand-0.8)
+        ("rust-rayon" ,rust-rayon-1)
+        ("rust-walkdir" ,rust-walkdir-2))))
+    (home-page "https://github.com/johannesvollmer/exrs")
+    (synopsis "Read and write OpenEXR files without any unsafe code")
+    (description "Read and write OpenEXR files without any unsafe code")
+    (license license:bsd-3)))
+
 (define-public rust-gfx-0.18
   (package
     (name "rust-gfx")
-- 
cgit v1.2.3


From e32e9aa251930114f4f2415cde78c898be6dc5fa Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 23 Feb 2023 17:15:16 +0200
Subject: gnu: Add rust-dav1d-0.6.

* gnu/packages/crates-graphics.scm (rust-dav1d-0.6): New variable.
---
 gnu/packages/crates-graphics.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index cee6b029fd..1410a44e77 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -613,6 +613,30 @@ (define-public rust-core-video-sys-0.1
 and iOS.")
     (license license:expat)))
 
+(define-public rust-dav1d-0.6
+  (package
+    (name "rust-dav1d")
+    (version "0.6.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "dav1d" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0qz2lx37pmx798lysgh6k5lk5y20ckr7pp8c1p6v2z0p721i913j"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-dav1d-sys" ,rust-dav1d-sys-0.3))))
+    (native-inputs
+     (list pkg-config))
+    (inputs
+     (list dav1d clang llvm))
+    (home-page "https://github.com/rust-av/dav1d-rs")
+    (synopsis "Libdav1d bindings")
+    (description "This package provides libdav1d bindings in rust.")
+    (license license:expat)))
+
 (define-public rust-dav1d-sys-0.7
   (package
     (name "rust-dav1d-sys")
-- 
cgit v1.2.3


From 8bf2bd753239570e2d558d8b566370e2c2db8be8 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:08:33 +0300
Subject: gnu: Add rust-glutin-0.30.

* gnu/packages/crates-graphics.scm (rust-glutin-0.30): New variable.
(rust-glutin-0.28): Inherit from rust-glutin-0.30.
---
 gnu/packages/crates-graphics.scm | 42 ++++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 1410a44e77..56c7780342 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1015,8 +1015,43 @@ (define-public rust-gleam-0.6
      "Generated OpenGL bindings and wrapper for Servo.")
     (license (list license:asl2.0 license:expat))))
 
+(define-public rust-glutin-0.30
+  (package
+    (name "rust-glutin")
+    (version "0.30.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "glutin" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "05gzw9icj4s0p9db9srnwrd3m3plcs7260jlblyy2pbiqygap6zq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-cfg-aliases" ,rust-cfg-aliases-0.1)
+        ("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-glx-sys" ,rust-glutin-glx-sys-0.4)
+        ("rust-glutin-wgl-sys" ,rust-glutin-wgl-sys-0.4)
+        ("rust-libloading" ,rust-libloading-0.7)
+        ("rust-objc2" ,rust-objc2-0.3)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-raw-window-handle" ,rust-raw-window-handle-0.5)
+        ("rust-wayland-sys" ,rust-wayland-sys-0.30)
+        ("rust-windows-sys" ,rust-windows-sys-0.45)
+        ("rust-x11-dl" ,rust-x11-dl-2))))
+    (home-page "https://github.com/tomaka/glutin")
+    (synopsis "Cross-platform OpenGL context provider")
+    (description "This package provides an OpenGL context provider.")
+    (license license:asl2.0)))
+
 (define-public rust-glutin-0.28
   (package
+    (inherit rust-glutin-0.30)
     (name "rust-glutin")
     (version "0.28.0")
     (source
@@ -1026,7 +1061,6 @@ (define-public rust-glutin-0.28
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "1lpnf61x4jbm55bpdr10k1a1pl3cs719i9y4qibsdj2bajz9vsh0"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-android-glue" ,rust-android-glue-0.2)
@@ -1048,11 +1082,7 @@ (define-public rust-glutin-0.28
         ("rust-winapi" ,rust-winapi-0.3)
         ("rust-winit" ,rust-winit-0.26))))
     (inputs
-     (list rust-wayland-client-0.29 rust-wayland-egl-0.29))
-    (home-page "https://github.com/tomaka/glutin")
-    (synopsis "Cross-platform OpenGL context provider")
-    (description "This package provides an OpenGL context provider.")
-    (license license:asl2.0)))
+     (list rust-wayland-client-0.29 rust-wayland-egl-0.29))))
 
 (define-public rust-glutin-0.26
   (package
-- 
cgit v1.2.3


From ec98868f2cf76319f355db35e3cb768b23c75065 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:09:55 +0300
Subject: gnu: rust-wayland-client-0.29: Update to 0.29.5.

* gnu/packages/crates-graphics.scm (rust-wayland-client-0.29): Update to
0.29.5.
[cargo-inputs]: Replace rust-nix-0.22 with 0.24. Add
rust-wayland-sys-0.29.
[inputs]: Replace rust-nix-0.22 with 0.24.
---
 gnu/packages/crates-graphics.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 56c7780342..a5983529b0 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2481,14 +2481,14 @@ (define-public rust-tiff-0.2
 (define-public rust-wayland-client-0.29
   (package
     (name "rust-wayland-client")
-    (version "0.29.4")
+    (version "0.29.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-client" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "13s5sj9344izk2g48yizk81kcg8jg4940gg2v6bzcmrjwxh388li"))))
+        (base32 "05b7qikqj22rjy17kqw5ar7j2chpy18dr0gqapvwjfd00n60cfrz"))))
     (build-system cargo-build-system)
     (arguments
      `(#:tests? #false               ;circular dependency on wayland-protocols
@@ -2496,17 +2496,18 @@ (define-public rust-wayland-client-0.29
        (("rust-bitflags" ,rust-bitflags-1)
         ("rust-downcast-rs" ,rust-downcast-rs-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-nix" ,rust-nix-0.22)
+        ("rust-nix" ,rust-nix-0.24)
         ("rust-scoped-tls" ,rust-scoped-tls-1)
         ("rust-wayland-commons" ,rust-wayland-commons-0.29)
-        ("rust-wayland-scanner" ,rust-wayland-scanner-0.29))
+        ("rust-wayland-scanner" ,rust-wayland-scanner-0.29)
+        ("rust-wayland-sys" ,rust-wayland-sys-0.29))
        #:cargo-development-inputs
        (("rust-tempfile" ,rust-tempfile-3))))
     (inputs
      (list rust-bitflags-1
            rust-downcast-rs-1
            rust-libc-0.2
-           rust-nix-0.22
+           rust-nix-0.24
            rust-scoped-tls-1
            rust-wayland-commons-0.29
            rust-wayland-scanner-0.29
-- 
cgit v1.2.3


From 9504329a6979f9a7d98472fec229778b70897a5b Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:11:16 +0300
Subject: gnu: rust-wayland-commons-0.29: Update to 0.29.5.

* gnu/packages/crates-graphics.scm (rust-wayland-commons-0.29): Update
to 0.29.5.
[cargo-inputs]: Replace rust-nix-0.22 with 0.24.
[inputs]: Replace rust-nix-0.22 with 0.24.
---
 gnu/packages/crates-graphics.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index a5983529b0..2607ce1dd9 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2615,23 +2615,23 @@ (define-public rust-wayland-client-0.21
 (define-public rust-wayland-commons-0.29
   (package
     (name "rust-wayland-commons")
-    (version "0.29.4")
+    (version "0.29.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-commons" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0gnk4a771i3g1k4fbzx54xnganpc9j68jrx8xj839hfp83iybxll"))))
+        (base32 "00m90bnxqy0d6lzqlyazc1jh18jgbjwigmyr0rk3m8w4slsg34c6"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-nix" ,rust-nix-0.22)
+       (("rust-nix" ,rust-nix-0.24)
         ("rust-once-cell" ,rust-once-cell-1)
         ("rust-smallvec" ,rust-smallvec-1)
         ("rust-wayland-sys" ,rust-wayland-sys-0.29))))
     (inputs
-     (list rust-nix-0.22 rust-once-cell-1 rust-smallvec-1
+     (list rust-nix-0.24 rust-once-cell-1 rust-smallvec-1
            rust-wayland-sys-0.29))
     (home-page "https://github.com/smithay/wayland-rs")
     (synopsis "Types and structures used by wayland-client and wayland-server")
-- 
cgit v1.2.3


From 37eed045b3cb7d55160b2ab9492de95a48854e0b Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:12:27 +0300
Subject: gnu: rust-wayland-cursor-0.29: Update to 0.29.5.

* gnu/packages/crates-graphics.scm (rust-wayland-cursor-0.29): Update to
0.29.5.
[cargo-inputs]: Replace rust-nix-0.22 with 0.24. Add
rust-wayland-client-0.29.
[inputs]: Replace rust-nix-0.22 with 0.24.
---
 gnu/packages/crates-graphics.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 2607ce1dd9..b27df7685f 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2705,21 +2705,22 @@ (define-public rust-wayland-commons-0.21
 (define-public rust-wayland-cursor-0.29
   (package
     (name "rust-wayland-cursor")
-    (version "0.29.4")
+    (version "0.29.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-cursor" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1gd6aswkrdz556n54pjpd4rchw7jkgcx6hnrhgy62y2y7pqmh9y5"))))
+        (base32 "0qbn6wqmjibkx3lb3ggbp07iabzgx2zhrm0wxxxjbmhkdyvccrb8"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-nix" ,rust-nix-0.22)
+       (("rust-nix" ,rust-nix-0.24)
+        ("rust-wayland-client" ,rust-wayland-client-0.29)
         ("rust-xcursor" ,rust-xcursor-0.3))))
     (inputs
-     (list rust-nix-0.22 rust-wayland-client-0.29 rust-xcursor-0.3))
+     (list rust-nix-0.24 rust-wayland-client-0.29 rust-xcursor-0.3))
     (home-page "https://github.com/smithay/wayland-rs")
     (synopsis "Bindings to libwayland-cursor")
     (description
-- 
cgit v1.2.3


From 1196e53f2ddafccefe80afbed237797105d0f18a Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:13:26 +0300
Subject: gnu: rust-wayland-egl-0.29: Update to 0.29.5.

* gnu/packages/crates-io.scm (rust-wayland-egl-0.29): Update to 0.29.5.
[cargo-inputs]: Add rust-wayland-client-0.29, rust-wayland-sys-0.29.
---
 gnu/packages/crates-graphics.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index b27df7685f..67126f7e62 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2752,15 +2752,19 @@ (define-public rust-wayland-cursor-0.28
 (define-public rust-wayland-egl-0.29
   (package
     (name "rust-wayland-egl")
-    (version "0.29.4")
+    (version "0.29.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-egl" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0flslbp8q4nv3hcw941vapn3jh6y7glqaqv63h1mjaqnxrlisa43"))))
+        (base32 "0z8hwixv5kj201p2pnbdwxbl4s9hz5cxd8i1v0k2j08sz14yjba0"))))
     (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-wayland-client" ,rust-wayland-client-0.29)
+        ("rust-wayland-sys" ,rust-wayland-sys-0.29))))
     (inputs
      (list rust-wayland-client-0.29 rust-wayland-sys-0.29))
     ;; For the PKG_CONFIG_PATH environment variable.
-- 
cgit v1.2.3


From c2019dbfbc501d70b196d24fb3a5ead93f1d95c6 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:14:04 +0300
Subject: gnu: rust-wayland-protocols-0.29: Update to 0.29.5.

* gnu/packages/crates-graphics.scm (rust-wayland-protocols-0.29): Update
to 0.29.5.
[cargo-inputs]: Replace rust-bitflags-1.2 with 1. Add
rust-wayland-client-0.29, rust-wayland-commons-0.29,
rust-wayland-scanner-0.29, rust-wayland-server-0.29.
[inputs]: Replace rust-bitflags-1.2 with 1.
---
 gnu/packages/crates-graphics.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 67126f7e62..e0ad02b8be 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2800,20 +2800,24 @@ (define-public rust-wayland-egl-0.28
 (define-public rust-wayland-protocols-0.29
   (package
     (name "rust-wayland-protocols")
-    (version "0.29.4")
+    (version "0.29.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-protocols" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0hap8vky2fwsq05c98c8xs00gb9m5kxp8kq3zr0jwh036gi7l530"))))
+        (base32 "1ihbjyd0w460gd7w22g9qabbwd4v8x74f8vsh7p25csljcgn4l5r"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-bitflags" ,rust-bitflags-1.2))))
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-wayland-client" ,rust-wayland-client-0.29)
+        ("rust-wayland-commons" ,rust-wayland-commons-0.29)
+        ("rust-wayland-scanner" ,rust-wayland-scanner-0.29)
+        ("rust-wayland-server" ,rust-wayland-server-0.29))))
     (inputs
-     (list rust-bitflags-1.2 rust-wayland-client-0.29
+     (list rust-bitflags-1 rust-wayland-client-0.29
            rust-wayland-commons-0.29 rust-wayland-scanner-0.29
            rust-wayland-server-0.29))
     (home-page "https://github.com/smithay/wayland-rs")
-- 
cgit v1.2.3


From 1f29d2667465117c8eb856871aef7f046768e9cf Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:15:16 +0300
Subject: gnu: rust-wayland-scanner-0.29: Update to 0.29.5.

* gnu/packages/crates-io.scm (rust-wayland-scanner-0.29): Update to
0.29.5.
[cargo-inputs]: Add rust-proc-macro2, rust-quote-1, rust-xml-rs-0.8.
---
 gnu/packages/crates-graphics.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index e0ad02b8be..2983ffd48c 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2898,15 +2898,20 @@ (define-public rust-wayland-protocols-0.21
 (define-public rust-wayland-scanner-0.29
   (package
     (name "rust-wayland-scanner")
-    (version "0.29.4")
+    (version "0.29.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-scanner" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1q7r764z8k922xf51fj56b1xm29ffi9ap8jnf4c478gp8cqyv89r"))))
+        (base32 "0lxx3i2kxnmsk421qx87lqqc9kd2y1ksjxcyg0pqbar2zbc06hwg"))))
     (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-proc-macro2" ,rust-proc-macro2-1)
+        ("rust-quote" ,rust-quote-1)
+        ("rust-xml-rs" ,rust-xml-rs-0.8))))
     (inputs
      (list rust-proc-macro2-1 rust-quote-1 rust-xml-rs-0.8))
     (home-page "https://github.com/smithay/wayland-rs")
-- 
cgit v1.2.3


From eeaf7f8470950dbf90fa63ab67e04ac42df216b7 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:16:08 +0300
Subject: gnu: rust-wayland-server-0.29: Update to 0.29.5.

* gnu/packages/crates-io.scm (rust-wayland-server-0.29): Update to
0.29.5.
[cargo-inputs]: Replace rust-nix-0.22 with 0.24. Add
rust-wayland-commons-0.29, rust-wayland-scanner-0.29,
rust-wayland-sys-0.29.
[inputs]: Replace rust-nix-0.22 with 0.24.
---
 gnu/packages/crates-graphics.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 2983ffd48c..5d82c68f81 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2977,14 +2977,14 @@ (define-public rust-wayland-scanner-0.21
 (define-public rust-wayland-server-0.29
   (package
     (name "rust-wayland-server")
-    (version "0.29.4")
+    (version "0.29.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-server" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1wj8gf28dbjwb824i29wf3wr5r6wp6ssknjm9b5dnb1fah47mk66"))))
+        (base32 "11ickjbqpfs19wakf56l3j9asjcfw00d7wj48s3i99yvv1nq8q2k"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -2992,15 +2992,18 @@ (define-public rust-wayland-server-0.29
         ("rust-downcast-rs" ,rust-downcast-rs-1)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-nix" ,rust-nix-0.22)
+        ("rust-nix" ,rust-nix-0.24)
         ("rust-parking-lot" ,rust-parking-lot-0.11)
-        ("rust-scoped-tls" ,rust-scoped-tls-1))))
+        ("rust-scoped-tls" ,rust-scoped-tls-1)
+        ("rust-wayland-commons" ,rust-wayland-commons-0.29)
+        ("rust-wayland-scanner" ,rust-wayland-scanner-0.29)
+        ("rust-wayland-sys" ,rust-wayland-sys-0.29))))
     (inputs
      (list rust-bitflags-1
            rust-downcast-rs-1
            rust-lazy-static-1
            rust-libc-0.2
-           rust-nix-0.22
+           rust-nix-0.24
            rust-parking-lot-0.11
            rust-scoped-tls-1
            rust-wayland-commons-0.29
-- 
cgit v1.2.3


From 66f89cc25abb1d26f567ba09d209d1cfa37419ea Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:18:00 +0300
Subject: gnu: Add rust-wayland-sys-0.30.

* gnu/packages/crates-graphics.scm (rust-wayland-sys-0.30): New variable.
(rust-wayland-sys-0.29): Inherit from rust-wayland-sys-0.30.
---
 gnu/packages/crates-graphics.scm | 46 ++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 7 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 5d82c68f81..7fc4697964 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -3104,24 +3104,25 @@ (define-public rust-wayland-server-0.21
         ("rust-wayland-sys" ,rust-wayland-sys-0.21)
         ("rust-wayland-scanner" ,rust-wayland-scanner-0.21))))))
 
-(define-public rust-wayland-sys-0.29
+(define-public rust-wayland-sys-0.30
   (package
     (name "rust-wayland-sys")
-    (version "0.29.4")
+    (version "0.30.1")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1m2jwk5q36jidwbdmdicmi27r9dzi4wanzg3i28nfxc9kbvisd6r"))))
+        (base32 "01man4ll2kyxp9x2934rhnf98522pzwsd2c6jwr73q08qqma1cln"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-dlib" ,rust-dlib-0.5)
         ("rust-lazy-static" ,rust-lazy-static-1)
         ("rust-libc" ,rust-libc-0.2)
-        ("rust-memoffset" ,rust-memoffset-0.6)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-memoffset" ,rust-memoffset-0.7)
         ("rust-pkg-config" ,rust-pkg-config-0.3))
        #:phases
        (modify-phases %standard-phases
@@ -3132,9 +3133,6 @@ (define-public rust-wayland-sys-0.29
                (substitute* (find-files "src" "\\.rs$")
                  (("libwayland.*\\.so" shared-lib)
                   (string-append libwayland "/" shared-lib)))))))))
-    (inputs
-     (list rust-dlib-0.5 rust-lazy-static-1 rust-libc-0.2
-           rust-pkg-config-0.3))
     (propagated-inputs
      (list wayland))
     (home-page "https://github.com/smithay/wayland-rs")
@@ -3146,6 +3144,40 @@ (define-public rust-wayland-sys-0.29
 crate @code{rust-wayland-client} for usable bindings.")
     (license license:expat)))
 
+(define-public rust-wayland-sys-0.29
+  (package
+    (inherit rust-wayland-sys-0.30)
+    (name "rust-wayland-sys")
+    (version "0.29.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "wayland-sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1m2jwk5q36jidwbdmdicmi27r9dzi4wanzg3i28nfxc9kbvisd6r"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-dlib" ,rust-dlib-0.5)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-memoffset" ,rust-memoffset-0.6)
+        ("rust-pkg-config" ,rust-pkg-config-0.3))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-libraries
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((libwayland (dirname (search-input-file
+                                         inputs "lib/libwayland-client.so"))))
+               (substitute* (find-files "src" "\\.rs$")
+                 (("libwayland.*\\.so" shared-lib)
+                  (string-append libwayland "/" shared-lib)))))))))
+    (inputs
+     (list rust-dlib-0.5 rust-lazy-static-1 rust-libc-0.2
+           rust-pkg-config-0.3))
+    (propagated-inputs
+     (list wayland))))
+
 (define-public rust-wayland-sys-0.28
   (package
     (inherit rust-wayland-sys-0.29)
-- 
cgit v1.2.3


From 990c02a9e0b2a90ec99df756a8d4a4b07eeaf286 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:18:37 +0300
Subject: gnu: rust-wayland-sys-0.29: Update to 0.29.5.

* gnu/packages/crates-io.scm (rust-wayland-sys-0.29): Update to 0.29.5.
---
 gnu/packages/crates-graphics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 7fc4697964..c85b6c9eca 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -3148,14 +3148,14 @@ (define-public rust-wayland-sys-0.29
   (package
     (inherit rust-wayland-sys-0.30)
     (name "rust-wayland-sys")
-    (version "0.29.4")
+    (version "0.29.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "wayland-sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1m2jwk5q36jidwbdmdicmi27r9dzi4wanzg3i28nfxc9kbvisd6r"))))
+        (base32 "1m79qqmr1hx7jlyrvnrxjma5s6dk5js9fjsr4nx7vv1r7hdcw4my"))))
     (arguments
      `(#:cargo-inputs
        (("rust-dlib" ,rust-dlib-0.5)
-- 
cgit v1.2.3


From c07de7f91849b59e01598337329f961b2bd97e63 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:20:35 +0300
Subject: gnu: rust-core-graphics-0.22: Update to 0.22.3.

* gnu/packages/crates-graphics.scm (rust-core-graphics-0.22): Update to
0.22.3.
---
 gnu/packages/crates-graphics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index c85b6c9eca..b4bef2e0dd 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -473,14 +473,14 @@ (define-public rust-cgmath-0.16
 (define-public rust-core-graphics-0.22
   (package
     (name "rust-core-graphics")
-    (version "0.22.2")
+    (version "0.22.3")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "core-graphics" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "11lx6xw8nc9fpd552g60qa0cxh0maah8j2m26vkq0aslkgv3b7r6"))))
+        (base32 "1yz4xzbz36vbmlra0viazzlicp8kap1ldgshsp5nzz4g7fmvp095"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
-- 
cgit v1.2.3


From c787f63ede5334f9ca885e8b0f3816cd0d7705d8 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:21:57 +0300
Subject: gnu: Add rust-raw-window-handle-0.5.

* gnu/packages/crates-graphics.scm (rust-raw-window-handle-0.5): New
variable.
(rust-raw-window-handle-0.4): Inherit from rust-raw-window-handle-0.5.
---
 gnu/packages/crates-graphics.scm | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index b4bef2e0dd..afb55517e5 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2157,10 +2157,10 @@ (define-public rust-ravif-0.6
      (list nasm))                 ;for building rav1e
     (inputs '())))
 
-(define-public rust-raw-window-handle-0.4
+(define-public rust-raw-window-handle-0.5
   (package
     (name "rust-raw-window-handle")
-    (version "0.4.3")
+    (version "0.5.2")
     (source
      (origin
        (method url-fetch)
@@ -2168,17 +2168,31 @@ (define-public rust-raw-window-handle-0.4
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0hgvrqbr2b62zhq4ryv08h92mwis9v8f7j9pwcgxzlp7nswvw05q"))))
+         "1f9k10fgda464ia1b2hni8f0sa8i0bphdsbs3di032x80qgrmzzj"))))
     (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-cty" ,rust-cty-0.2))))
     (home-page "https://github.com/rust-windowing/raw-window-handle")
     (synopsis "Interoperability library for Rust Windowing applications")
     (description
      "Interoperability library for Rust Windowing applications.")
     (license license:expat)))
 
+(define-public rust-raw-window-handle-0.4
+  (package
+    (inherit rust-raw-window-handle-0.5)
+    (name "rust-raw-window-handle")
+    (version "0.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "raw-window-handle" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0hgvrqbr2b62zhq4ryv08h92mwis9v8f7j9pwcgxzlp7nswvw05q"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-cty" ,rust-cty-0.2))))))
+
 (define-public rust-raw-window-handle-0.3
   (package
     (inherit rust-raw-window-handle-0.4)
-- 
cgit v1.2.3


From 12b6e0a53ed92d1350b740a3f6c1a69beae13d78 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:33:28 +0300
Subject: gnu: rust-x11-dl-2: Update to 2.21.0.

* gnu/packages/crates-graphics.scm (rust-x11-dl-2): Update to 2.21.0.
[cargo-inputs]: Remove rust-lazy-static-1, rust-maybe-uninit-2. Add
rust-once-cell-1.
[license]: Update license.
---
 gnu/packages/crates-graphics.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index afb55517e5..554cdcf93c 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -3556,7 +3556,7 @@ (define-public rust-x11-clipboard-0.5
 (define-public rust-x11-dl-2
   (package
     (name "rust-x11-dl")
-    (version "2.18.5")
+    (version "2.21.0")
     (source
      (origin
        (method url-fetch)
@@ -3564,18 +3564,17 @@ (define-public rust-x11-dl-2
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1y7yq4sfvv56shk4v3s7gvlrwk9d0migj622fl4i4c5klpiq3y9b"))))
+        (base32 "0vsiq62xpcfm0kn9zjw5c9iycvccxl22jya8wnk18lyxzqj5jwrq"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-lazy-static" ,rust-lazy-static-1)
-        ("rust-libc" ,rust-libc-0.2)
-        ("rust-maybe-uninit" ,rust-maybe-uninit-2)
+       (("rust-libc" ,rust-libc-0.2)
+        ("rust-once-cell" ,rust-once-cell-1)
         ("rust-pkg-config" ,rust-pkg-config-0.3))))
     (home-page "https://github.com/erlepereira/x11-rs.git")
     (synopsis "X11 library bindings for Rust")
     (description "This package provides X11 library bindings for Rust.")
-    (license license:cc0)))
+    (license license:expat)))
 
 (define-public rust-y4m-0.7
   (package
-- 
cgit v1.2.3


From 73c97a0a7719971f03802cbf1ccac9f13e306e5b Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:38:11 +0300
Subject: gnu: Add rust-winit-0.28.

* gnu/packages/crates-graphics.scm (rust-winit-0.28): New variable.
(rust-winit-0.26): Inherit from rust-winit-0.28.
---
 gnu/packages/crates-graphics.scm | 77 ++++++++++++++++++++++++++++++++--------
 1 file changed, 63 insertions(+), 14 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 554cdcf93c..d42843a43d 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -3286,8 +3286,70 @@ (define-public rust-webp-0.2
     (description "This package procides a WebP conversion library.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-winit-0.28
+  (package
+    (name "rust-winit")
+    (version "0.28.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "winit" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0x1q4nxlr5sg0sf0fhdwg6jgb0a7rmc8skvp33v1b43v2664wl2g"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-android-activity" ,rust-android-activity-0.4)
+        ("rust-bitflags" ,rust-bitflags-1)
+        ("rust-cfg-aliases" ,rust-cfg-aliases-0.1)
+        ("rust-core-foundation" ,rust-core-foundation-0.9)
+        ("rust-core-graphics" ,rust-core-graphics-0.22)
+        ("rust-dispatch" ,rust-dispatch-0.2)
+        ("rust-instant" ,rust-instant-0.1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-mint" ,rust-mint-0.5)
+        ("rust-mio" ,rust-mio-0.8)
+        ("rust-ndk" ,rust-ndk-0.7)
+        ("rust-objc2" ,rust-objc2-0.3)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-orbclient" ,rust-orbclient-0.3)
+        ("rust-percent-encoding" ,rust-percent-encoding-2)
+        ("rust-raw-window-handle" ,rust-raw-window-handle-0.5)
+        ("rust-redox-syscall" ,rust-redox-syscall-0.3)
+        ("rust-sctk-adwaita" ,rust-sctk-adwaita-0.5)
+        ("rust-serde" ,rust-serde-1)
+        ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.16)
+        ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+        ("rust-wayland-client" ,rust-wayland-client-0.29)
+        ("rust-wayland-commons" ,rust-wayland-commons-0.29)
+        ("rust-wayland-protocols" ,rust-wayland-protocols-0.29)
+        ("rust-wayland-scanner" ,rust-wayland-scanner-0.29)
+        ("rust-web-sys" ,rust-web-sys-0.3)
+        ("rust-windows-sys" ,rust-windows-sys-0.45)
+        ("rust-x11-dl" ,rust-x11-dl-2))
+       #:cargo-development-inputs
+       (("rust-console-log" ,rust-console-log-0.2)
+        ("rust-image" ,rust-image-0.24)
+        ("rust-simple-logger" ,rust-simple-logger-2)
+        ("rust-web-sys" ,rust-web-sys-0.3))))
+    (home-page "https://github.com/rust-windowing/winit")
+    (synopsis "Window creation library")
+    (description
+     "Winit is a window creation and management library. It can create
+windows and lets you handle events (for example: the window being
+resized, a key being pressed, a mouse movement, etc.) produced by
+window.
+
+Winit is designed to be a low-level brick in a hierarchy of libraries.
+Consequently, in order to show something on the window you need to use
+the platform-specific getters provided by winit, or another library.")
+    (license license:asl2.0)))
+
 (define-public rust-winit-0.26
   (package
+    (inherit rust-winit-0.28)
     (name "rust-winit")
     (version "0.26.1")
     (source
@@ -3297,7 +3359,6 @@ (define-public rust-winit-0.26
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0fp7cdh7llbqmm6ga8f6bzk9785jmkbyy1w631hr9faq3n9wqhwv"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -3330,19 +3391,7 @@ (define-public rust-winit-0.26
        (("rust-console-log" ,rust-console-log-0.2)
         ("rust-simple-logger" ,rust-simple-logger-1))))
     (inputs
-     (list rust-wayland-client-0.29 rust-wayland-protocols-0.29))
-    (home-page "https://github.com/rust-windowing/winit")
-    (synopsis "Window creation library")
-    (description
-     "Winit is a window creation and management library. It can create
-windows and lets you handle events (for example: the window being
-resized, a key being pressed, a mouse movement, etc.) produced by
-window.
-
-Winit is designed to be a low-level brick in a hierarchy of libraries.
-Consequently, in order to show something on the window you need to use
-the platform-specific getters provided by winit, or another library.")
-    (license license:asl2.0)))
+     (list rust-wayland-client-0.29 rust-wayland-protocols-0.29))))
 
 (define-public rust-winit-0.24
   (package
-- 
cgit v1.2.3


From f46dabb185e339241f1acf66909233cb7c28fd20 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 16:43:53 +0300
Subject: gnu: Add rust-smithay-client-toolkit-0.16.

* gnu/packages/crates-graphics.scm (rust-smithay-client-toolkit-0.16):
New variable.
[rust-smithay-client-toolkit-0.15]: Inherit from
rust-smithay-client-toolkit-0.16.
---
 gnu/packages/crates-graphics.scm | 41 +++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index d42843a43d..cee768e035 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2239,8 +2239,41 @@ (define-public rust-rgb-0.8
 first-class Rust objects.")
     (license license:expat)))
 
+(define-public rust-smithay-client-toolkit-0.16
+  (package
+    (name "rust-smithay-client-toolkit")
+    (version "0.16.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "smithay-client-toolkit" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0m7l0zhl9s3321yj8z6hf1g0w3l2ay85irgcw2r5wwfj69yw81zk"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-calloop" ,rust-calloop-0.10)
+        ("rust-dlib" ,rust-dlib-0.5)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-log" ,rust-log-0.4)
+        ("rust-memmap2" ,rust-memmap2-0.5)
+        ("rust-nix" ,rust-nix-0.24)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-wayland-client" ,rust-wayland-client-0.29)
+        ("rust-wayland-cursor" ,rust-wayland-cursor-0.29)
+        ("rust-wayland-protocols" ,rust-wayland-protocols-0.29))
+       #:cargo-development-inputs (("rust-image" ,rust-image-0.24))))
+    (home-page "https://github.com/smithay/client-toolkit")
+    (synopsis "Toolkit for making client Wayland applications")
+    (description
+     "This package provides a toolkit for making client Wayland applications.")
+    (license license:expat)))
+
 (define-public rust-smithay-client-toolkit-0.15
   (package
+    (inherit rust-smithay-client-toolkit-0.16)
     (name "rust-smithay-client-toolkit")
     (version "0.15.4")
     (source
@@ -2250,7 +2283,6 @@ (define-public rust-smithay-client-toolkit-0.15
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "18wxla80y6m4l3dwawi7bl1d9m9dfcg4sxxjcgjqq3psjxmg2a4a"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
@@ -2264,12 +2296,7 @@ (define-public rust-smithay-client-toolkit-0.15
         ("rust-pkg-config" ,rust-pkg-config-0.3)
         ("rust-wayland-client" ,rust-wayland-client-0.29)
         ("rust-wayland-cursor" ,rust-wayland-cursor-0.29)
-        ("rust-wayland-protocols" ,rust-wayland-protocols-0.29))))
-    (home-page "https://github.com/smithay/client-toolkit")
-    (synopsis "Toolkit for making client Wayland applications")
-    (description
-     "This package provides a toolkit for making client Wayland applications.")
-    (license license:expat)))
+        ("rust-wayland-protocols" ,rust-wayland-protocols-0.29))))))
 
 (define-public rust-smithay-client-toolkit-0.12
   (package
-- 
cgit v1.2.3


From 1b8cf9a1286d5a3b7c99a1cc978c9fcc643f4a6b Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 17:50:51 +0300
Subject: gnu: rust-smithay-clipboard-0.6: Update to 0.6.6.

* gnu/packages/crates-graphics.scm (rust-smithay-clipboard-0.6): Update
to 0.6.6.
[arguments]: Don't skip the build.
[cargo-inputs]: Replace rust-smithay-client-toolkit-0.12 with 0.16,
rust-wayland-client-0.28 with 0.29.
[cargo-development-inputs]: Add rust-smithay-client-toolkit-0.16.
---
 gnu/packages/crates-graphics.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index cee768e035..afd8337bbe 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2388,20 +2388,21 @@ (define-public rust-smithay-client-toolkit-0.4
 (define-public rust-smithay-clipboard-0.6
   (package
     (name "rust-smithay-clipboard")
-    (version "0.6.2")
+    (version "0.6.6")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "smithay-clipboard" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "14dwisd56cbr80zf719l3fh0n8pm1fjmvry9lsbhdbccf8cv525b"))))
+        (base32 "1s5hyhbmnk75i0sm14wy4dy7c576a4dyi1chfwdhpbhz1a3mqd0a"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
-       (("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.12)
-        ("rust-wayland-client" ,rust-wayland-client-0.28))))
+     `(#:cargo-inputs
+       (("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.16)
+        ("rust-wayland-client" ,rust-wayland-client-0.29))
+       #:cargo-development-inputs
+       (("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.16))))
     (home-page "https://github.com/smithay/smithay-clipboard")
     (synopsis "Access to the Wayland clipboard for client applications")
     (description
-- 
cgit v1.2.3


From 7b0767fb64747f36c75b0ef732301859a0a69df8 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 17:53:18 +0300
Subject: gnu: Add rust-x11-clipboard-0.7.

* gnu/packages/crates-graphics.scm (rust-x11-clipboard-0.7): New variable.
(rust-x11-clipboard-0.5): Inherit from rust-x11-clipboard-0.7.
---
 gnu/packages/crates-graphics.scm | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index afd8337bbe..a587c11b3a 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -3609,8 +3609,29 @@ (define-public rust-x11rb-0.8
     (description "This package provides Rust bindings to X11")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-x11-clipboard-0.7
+  (package
+    (name "rust-x11-clipboard")
+    (version "0.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "x11-clipboard" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0r3lgslbbdf0mb914n0f9q2pqci407r1pcddwbl7sfvc4alrl2wq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:tests? #f      ; Wants a running X server.
+       #:cargo-inputs (("rust-x11rb" ,rust-x11rb-0.10))))
+    (home-page "https://github.com/quininer/x11-clipboard")
+    (synopsis "x11 clipboard support for Rust")
+    (description "This package provides x11 clipboard support for Rust.")
+    (license license:expat)))
+
 (define-public rust-x11-clipboard-0.5
   (package
+    (inherit rust-x11-clipboard-0.7)
     (name "rust-x11-clipboard")
     (version "0.5.1")
     (source
@@ -3620,15 +3641,10 @@ (define-public rust-x11-clipboard-0.5
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "17c5yxxhknrp7y9mc7mp85ra8q4jw12c174m9yzbfr1vs2pkgsg5"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-xcb" ,rust-xcb-0.9))))
-    (home-page "https://github.com/quininer/x11-clipboard")
-    (synopsis "x11 clipboard support for Rust")
-    (description "This package provides x11 clipboard support for Rust.")
-    (license license:expat)))
+       (("rust-xcb" ,rust-xcb-0.9))))))
 
 (define-public rust-x11-dl-2
   (package
-- 
cgit v1.2.3


From 251c2620f4d4e482654b8670f9cb57a5cf3dac0d Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 17:54:36 +0300
Subject: gnu: Add rust-x11rb-0.10.

* gnu/packages/crates-graphics.scm (rust-x11rb-0.10): New variable.
(rust-x11rb-0.8): Inherit from rust-x11rb-0.10.
---
 gnu/packages/crates-graphics.scm | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index a587c11b3a..638069d624 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -3582,8 +3582,36 @@ (define-public rust-x11-2
     (description "This crate provides X11 library bindings for Rust.")
     (license license:expat)))
 
+(define-public rust-x11rb-0.10
+  (package
+    (name "rust-x11rb")
+    (version "0.10.1")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "x11rb" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "01ympxagdl0qs35k1ww712shpnpbahkcc29j5dqmwd4z461lhasr"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-gethostname" ,rust-gethostname-0.2)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-libloading" ,rust-libloading-0.7)
+        ("rust-nix" ,rust-nix-0.24)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-winapi" ,rust-winapi-0.3)
+        ("rust-winapi-wsapoll" ,rust-winapi-wsapoll-0.1)
+        ("rust-x11rb-protocol" ,rust-x11rb-protocol-0.10))))
+    (home-page "https://github.com/psychon/x11rb")
+    (synopsis "Rust bindings to X11")
+    (description "This package provides Rust bindings to X11")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-x11rb-0.8
   (package
+    (inherit rust-x11rb-0.10)
     (name "rust-x11rb")
     (version "0.8.1")
     (source
@@ -3593,7 +3621,6 @@ (define-public rust-x11rb-0.8
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
           (base32 "068g5ll4l5f35c2v098hj0kj2c9ma0r7v3pbli164q9g7w5hiyvg"))))
-    (build-system cargo-build-system)
     (arguments
       `(#:skip-build? #t
         #:cargo-inputs
@@ -3603,11 +3630,7 @@ (define-public rust-x11rb-0.8
          ("rust-nix" ,rust-nix-0.20)
          ("rust-once-cell" ,rust-once-cell-1)
          ("rust-winapi" ,rust-winapi-0.3)
-         ("rust-winapi-wsapoll" ,rust-winapi-wsapoll-0.1))))
-    (home-page "https://github.com/psychon/x11rb")
-    (synopsis "Rust bindings to X11")
-    (description "This package provides Rust bindings to X11")
-    (license (list license:expat license:asl2.0))))
+         ("rust-winapi-wsapoll" ,rust-winapi-wsapoll-0.1))))))
 
 (define-public rust-x11-clipboard-0.7
   (package
-- 
cgit v1.2.3


From b5f6ad81fed3dcf7884fc764c4f6d4f1071cfe22 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 23 Apr 2023 17:55:03 +0300
Subject: gnu: Add rust-x11rb-protocol-0.10.

* gnu/packages/crates-graphics.scm (rust-x11rb-protocol-0.10): New
variable.
---
 gnu/packages/crates-graphics.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 638069d624..2904a080cb 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -3632,6 +3632,29 @@ (define-public rust-x11rb-0.8
          ("rust-winapi" ,rust-winapi-0.3)
          ("rust-winapi-wsapoll" ,rust-winapi-wsapoll-0.1))))))
 
+(define-public rust-x11rb-protocol-0.10
+  (package
+    (name "rust-x11rb-protocol")
+    (version "0.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "x11rb-protocol" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0rxcpsmgrziwqy9ml81h8r1lwy422h1i5j3d007dpj8a3islbcjn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-nix" ,rust-nix-0.24)
+        ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs
+       (("rust-criterion" ,rust-criterion-0.3))))
+    (home-page "https://github.com/psychon/x11rb")
+    (synopsis "Rust bindings to X11")
+    (description "Rust bindings to X11")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-x11-clipboard-0.7
   (package
     (name "rust-x11-clipboard")
-- 
cgit v1.2.3


From c55ce863aae5d651a996763b8606faa276aa9c11 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 24 Apr 2023 16:03:31 +0300
Subject: gnu: Add rust-sdl2-sys-0.35.

* gnu/packages/crates-graphics.scm (rust-sdl2-sys-0.35): New variable.
---
 gnu/packages/crates-graphics.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 2904a080cb..b2947eb6c2 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2239,6 +2239,37 @@ (define-public rust-rgb-0.8
 first-class Rust objects.")
     (license license:expat)))
 
+(define-public rust-sdl2-sys-0.35
+  (package
+    (name "rust-sdl2-sys")
+    (version "0.35.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "sdl2-sys" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "1w7ranfpmbvsnviq0y8d1cz9pajp8c4b84lslycq02kcrzi6nn73"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin (delete-file-recursively "SDL")))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; Building requires several SDL2 inputs.
+       #:cargo-inputs
+       (("rust-bindgen" ,rust-bindgen-0.53)
+        ("rust-cfg-if" ,rust-cfg-if-1)
+        ("rust-cmake" ,rust-cmake-0.1)
+        ("rust-flate2" ,rust-flate2-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-pkg-config" ,rust-pkg-config-0.3)
+        ("rust-vcpkg" ,rust-vcpkg-0.2)
+        ("rust-version-compare" ,rust-version-compare-0.1))))
+    (home-page "https://github.com/rust-sdl2/rust-sdl2")
+    (synopsis "Raw SDL2 bindings for Rust, used internally rust-sdl2")
+    (description "This package provides raw SDL2 bindings for Rust, used
+internally rust-sdl2.")
+    (license license:expat)))
+
 (define-public rust-smithay-client-toolkit-0.16
   (package
     (name "rust-smithay-client-toolkit")
-- 
cgit v1.2.3


From d4b801ae8df33c06982bc3a8410954839042b33c Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 24 Apr 2023 16:04:00 +0300
Subject: gnu: Add rust-sdl2-0.35.

* gnu/packages/crates-graphics.scm (rust-sdl2-0.35): New variable.
---
 gnu/packages/crates-graphics.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index b2947eb6c2..2a9eecc586 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -2239,6 +2239,31 @@ (define-public rust-rgb-0.8
 first-class Rust objects.")
     (license license:expat)))
 
+(define-public rust-sdl2-0.35
+  (package
+    (name "rust-sdl2")
+    (version "0.35.2")
+    (source (origin
+              (method url-fetch)
+              (uri (crate-uri "sdl2" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32 "06ivcavxhc7zyhbfmy2544dz0lnaqf33d9xf0jggpw93nrvr55gp"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t     ; Building requires several SDL2 inputs.
+       #:cargo-inputs
+       (("rust-bitflags" ,rust-bitflags-1)
+        ("rust-c-vec" ,rust-c-vec-2)
+        ("rust-lazy-static" ,rust-lazy-static-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-raw-window-handle" ,rust-raw-window-handle-0.4)
+        ("rust-sdl2-sys" ,rust-sdl2-sys-0.35))))
+    (home-page "https://github.com/Rust-SDL2/rust-sdl2")
+    (synopsis "SDL2 bindings for Rust")
+    (description "This package provides SDL2 bindings for Rust.")
+    (license license:expat)))
+
 (define-public rust-sdl2-sys-0.35
   (package
     (name "rust-sdl2-sys")
-- 
cgit v1.2.3


From acd26696fe90ed0de8fc84bd6b23cf953aabef33 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 24 Apr 2023 16:10:43 +0300
Subject: gnu: Add rust-glutin-egl-sys-0.4.

* gnu/packages/crates-graphics.scm (rust-glutin-egl-sys-0.4): New
variable.
(rust-glutin-egl-sys-0.1): Inherit from rust-glutin-egl-sys-0.4.
---
 gnu/packages/crates-graphics.scm | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 2a9eecc586..02a6c4e4bc 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1190,10 +1190,10 @@ (define-public rust-glutin-0.21
         ("rust-winapi" ,rust-winapi-0.3)
         ("rust-winit" ,rust-winit-0.19))))))
 
-(define-public rust-glutin-egl-sys-0.1
+(define-public rust-glutin-egl-sys-0.4
   (package
     (name "rust-glutin-egl-sys")
-    (version "0.1.5")
+    (version "0.4.0")
     (source
      (origin
        (method url-fetch)
@@ -1202,17 +1202,36 @@ (define-public rust-glutin-egl-sys-0.1
         (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "04f2ci9kb8q4dv4kviigvgfy54lr4jmbnmjsvi50qj13anjnmfra"))))
+         "0z9nm3d6qcgqg7f6qkbnsfs4cy90d8raw09inf2qc564nnmz1ap5"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-       (("rust-winapi" ,rust-winapi-0.3)
-        ("rust-gl-generator" ,rust-gl-generator-0.13))))
+       (("rust-gl-generator" ,rust-gl-generator-0.14)
+        ("rust-windows-sys" ,rust-windows-sys-0.45))))
     (home-page "https://github.com/rust-windowing/glutin")
     (synopsis "Egl bindings for glutin")
     (description "The egl bindings for glutin.")
     (license license:asl2.0)))
 
+(define-public rust-glutin-egl-sys-0.1
+  (package
+    (inherit rust-glutin-egl-sys-0.4)
+    (name "rust-glutin-egl-sys")
+    (version "0.1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "glutin-egl-sys" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "04f2ci9kb8q4dv4kviigvgfy54lr4jmbnmjsvi50qj13anjnmfra"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-winapi" ,rust-winapi-0.3)
+        ("rust-gl-generator" ,rust-gl-generator-0.13))))))
+
 (define-public rust-glutin-emscripten-sys-0.1
   (package
     (name "rust-glutin-emscripten-sys")
-- 
cgit v1.2.3


From 7aa4846546af98dd5c19ec1e90d5816a604a9c24 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 24 Apr 2023 16:11:51 +0300
Subject: gnu: Add rust-glutin-wgl-sys-0.4.

* gnu/packages/crates-graphics.scm (rust-glutin-wgl-sys-0.4): New
variable.
(rust-glutin-wgl-sys-0.1): Inherit from rust-glutin-wgl-sys-0.4.
---
 gnu/packages/crates-graphics.scm | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 02a6c4e4bc..11eee4d95b 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1294,27 +1294,43 @@ (define-public rust-glutin-glx-sys-0.1
     (description "This package provides glx bindings for glutin.")
     (license license:asl2.0)))
 
-(define-public rust-glutin-wgl-sys-0.1
+(define-public rust-glutin-wgl-sys-0.4
   (package
     (name "rust-glutin-wgl-sys")
-    (version "0.1.5")
+    (version "0.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "glutin_wgl_sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "15hns8b3i7iy366m61dg7jlr7wgzz8z8cakgbj3apnv92ld9b99x"))))
+        (base32 "0rc1c585ai9gav2nvdd5pn1x9gxv57yl5gg9cnyccgq3j273k2gg"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-gl-generator" ,rust-gl-generator-0.14))))
     (home-page "https://github.com/tomaka/glutin")
     (synopsis "Wgl bindings for glutin")
     (description "This package provides wgl bindings for glutin.")
     (license license:asl2.0)))
 
+(define-public rust-glutin-wgl-sys-0.1
+  (package
+    (inherit rust-glutin-wgl-sys-0.4)
+    (name "rust-glutin-wgl-sys")
+    (version "0.1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "glutin_wgl_sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "15hns8b3i7iy366m61dg7jlr7wgzz8z8cakgbj3apnv92ld9b99x"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-gl-generator" ,rust-gl-generator-0.14))))))
+
 (define-public rust-ical-0.7
   (package
     (name "rust-ical")
-- 
cgit v1.2.3


From 96d6b17a3ef11c0718a7d861c4db241937ea6b12 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 24 Apr 2023 16:12:26 +0300
Subject: gnu: Add rust-glutin-glx-sys-0.4.

* gnu/packages/crates-graphics.scm (rust-glutin-glx-sys-0.4): New
variable.
(rust-glutin-glx-sys-0.1): Inherit from rust-glutin-glx-sys-0.4.
---
 gnu/packages/crates-graphics.scm | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/crates-graphics.scm')

diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 11eee4d95b..ba502982ad 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -1272,21 +1272,20 @@ (define-public rust-glutin-gles2-sys-0.1
     (description "This package provides gles2 bindings for glutin.")
     (license license:asl2.0)))
 
-(define-public rust-glutin-glx-sys-0.1
+(define-public rust-glutin-glx-sys-0.4
   (package
     (name "rust-glutin-glx-sys")
-    (version "0.1.7")
+    (version "0.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "glutin_glx_sys" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "0l8kk60kq5v6hl1qr6ym2arzvbsgkh71aa8485cp901bq27kqfby"))))
+        (base32 "150l397l64p4r46wshh8zdlwifpcqpm93fm3csh4m5k8wmgwnlqv"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-gl-generator" ,rust-gl-generator-0.14)
         ("rust-x11-dl" ,rust-x11-dl-2))))
     (home-page "https://github.com/tomaka/glutin")
@@ -1294,6 +1293,24 @@ (define-public rust-glutin-glx-sys-0.1
     (description "This package provides glx bindings for glutin.")
     (license license:asl2.0)))
 
+(define-public rust-glutin-glx-sys-0.1
+  (package
+    (inherit rust-glutin-glx-sys-0.4)
+    (name "rust-glutin-glx-sys")
+    (version "0.1.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "glutin_glx_sys" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0l8kk60kq5v6hl1qr6ym2arzvbsgkh71aa8485cp901bq27kqfby"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-gl-generator" ,rust-gl-generator-0.14)
+        ("rust-x11-dl" ,rust-x11-dl-2))))))
+
 (define-public rust-glutin-wgl-sys-0.4
   (package
     (name "rust-glutin-wgl-sys")
-- 
cgit v1.2.3