Merge branch 'master' into core-updates-frozen

diff --cc doc/build.scm
Simple merge

diff --cc doc/guix.texi
Simple merge

diff --cc etc/news.scm
Simple merge

diff --cc gnu/local.mk
index faaf428,f485e73..7e1cedf
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1744,9 -1734,14 +1744,10 @@@ dist_patch_DATA =                                             
    %D%/packages/patches/rocm-opencl-runtime-4.3-nocltrace.patch \
    %D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \
    %D%/packages/patches/ruby-sanitize-system-libxml.patch      \
 -  %D%/packages/patches/rust-1.19-mrustc.patch                 \
 -  %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
 -  %D%/packages/patches/rust-1.45-linker-locale.patch          \
 -  %D%/packages/patches/rust-1.48-linker-locale.patch          \
 +  %D%/packages/patches/rustc-1.39.0-src.patch                 \
    %D%/packages/patches/rust-adblock-ignore-live-tests.patch           \
 -  %D%/packages/patches/rust-bootstrap-stage0-test.patch               \
    %D%/packages/patches/rust-coresimd-doctest.patch            \
+   %D%/packages/patches/i3status-rust-enable-unstable-features.patch   \
    %D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
    %D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch        \
    %D%/packages/patches/rust-nettle-disable-vendor.patch                \

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

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

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

diff --cc gnu/packages/emacs-xyz.scm
index 392b4a5,db21102..71d1885
--- 1/gnu/packages/emacs-xyz.scm
--- 2/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@@ -27217,9 -27248,10 +27249,9 @@@ service, and connect it with Emacs via 
                                   "\"" ffmpeg-bin "\")"))))))
           (add-after 'unpack 'configure
             (lambda* (#:key inputs outputs #:allow-other-keys)
-              (substitute* "telega-server.el"
+              (substitute* "telega-customize.el"
                 (("@TELEGA_SERVER_BIN@")
 -                (string-append (assoc-ref inputs "emacs-telega-server")
 -                               "/bin/telega-server")))
 +                (search-input-file inputs "/bin/telega-server")))
               (substitute* "telega-util.el"
                 (("@TELEGA_SHARE@")
                  (string-append (elpa-directory (assoc-ref outputs "out"))

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

diff --cc gnu/packages/gnuzilla.scm
index 0cd8dbd,6d9f8f4..bbc6b53
--- 1/gnu/packages/gnuzilla.scm
--- 2/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -1629,8 -1616,8 +1629,8 @@@ standards of the IceCat project."
               (file-name (string-append "thunderbird-" version "-checkout"))
               (sha256
                (base32
-                "0rp4i353dskx065a6hskvfpf0l2qywqnivks9qc6a85h4yah4rvq")))))
+                "00zj1k3c8p66ylf9n7xp42y6kiv3h6hf8ba7bk6f8wj3hh0r2hrd")))))
 -       ("cargo" ,rust-1.51 "cargo")
 +       ("cargo" ,rust "cargo")
         ("clang" ,clang)
         ("llvm" ,llvm)
         ("m4" ,m4)

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

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/python-xyz.scm
index 2035714,b3a350a..f52a1fe
--- 1/gnu/packages/python-xyz.scm
--- 2/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -13392,25 -13359,36 +13391,34 @@@ text."
                (uri (pypi-uri "moto" version))
                (sha256
                 (base32
-                 "1pix0c7zszjwzfy88n1rpih9vkdm25nqcvz93z850xvgwb4v81bd"))))
+                 "0pvay0jp119lzzwf5qj5h6311271yq0w2i6344ds20grpf6g6gz8"))))
      (build-system python-build-system)
      (arguments
-      `(#:phases (modify-phases %standard-phases
-                   (add-after 'unpack 'patch-hardcoded-executable-names
-                     (lambda _
-                       (substitute* "moto/batch/models.py"
-                         (("/bin/sh")
-                          (which "sh")))
-                       (substitute* (find-files "tests" "\\.py$")
-                         (("#!/bin/bash")
-                          (string-append "#!" (which "bash"))))
-                       #t))
-                   (replace 'check
-                     (lambda _
-                       (invoke "pytest" "-vv" "-m" "not network"
-                               ;; These tests require Docker.
-                               "-k" "not test_terminate_job \
- and not test_invoke_function_from_sqs_exception"))))))
+      `(#:phases
+        (modify-phases %standard-phases
+          (add-after 'unpack 'patch-hardcoded-executable-names
+            (lambda* (#:key inputs #:allow-other-keys)
 -             (let ((bash-exec (string-append
 -                               (assoc-ref inputs "bash")
 -                               "/bin/sh")))
++             (let ((bash-exec (search-input-file inputs "/bin/sh")))
+                (substitute* "moto/batch/models.py"
+                  (("/bin/sh") bash-exec))
+                (substitute* (find-files "tests" "\\.py$")
+                  (("#!/bin/bash") (string-append "#!" bash-exec))))))
+          (replace 'check
+            (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+              (when tests?
+                (add-installed-pythonpath inputs outputs)
+                (invoke "pytest" "-vv" "-m" "not network" "-k"
+                        (string-append
+                         ;; These tests require Docker.
+                         "not test_terminate_job"
+                         " and not test_invoke_function_from_sqs_exception"
+                         " and not test_rotate_secret_lambda_invocations"
+                         ;; These tests also require the network.
+                         " and not test_put_record_batch_http_destination"
+                         " and not test_put_record_http_destination"
+                         " and not test_dependencies"
+                         " and not test_cancel_running_job"
+                         " and not test_container_overrides"))))))))
      (native-inputs
       `(("python-flask" ,python-flask)
         ("python-flask-cors" ,python-flask-cors)

diff --cc gnu/packages/rust-apps.scm
Simple merge

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

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

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

diff --cc gnu/packages/version-control.scm
Simple merge

diff --cc gnu/packages/web-browsers.scm
Simple merge

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

diff --cc gnu/tests/ganeti.scm
Simple merge

diff --cc gnu/tests/networking.scm
index cebba7c,246e0a1..2bcc7f7
--- 1/gnu/tests/networking.scm
--- 2/gnu/tests/networking.scm
+++ b/gnu/tests/networking.scm
@@@ -239,7 -344,20 +339,19 @@@ port 7, and a dict service on port 2628
                         (current-services))))
               marionette))
  
 -          (test-end)
 -          (exit (= (test-runner-fail-count (test-runner-current)) 0)))))
+           (test-equal "ovs0 is up"
+             IFF_UP
+             (marionette-eval
+              '(begin
+                 (use-modules (guix build syscalls))
+ 
+                 (let* ((sock  (socket AF_INET SOCK_STREAM 0))
+                        (flags (network-interface-flags sock "ovs0")))
+                   (close-port sock)
+                   (logand flags IFF_UP)))
+              marionette))
+ 
 +          (test-end))))
  
    (gexp->derivation "openvswitch-test" test))