Merge branch 'master' into staging

diff --cc gnu/local.mk
index a9ea726,e454189..50b9c37
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1519,10 -1529,8 +1519,9 @@@ dist_patch_DATA =                                              
    %D%/packages/patches/mpg321-gcc-10.patch                    \
    %D%/packages/patches/module-init-tools-moduledir.patch      \
    %D%/packages/patches/monero-use-system-miniupnpc.patch                      \
-   %D%/packages/patches/mono-mdoc-timestamping.patch           \
    %D%/packages/patches/mosaicatcher-unbundle-htslib.patch     \
    %D%/packages/patches/mrrescue-support-love-11.patch         \
 +  %D%/packages/patches/mrustc-riscv64-support.patch           \
    %D%/packages/patches/mtools-mformat-uninitialized.patch     \
    %D%/packages/patches/mupen64plus-ui-console-notice.patch    \
    %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch    \

diff --cc gnu/packages/check.scm
Simple merge

diff --cc gnu/packages/crates-io.scm
index b2241e5,7f89c63..e418249
--- 1/gnu/packages/crates-io.scm
--- 2/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@@ -29884,12 -30173,17 +30235,17 @@@ whether or not a given path points to a
         (uri (crate-uri "itertools" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
 -        (base32 "1bsyxnm20x05rwc5qskrqy4cfswrcadzlwc26dkqml6hz64vipb9"))))
 +        (base32 "1qy55fqbaisr9qgbn7cvdvqlfqbh1f4ddf99zwan56z7l6gx3ad9"))))
      (build-system cargo-build-system)
      (arguments
-      `(#:skip-build? #t
-        #:cargo-inputs
-        (("rust-either" ,rust-either-1))))
+      `(#:cargo-inputs
+        (("rust-either" ,rust-either-1))
+        #:cargo-development-inputs
+        (("rust-criterion" ,rust-criterion-0.3)
+         ("rust-paste" ,rust-paste-1)
+         ("rust-permutohedron" ,rust-permutohedron-0.2)
+         ("rust-quickcheck" ,rust-quickcheck-0.9)
+         ("rust-rand" ,rust-rand-0.7))))
      (home-page "https://github.com/rust-itertools/itertools")
      (synopsis "Extra iterator adaptors, methods, free functions, and macros")
      (description
@@@ -46431,35 -46845,34 +46981,54 @@@ ecosystem."
         (("rust-proc-macro2" ,rust-proc-macro2-1)
          ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.15)
          ("rust-quote" ,rust-quote-1)
 -        ("rust-syn" ,rust-syn-1))))
 +        ("rust-syn" ,rust-syn-1))))))
 +
 +(define-public rust-pyo3-macros-0.16
 +  (package
 +    (name "rust-pyo3-macros")
 +    (version "0.16.5")
 +    (source
 +      (origin
 +        (method url-fetch)
 +        (uri (crate-uri "pyo3-macros" version))
 +        (file-name (string-append name "-" version ".tar.gz"))
 +        (sha256
 +          (base32 "1xwh7sl4n73746q80n5m5afd261zg0kxcqfnlr89ik7vbd4c8kr8"))))
 +    (build-system cargo-build-system)
 +    (arguments
 +      `(#:skip-build? #t
 +        #:cargo-inputs
 +        (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.16)
 +         ("rust-quote" ,rust-quote-1)
 +         ("rust-syn" ,rust-syn-1))))
      (home-page "https://github.com/pyo3/pyo3")
 -    (synopsis "Code generation for PyO3")
 +    (synopsis "Proc macros for PyO3")
      (description
 -     "This package provides code generation backends for PyO3.")
 +     "This package provides compiler macros for use with PyO3.")
      (license license:asl2.0)))
  
+ (define-public rust-pyo3-macros-backend-0.13
+   (package
+     (inherit rust-pyo3-macros-backend-0.15)
+     (name "rust-pyo3-macros-backend")
+     (version "0.13.2")
+     (source (origin
+               (method url-fetch)
+               (uri (crate-uri "pyo3-macros-backend" version))
+               (file-name (string-append name "-" version ".tar.gz"))
+               (sha256
+                (base32
+                 "0rjxayd78l10hnyphk03bcvhm0jpsvnzn07lczhy7jsgv3jrgc47"))))
+     (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-proc-macro2" ,rust-proc-macro2-1)
+         ("rust-quote" ,rust-quote-1)
+         ("rust-syn" ,rust-syn-1))))))
+ 
  (define-public rust-pyo3-macros-0.15
    (package
 +    (inherit rust-pyo3-macros-0.16)
      (name "rust-pyo3-macros")
      (version "0.15.1")
      (source
@@@ -46475,64 -46888,34 +47044,83 @@@
          #:cargo-inputs
          (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.15)
           ("rust-quote" ,rust-quote-1)
 -         ("rust-syn" ,rust-syn-1))))
 +         ("rust-syn" ,rust-syn-1))))))
 +
 +(define-public rust-pyo3-0.16
 +  (package
 +    (name "rust-pyo3")
 +    (version "0.16.5")
 +    (source
 +     (origin
 +       (method url-fetch)
 +       (uri (crate-uri "pyo3" version))
 +       (file-name (string-append name "-" version ".tar.gz"))
 +       (sha256
 +        (base32 "1p5kjsj3jdw2gnahdjrzljmi93w3nxdp11qq8x3i80b0a3l04qqy"))))
 +    (build-system cargo-build-system)
 +    (arguments
 +     `(#:cargo-inputs
 +       (("rust-anyhow" ,rust-anyhow-1)
 +        ("rust-cfg-if" ,rust-cfg-if-1)
 +        ("rust-eyre" ,rust-eyre-0.6)
 +        ("rust-hashbrown" ,rust-hashbrown-0.11)
 +        ("rust-indexmap" ,rust-indexmap-1)
 +        ("rust-indoc" ,rust-indoc-1)
 +        ("rust-inventory" ,rust-inventory-0.2)
 +        ("rust-libc" ,rust-libc-0.2)
 +        ("rust-num-bigint" ,rust-num-bigint-0.4)
 +        ("rust-num-complex" ,rust-num-complex-0.4)
 +        ("rust-parking-lot" ,rust-parking-lot-0.11)
 +        ("rust-paste" ,rust-paste-0.1)
 +        ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16)
 +        ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.16)
 +        ("rust-pyo3-macros" ,rust-pyo3-macros-0.16)
 +        ("rust-serde" ,rust-serde-1)
 +        ("rust-unindent" ,rust-unindent-0.1))
 +       #:cargo-development-inputs
 +       (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
 +        ("rust-bitflags" ,rust-bitflags-1.2)
 +        ("rust-criterion" ,rust-criterion-0.3)
 +        ("rust-half" ,rust-half-1)
 +        ("rust-proptest" ,rust-proptest-0.10)
 +        ("rust-rustversion" ,rust-rustversion-1)
 +        ("rust-send-wrapper" ,rust-send-wrapper-0.5)
 +        ("rust-serde-json" ,rust-serde-json-1)
 +        ("rust-trybuild" ,rust-trybuild-1)
 +        ("rust-widestring" ,rust-widestring-0.5))
 +       ;; FIXME: fails to initialize Python interpreter.
 +       #:tests? #f))
 +    (inputs (list python))
      (home-page "https://github.com/pyo3/pyo3")
 -    (synopsis "Proc macros for PyO3")
 +    (synopsis "Rust bindings for the Python interpreter")
      (description
 -     "This package provides compiler macros for use with PyO3.")
 +     "This package provides Rust bindings for Python, including tools for
 +creating native Python extension modules.  Running and interacting with
 +Python code from a Rust binary is also supported.")
      (license license:asl2.0)))
  
