[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
From: |
guix-commits |
Subject: |
01/01: Merge branch 'master' into staging |
Date: |
Wed, 7 Sep 2022 12:44:50 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 6cfb2e6270b2759fb98a0de665235bcbb9b9eccf
Merge: 92fdda5a63 453e7dd8c4
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Sep 7 18:20:23 2022 +0200
Merge branch 'master' into staging
.dir-locals.el | 14 +
Makefile.am | 4 -
doc/contributing.texi | 15 +-
doc/guix.texi | 29 +-
etc/news.scm | 7 +
etc/teams.scm.in | 12 +
gnu/build/linux-boot.scm | 18 +-
gnu/build/shepherd.scm | 3 +-
gnu/image.scm | 19 +-
gnu/local.mk | 11 +-
gnu/machine/digital-ocean.scm | 3 +-
gnu/packages/admin.scm | 6 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/aux-files/linux-libre/5.18-arm.conf | 10437 ---
gnu/packages/aux-files/linux-libre/5.18-arm64.conf | 10888 ---
gnu/packages/aux-files/linux-libre/5.18-i686.conf | 11361 ---
.../aux-files/linux-libre/5.18-x86_64.conf | 11468 ---
gnu/packages/benchmark.scm | 51 +-
gnu/packages/bioconductor.scm | 10 +-
gnu/packages/bioinformatics.scm | 2 +
gnu/packages/check.scm | 4 +-
gnu/packages/chez.scm | 211 +-
gnu/packages/chromium.scm | 6 +-
gnu/packages/crates-io.scm | 1275 +-
gnu/packages/dictionaries.scm | 6 +-
gnu/packages/diffoscope.scm | 2 -
gnu/packages/disk.scm | 8 +-
gnu/packages/elixir.scm | 4 +-
gnu/packages/emacs-xyz.scm | 207 +-
gnu/packages/erlang.scm | 4 +-
gnu/packages/fpga.scm | 32 +
gnu/packages/game-development.scm | 53 -
gnu/packages/games.scm | 97 +
gnu/packages/geo.scm | 180 +-
gnu/packages/gl.scm | 39 -
gnu/packages/gnome.scm | 31 +-
gnu/packages/gnustep.scm | 35 +
gnu/packages/golang.scm | 23 +
gnu/packages/graphics.scm | 82 +-
gnu/packages/guile-xyz.scm | 119 +-
gnu/packages/image-viewers.scm | 32 +
gnu/packages/less.scm | 10 +-
gnu/packages/linux.scm | 162 +-
gnu/packages/lisp-check.scm | 76 +-
gnu/packages/lisp-xyz.scm | 425 +-
gnu/packages/lisp.scm | 59 +
gnu/packages/llvm.scm | 119 +-
gnu/packages/mail.scm | 73 +
gnu/packages/messaging.scm | 3 -
gnu/packages/monitoring.scm | 6 +-
gnu/packages/mono.scm | 175 -
gnu/packages/networking.scm | 4 +-
gnu/packages/ntp.scm | 4 +-
gnu/packages/ocaml.scm | 33 +
gnu/packages/orange.scm | 2 +-
gnu/packages/package-management.scm | 18 +-
gnu/packages/password-utils.scm | 51 +-
gnu/packages/patches/chez-scheme-bin-sh.patch | 76 +
gnu/packages/patches/mono-mdoc-timestamping.patch | 15 -
.../racket-backport-8.6-cross-install.patch | 126 +
.../racket-backport-8.6-docindex-write.patch | 36 +
.../patches/racket-backport-8.6-hurd.patch | 609 +
gnu/packages/patches/racket-backport-8.6-zuo.patch | 481 +
.../patches/racket-chez-scheme-bin-sh.patch | 76 +
...h-via-rktio.patch => racket-rktio-bin-sh.patch} | 60 +-
gnu/packages/patches/racket-zuo-bin-sh.patch | 74 +
.../patches/rust-openssl-sys-no-vendor.patch | 7 +-
.../patches/stex-copy-from-immutable-store.patch | 41 +
gnu/packages/patches/turbovnc-custom-paths.patch | 299 +
.../patches/turbovnc-find-system-packages.patch | 51 +
gnu/packages/python-compression.scm | 8 +-
gnu/packages/python-xyz.scm | 60 +-
gnu/packages/racket.scm | 240 +-
gnu/packages/ruby.scm | 42 +
gnu/packages/rust-apps.scm | 31 +
gnu/packages/sdl.scm | 41 -
gnu/packages/statistics.scm | 45 +
gnu/packages/terminals.scm | 4 +-
gnu/packages/tex.scm | 40 +-
gnu/packages/text-editors.scm | 10 +-
gnu/packages/tls.scm | 2 +-
gnu/packages/version-control.scm | 31 +-
gnu/packages/video.scm | 15 +-
gnu/packages/vim.scm | 28 +
gnu/packages/vnc.scm | 193 +
gnu/packages/webkit.scm | 1 +
gnu/packages/wm.scm | 4 +-
gnu/packages/xfce.scm | 4 +-
gnu/services/desktop.scm | 6 +-
gnu/services/web.scm | 7 +-
gnu/system/image.scm | 3 +-
gnu/system/images/novena.scm | 6 +-
gnu/system/images/pine64.scm | 6 +-
gnu/system/images/pinebook-pro.scm | 9 +-
gnu/system/images/rock64.scm | 8 +-
guix/build/profiles.scm | 7 +-
guix/import/gnome.scm | 7 +-
guix/platform.scm | 2 +-
guix/read-print.scm | 59 +-
guix/search-paths.scm | 11 +
guix/store.scm | 69 +-
po/doc/guix-cookbook.fr.po | 6 +-
po/doc/guix-manual.de.po | 24798 +++---
po/doc/guix-manual.es.po | 24423 +++---
po/doc/guix-manual.fr.po | 81214 ++++++++++++++-----
po/doc/guix-manual.pt_BR.po | 23556 +++---
po/doc/guix-manual.ru.po | 23914 +++---
po/doc/guix-manual.zh_CN.po | 51207 ++++++++----
po/guix/bn.po | 659 +-
po/guix/cs.po | 661 +-
po/guix/da.po | 665 +-
po/guix/de.po | 742 +-
po/guix/eo.po | 665 +-
po/guix/es.po | 671 +-
po/guix/fa.po | 661 +-
po/guix/fi.po | 659 +-
po/guix/fr.po | 666 +-
po/guix/hu.po | 665 +-
po/guix/it.po | 731 +-
po/guix/ja.po | 659 +-
po/guix/ko.po | 661 +-
po/guix/nl.po | 666 +-
po/guix/oc.po | 659 +-
po/guix/pl.po | 660 +-
po/guix/pt_BR.po | 666 +-
po/guix/ru.po | 661 +-
po/guix/si.po | 659 +-
po/guix/sk.po | 745 +-
po/guix/sr.po | 665 +-
po/guix/sv.po | 664 +-
po/guix/ta.po | 664 +-
po/guix/tr.po | 661 +-
po/guix/uk.po | 659 +-
po/guix/vi.po | 665 +-
po/guix/zh_CN.po | 660 +-
po/packages/da.po | 4886 +-
po/packages/de.po | 4877 +-
po/packages/eo.po | 4877 +-
po/packages/es.po | 4877 +-
po/packages/fa.po | 4877 +-
po/packages/fi.po | 4877 +-
po/packages/fr.po | 5955 +-
po/packages/hu.po | 4877 +-
po/packages/it.po | 4877 +-
po/packages/ko.po | 4877 +-
po/packages/nl.po | 4877 +-
po/packages/oc.po | 4877 +-
po/packages/pl.po | 4877 +-
po/packages/pt_BR.po | 4877 +-
po/packages/sk.po | 4877 +-
po/packages/sr.po | 4877 +-
po/packages/tr.po | 4877 +-
po/packages/zh_CN.po | 4877 +-
tests/guix-describe.sh | 4 +-
tests/guix-shell.sh | 10 +
tests/guix-system.sh | 29 +-
tests/read-print.scm | 3 +
157 files changed, 201393 insertions(+), 185745 deletions(-)
diff --cc gnu/local.mk
index a9ea72673f,e454189b8b..50b9c37fac
--- a/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/crates-io.scm
index b2241e571f,7f89c6394a..e4182499a4
--- a/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")