apteryx pushed a commit to branch staging in repository guix. commit 3c6e220d8100281074c414a43c1efe9a01b53771 Merge: 08473753a0 62048ff9fc Author: Maxim Cournoyer <maxim.courno...@gmail.com> AuthorDate: Tue Sep 27 14:24:37 2022 -0400
Merge branch 'master' into staging. With resolved conflicts in: gnu/local.mk gnu/packages/crates-io.scm NEWS | 21 +- doc/contributing.texi | 41 + doc/guix.texi | 755 +++++++++++++++++- etc/news.scm | 58 ++ etc/snippets/tempel/text-mode | 17 + etc/teams.scm.in | 251 +++++- gnu/build/jami-service.scm | 9 +- gnu/build/linux-container.scm | 8 +- gnu/ci.scm | 3 +- gnu/compression.scm | 69 ++ gnu/image.scm | 5 +- gnu/installer/newt/partition.scm | 8 +- gnu/installer/newt/services.scm | 6 +- gnu/installer/parted.scm | 20 +- gnu/installer/tests.scm | 4 + gnu/installer/user.scm | 18 +- gnu/installer/utils.scm | 19 +- gnu/local.mk | 24 +- gnu/machine/ssh.scm | 96 ++- gnu/packages/accessibility.scm | 33 + gnu/packages/admin.scm | 14 +- gnu/packages/algebra.scm | 13 +- gnu/packages/astronomy.scm | 45 ++ gnu/packages/bioconductor.scm | 16 +- gnu/packages/bioinformatics.scm | 371 ++++++++- gnu/packages/busybox.scm | 117 +-- gnu/packages/calendar.scm | 13 +- gnu/packages/clojure.scm | 4 +- gnu/packages/connman.scm | 5 +- gnu/packages/containers.scm | 4 +- gnu/packages/coq.scm | 124 ++- gnu/packages/cran.scm | 877 +++++++++++---------- gnu/packages/crates-graphics.scm | 10 +- gnu/packages/crates-io.scm | 801 ++++++++++++++++++- gnu/packages/cross-base.scm | 2 +- gnu/packages/crypto.scm | 40 + gnu/packages/databases.scm | 4 +- gnu/packages/docbook.scm | 173 +++- gnu/packages/emacs-xyz.scm | 688 +++++++++++++--- gnu/packages/emacs.scm | 4 +- gnu/packages/enlightenment.scm | 8 +- gnu/packages/finance.scm | 8 +- gnu/packages/fonts.scm | 22 +- gnu/packages/games.scm | 187 +++-- gnu/packages/geo.scm | 2 + gnu/packages/gnome-xyz.scm | 76 +- gnu/packages/gnome.scm | 169 +++- gnu/packages/gnuzilla.scm | 711 ++++++++++++++--- gnu/packages/guile-xyz.scm | 15 +- gnu/packages/instrumentation.scm | 78 +- gnu/packages/ipfs.scm | 108 ++- gnu/packages/jami.scm | 44 +- gnu/packages/java.scm | 856 +++++++++----------- gnu/packages/libusb.scm | 70 ++ gnu/packages/linux.scm | 60 +- gnu/packages/lisp-check.scm | 4 +- gnu/packages/lisp-xyz.scm | 32 + gnu/packages/lisp.scm | 8 +- gnu/packages/lua.scm | 8 +- gnu/packages/machine-learning.scm | 204 +++-- gnu/packages/maths.scm | 1 + gnu/packages/maven.scm | 97 ++- gnu/packages/messaging.scm | 4 +- gnu/packages/monitoring.scm | 46 ++ gnu/packages/networking.scm | 54 +- gnu/packages/ocaml.scm | 169 ++-- gnu/packages/patches/connman-CVE-2022-32292.patch | 34 + .../patches/connman-CVE-2022-32293-pt1.patch | 140 ++++ .../patches/connman-CVE-2022-32293-pt2.patch | 173 ++++ gnu/packages/patches/gnome-todo-libportal.patch | 54 -- .../patches/jami-fix-crash-on-block-contact.patch | 32 + gnu/packages/patches/jami-fix-esc-bug.patch | 24 - .../patches/pjproject-install-libpjsua2.patch | 19 - ...lasma-framework-fix-KF5PlasmaMacros.cmake.patch | 25 + .../qemu-disable-aarch64-migration-test.patch | 13 + ...v.patch => r-httpuv-1.6.6-unvendor-libuv.patch} | 13 +- gnu/packages/pdf.scm | 33 +- gnu/packages/python-build.scm | 23 + gnu/packages/python-crypto.scm | 81 ++ gnu/packages/python-science.scm | 58 ++ gnu/packages/python-xyz.scm | 64 ++ gnu/packages/rust-apps.scm | 26 + gnu/packages/samba.scm | 30 +- gnu/packages/shells.scm | 4 +- gnu/packages/statistics.scm | 145 ++-- gnu/packages/telegram.scm | 763 +++++++++--------- gnu/packages/telephony.scm | 185 ++--- gnu/packages/tex.scm | 84 ++ gnu/packages/vim.scm | 68 +- gnu/packages/virtualization.scm | 1 + gnu/packages/wm.scm | 39 +- gnu/packages/xfce.scm | 25 +- gnu/services/configuration.scm | 3 +- gnu/services/samba.scm | 286 +++++++ gnu/services/telephony.scm | 12 +- gnu/services/web.scm | 9 +- gnu/system/file-systems.scm | 2 +- gnu/system/image.scm | 131 ++- gnu/system/images/hurd.scm | 8 +- gnu/system/images/wsl2.scm | 170 ++++ gnu/tests/samba.scm | 215 +++++ gnu/tests/telephony.scm | 3 +- guix/build-system/go.scm | 67 +- guix/build/debug-link.scm | 8 +- guix/download.scm | 17 +- guix/gnu-maintenance.scm | 72 +- guix/import/cran.scm | 66 +- guix/lint.scm | 26 +- guix/narinfo.scm | 5 +- guix/platforms/x86.scm | 4 +- guix/read-print.scm | 10 +- guix/scripts/home/import.scm | 21 +- guix/scripts/pack.scm | 46 +- guix/scripts/weather.scm | 10 +- po/guix/POTFILES.in | 1 + tests/gnu-maintenance.scm | 62 ++ tests/home-import.scm | 11 +- tests/read-print.scm | 5 + tests/substitute.scm | 46 ++ 119 files changed, 8479 insertions(+), 2824 deletions(-) diff --cc gnu/packages/gnuzilla.scm index 0c701fb77e,b3a301709f..be923de72f --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@@ -323,31 -306,189 +325,194 @@@ in C/C++." ;; the offset from the hardware clock, which does not work ;; in the build container. See <tests/non262/Date/shell.js>. (delete-file-recursively "non262/Date") - (delete-file - "non262/Intl/DateTimeFormat/tz-environment-variable.js")))) - (replace 'pre-check - (lambda _ - (setenv "JSTESTS_EXTRA_ARGS" - (string-join - (list - ;; Do not run tests marked as "random". - "--exclude-random" - ;; Exclude web platform tests. - "--wpt=disabled" - ;; Respect the daemons configured number of jobs. - (string-append "--worker-count=" - (number->string (parallel-job-count)))))))))))) - (native-inputs (modify-inputs (package-native-inputs mozjs) - (replace "autoconf" autoconf) - (replace "llvm" llvm) - (replace "python" python-wrapper) - (append m4))))) + (delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js") + + (setenv "JSTESTS_EXTRA_ARGS" + (string-join + (list + ;; Do not run tests marked as "random". + "--exclude-random" + ;; Exclude web platform tests. + "--wpt=disabled" + ;; Respect the daemons configured number of jobs. + (string-append "--worker-count=" + (number->string + (parallel-job-count))))))))))))) + (native-inputs + (list autoconf-2.13 + automake + llvm ;for llvm-objdump + perl + pkg-config + python-3 + rust + `(,rust "cargo"))) + (inputs + (list icu4c readline zlib)))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;; Temporary packaging of rust-1.59, pending inclusion in (gnu packages rust) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + (define rust-1.58-promise + (delay + (let ((rust-bootstrapped-package + (@@ (gnu packages rust) + rust-bootstrapped-package))) + (rust-bootstrapped-package + rust "1.58.1" "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8")))) + + (define rust-1.59-promise + (delay + (let ((rust-bootstrapped-package + (@@ (gnu packages rust) + rust-bootstrapped-package))) + (rust-bootstrapped-package + (force rust-1.58-promise) + "1.59.0" "1yc5bwcbmbwyvpfq7zvra78l0r8y3lbv60kbr62fzz2vx2pfxj57")))) + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + ;; Temporary packaging of rust-cbindgen-0.23 and its dependencies + ;; follow, pending their inclusion into (gnu packages rust-apps) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + (define rust-textwrap-0.15-promise + (delay + (package + (inherit rust-textwrap-0.12) + (name "rust-textwrap") + (version "0.15.0") + (source (origin + (method url-fetch) + (uri (crate-uri "textwrap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yw513k61lfiwgqrfvsjw1a5wpvm0azhpjr2kr0jhnq9c56is55i")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-hyphenation" ,rust-hyphenation-0.8) + ("rust-smawk" ,rust-smawk-0.3) + ("rust-terminal-size" ,rust-terminal-size-0.1) + ("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1) + ("rust-unicode-width" ,rust-unicode-width-0.1))))))) + + (define rust-clap-lex-0.2 + (package + (name "rust-clap-lex") + (version "0.2.4") + (source (origin + (method url-fetch) + (uri (crate-uri "clap_lex" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-6)))) + (home-page "https://github.com/clap-rs/clap/tree/master/clap_lex") + (synopsis "Minimal, flexible command line parser") + (description "Minimal, flexible command line parser") + (license (list license:expat license:asl2.0)))) + + (define rust-clap-derive-3.2.15-promise + (delay + (package + (inherit rust-clap-derive-3) + (name "rust-clap-derive") + (version "3.2.15") + (source (origin + (method url-fetch) + (uri (crate-uri "clap_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1d2c4vs345fwihkd8cc7m6acbiydcwramkd5mnp36p0a7g6jm9cv")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-heck" ,rust-heck-0.4) + ("rust-proc-macro-error" ,rust-proc-macro-error-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1))))))) + + (define rust-clap-3.2.16-promise + (delay + (package + (inherit rust-clap-3) + (name "rust-clap") + (version "3.2.16") + (source (origin + (method url-fetch) + (uri (crate-uri "clap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1af06z8z7m3327yz1xvzxfjanclgpvvy3lssb745rig7adkbpnx3")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-atty" ,rust-atty-0.2) + ("rust-backtrace" ,rust-backtrace-0.3) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-clap-derive" ,(force rust-clap-derive-3.2.15-promise)) + ("rust-clap-lex" ,rust-clap-lex-0.2) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-regex" ,rust-regex-1) + ("rust-strsim" ,rust-strsim-0.10) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-terminal-size" ,rust-terminal-size-0.1) + ("rust-textwrap" ,(force rust-textwrap-0.15-promise)) + ("rust-unicase" ,rust-unicase-2) + ("rust-yaml-rust" ,rust-yaml-rust-0.4))))))) + + (define rust-cbindgen-0.24-promise + (delay + (package + (inherit rust-cbindgen-0.19) + (name "rust-cbindgen") + (version "0.24.3") + (source (origin + (method url-fetch) + (uri (crate-uri "cbindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yqxqsz2d0cppd8zwihk2139g5gy38wqgl9snj6rnk8gyvnqsdd6")))) + (arguments + `(#:cargo-inputs (("rust-clap" ,(force rust-clap-3.2.16-promise)) + ("rust-heck" ,rust-heck-0.4) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-log" ,rust-log-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-syn" ,rust-syn-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-toml" ,rust-toml-0.5)) + #:cargo-development-inputs (("rust-serial-test" ,rust-serial-test-0.5))))))) + + ;; Bug with IceCat 102 with cbindgen-0.24, see + ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1773259#c5 for + ;; possible patch (untested) + (define rust-cbindgen-0.23-promise + (delay + (package + (inherit (force rust-cbindgen-0.24-promise)) + (name "rust-cbindgen") + (version "0.23.0") + (source (origin + (method url-fetch) + (uri (crate-uri "cbindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav"))))))) + + (define mozilla-compare-locales (origin (method hg-fetch)