+ (define-public rust-pyo3-macros-0.13
+   (package
+     (inherit rust-pyo3-macros-0.15)
+     (name "rust-pyo3-macros")
+     (version "0.13.2")
+     (source (origin
+               (method url-fetch)
+               (uri (crate-uri "pyo3-macros" version))
+               (file-name (string-append name "-" version ".tar.gz"))
+               (sha256
+                (base32
+                 "1fxi5lx5dl7xh469gr5xckyjy3r3c5dqypzxcj0fbhzf1hq2qzx4"))))
+     (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.13)
+         ("rust-quote" ,rust-quote-1)
+         ("rust-syn" ,rust-syn-1))))))
+ 
  (define-public rust-pyo3-0.15
    (package
 +    (inherit rust-pyo3-0.16)
      (name "rust-pyo3")
      (version "0.15.1")
      (source
@@@ -46578,30 -46961,54 +47166,68 @@@
          ("rust-serde-json" ,rust-serde-json-1)
          ("rust-trybuild" ,rust-trybuild-1))
         ;; FIXME: fails to initialize Python interpreter.
 -       #:tests? #f))
 -    (inputs (list python))
 -    (home-page "https://github.com/pyo3/pyo3")
 -    (synopsis "Rust bindings for the Python interpreter")
 -    (description
 -     "This package provides Rust bindings for Python, including tools for
 -creating native Python extension modules.  Running and interacting with
 -Python code from a Rust binary is also supported.")
 -    (license license:asl2.0)))
 +       #:tests? #f))))
  
+ (define-public rust-pyo3-0.13
+   (package
+     (inherit rust-pyo3-0.15)
+     (name "rust-pyo3")
+     (version "0.13.2")
+     (source (origin
+               (method url-fetch)
+               (uri (crate-uri "pyo3" version))
+               (file-name (string-append name "-" version ".tar.gz"))
+               (sha256
+                (base32
+                 "1hq965lgi25dn578fpn9hjva6zjr1c8rl7lxywijq44aw7lbhds8"))))
+     (arguments
+      `(#:skip-build? #true
+        #:cargo-inputs
+        (("rust-cfg-if" ,rust-cfg-if-1)
+         ("rust-ctor" ,rust-ctor-0.1)
+         ("rust-hashbrown" ,rust-hashbrown-0.9)
+         ("rust-indoc" ,rust-indoc-0.3)
+         ("rust-inventory" ,rust-inventory-0.1)
+         ("rust-libc" ,rust-libc-0.2)
+         ("rust-num-bigint" ,rust-num-bigint-0.3)
+         ("rust-num-complex" ,rust-num-complex-0.3)
+         ("rust-parking-lot" ,rust-parking-lot-0.11)
+         ("rust-paste" ,rust-paste-0.1)
+         ("rust-pyo3-macros" ,rust-pyo3-macros-0.13)
+         ("rust-serde" ,rust-serde-1)
+         ("rust-unindent" ,rust-unindent-0.1))
+        #:cargo-development-inputs
+        (("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
+         ("rust-bitflags" ,rust-bitflags-1.2)
+         ("rust-criterion" ,rust-criterion-0.3)
+         ("rust-half" ,rust-half-1)
+         ("rust-proptest" ,rust-proptest-0.10)
+         ("rust-rustversion" ,rust-rustversion-1)
+         ("rust-serde-json" ,rust-serde-json-1)
+         ("rust-trybuild" ,rust-trybuild-1))))))
+ 
 +(define-public rust-python3-dll-a-0.2
 +  (package
 +    (name "rust-python3-dll-a")
 +    (version "0.2.5")
 +    (source (origin
 +              (method url-fetch)
 +              (uri (crate-uri "python3-dll-a" version))
 +              (file-name (string-append name "-" version ".tar.gz"))
 +              (sha256
 +               (base32
 +                "01k2nf4wq4f4xnaq3fy1gx12v10pndwmdrjq4x4pshhjxxnrpml9"))))
 +    (build-system cargo-build-system)
 +    (arguments
 +     `(#:tests? #f                      ;Windows-like targets only
 +       #:cargo-inputs (("rust-cc" ,rust-cc-1))))
 +    (home-page "https://github.com/pyo3/python3-dll-a")
 +    (synopsis "Python import library generator")
 +    (description
 +     "This crate generates import libraries for the Python shared library
 +for MinGW-w64 and MSVC (cross-)compile targets.")
 +    (license license:expat)))
 +
  (define-public rust-qstring-0.7
    (package
      (name "rust-qstring")

diff --cc gnu/packages/games.scm
Simple merge

diff --cc gnu/packages/gl.scm
Simple merge

diff --cc gnu/packages/gnome.scm
Simple merge

diff --cc gnu/packages/graphics.scm
Simple merge

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/lisp-xyz.scm
Simple merge

diff --cc gnu/packages/python-xyz.scm
Simple merge

diff --cc gnu/packages/ruby.scm
Simple merge

diff --cc gnu/packages/tex.scm
Simple merge

diff --cc gnu/packages/video.scm
Simple merge

diff --cc gnu/packages/webkit.scm
Simple merge