[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'signed/master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'signed/master' into core-updates |
|
Date: |
Fri, 10 Dec 2021 15:51:01 -0500 (EST) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit 32750e8c3ed38df4cafb39cffa878c6851abc899
Merge: 6104071 e1e3230
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Fri Dec 10 21:49:25 2021 +0100
Merge remote-tracking branch 'signed/master' into core-updates
etc/completion/bash/guix | 10 +-
gnu/ci.scm | 2 +-
gnu/installer/parted.scm | 5 +-
gnu/local.mk | 5 +-
gnu/packages/admin.scm | 60 ++-
gnu/packages/algebra.scm | 4 +-
gnu/packages/android.scm | 3 +-
gnu/packages/bioinformatics.scm | 54 +++
gnu/packages/browser-extensions.scm | 4 +-
gnu/packages/check.scm | 26 --
gnu/packages/chromium.scm | 6 +-
gnu/packages/crates-graphics.scm | 27 ++
gnu/packages/crates-io.scm | 443 ++++++++++++++++++++-
gnu/packages/django.scm | 36 +-
gnu/packages/dns.scm | 20 +-
gnu/packages/emacs-xyz.scm | 92 ++---
gnu/packages/engineering.scm | 69 +++-
gnu/packages/file-systems.scm | 12 +-
gnu/packages/finance.scm | 15 +-
gnu/packages/firmware.scm | 36 +-
gnu/packages/fonts.scm | 22 +-
gnu/packages/game-development.scm | 22 +-
gnu/packages/games.scm | 8 +-
gnu/packages/gcc.scm | 4 +-
gnu/packages/gnome-xyz.scm | 74 ++--
gnu/packages/gnome.scm | 7 +-
gnu/packages/gnuzilla.scm | 13 +-
gnu/packages/golang.scm | 66 +--
gnu/packages/gps.scm | 7 +-
gnu/packages/guile-xyz.scm | 4 +-
gnu/packages/irc.scm | 33 ++
gnu/packages/linux.scm | 6 +-
gnu/packages/lisp-xyz.scm | 7 +-
gnu/packages/mail.scm | 80 +++-
gnu/packages/messaging.scm | 40 ++
gnu/packages/music.scm | 4 +-
gnu/packages/ocaml.scm | 44 +-
.../bind-re-add-attr-constructor-priority.patch | 57 +++
.../go-github-com-golang-snappy-32bit-test.patch | 53 +++
gnu/packages/patches/icecat-CVE-2021-43527.patch | 354 ----------------
.../patches/monero-use-system-miniupnpc.patch | 12 +-
.../patches/rust-wl-clipboard-rs-newer-wl.patch | 26 ++
.../sendgmail-accept-ignored-gsuite-flag.patch | 39 ++
.../sendgmail-remove-domain-restriction.patch | 34 ++
gnu/packages/perl-maths.scm | 7 +-
gnu/packages/python-xyz.scm | 13 +-
gnu/packages/rust-apps.scm | 192 +++++++++
gnu/packages/sml.scm | 261 +++++++++++-
gnu/packages/sphinx.scm | 63 +++
gnu/packages/ssh.scm | 17 +-
gnu/packages/statistics.scm | 39 +-
gnu/packages/syncthing.scm | 8 +-
gnu/packages/telephony.scm | 34 ++
gnu/packages/terminals.scm | 12 +-
gnu/packages/tor.scm | 7 +-
gnu/packages/web.scm | 41 +-
gnu/tests/web.scm | 2 +-
guix/scripts/environment.scm | 2 +-
guix/scripts/shell.scm | 5 +-
po/guix/es.po | 298 +++++++-------
tests/guix-shell.sh | 14 +
61 files changed, 2097 insertions(+), 863 deletions(-)
diff --cc gnu/ci.scm
index 283b7e3,289e2a9..6039af8
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@@ -138,9 -139,9 +138,9 @@@ SYSTEM.
;; Note: Don't put the '-final' package variants because (1) that's
;; implicit, and (2) they cannot be cross-built (due to the explicit input
;; chain.)
- (list gcc-7 gcc-8 gcc-9 gcc-10 glibc binutils
+ (list gcc-8 gcc-9 gcc-10 gcc-11 glibc binutils
gmp mpfr mpc coreutils findutils diffutils patch sed grep
- gawk gnu-gettext hello guile-2.2 guile-3.0 zlib gzip xz
- gawk gnu-gettext hello guile-2.0 guile-2.2 zlib gzip xz guix
++ gawk gnu-gettext hello guile-2.2 guile-3.0 zlib gzip xz guix
%bootstrap-binaries-tarball
%binutils-bootstrap-tarball
(%glibc-bootstrap-tarball)
diff --cc gnu/local.mk
index efc12fa,223055c..0d39de5
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -883,8 -878,8 +883,9 @@@ dist_patch_DATA =
%D%/packages/patches/bastet-change-source-of-unordered_set.patch \
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
%D%/packages/patches/bc-fix-cross-compilation.patch \
+ %D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \
%D%/packages/patches/bear-disable-preinstall-tests.patch \
+ %D%/packages/patches/bind-re-add-attr-constructor-priority.patch \
%D%/packages/patches/brightnessctl-elogind-support.patch \
%D%/packages/patches/bsd-games-2.17-64bit.patch \
%D%/packages/patches/bsd-games-add-configure-config.patch \
diff --cc gnu/packages/django.scm
index 73c5244,706debf..00a4e3f
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@@ -7,7 -7,7 +7,8 @@@
;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com>
;;; Copyright © 2019 Sam <smbaines8@gmail.com>
;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+ ;;; Copyright © 2021 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/engineering.scm
index ee7c738,dc119f5..4237b04
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@@ -2796,12 -2783,54 +2796,52 @@@ GUI."
(uri (string-append "mirror://gnu/poke/poke-" version
".tar.gz"))
(sha256
- (base32
- "06qgry1pal2vampmbmc1lzlhf1qnjkd8py781r5h020v981n6y5s"))))
+ (base32
"095a0qal1fwnqxnal0xb4mp0n4zy97j3ww1j04ij3jb0jpr4s1ff"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Delete files generated by Bison.
+ (delete-file "gl/parse-datetime.c")
+ (delete-file "gl/parse-datetime-gen.h")
+ (delete-file
"jitter/example-vms/structured/structured-parser.c")
+ (delete-file
"jitter/example-vms/structured/structured-parser.h")
+ (delete-file "jitter/jitterc/jitterc-parser.c")
+ (delete-file "jitter/jitterc/jitterc-parser.h")
+ (delete-file "jitter/jitter/jitter-routine-parser.c")
+ (delete-file "jitter/jitter/jitter-routine-parser.h")
+ (delete-file "libpoke/pkl-tab.c")
+ (delete-file "libpoke/pkl-tab.h")
+ (delete-file "poke/pk-map-tab.c")
+ (delete-file "poke/pk-map-tab.h")
+ ;; Delete files generated by flex.
+ (delete-file
"jitter/example-vms/structured/structured-scanner.c")
+ (delete-file
"jitter/example-vms/structured/structured-scanner.h")
+ (delete-file "jitter/jitterc/jitterc-scanner.c")
+ (delete-file "jitter/jitterc/jitterc-scanner.h")
+ (delete-file "jitter/jitter/jitter-routine-scanner.c")
+ (delete-file "jitter/jitter/jitter-routine-scanner.h")
+ (delete-file "libpoke/pkl-lex.c")
+ (delete-file "libpoke/pkl-lex.h")
+ (delete-file "poke/pk-map-lex.c")
+ (delete-file "poke/pk-map-lex.h")
+ ;; Other generated files:
+ (delete-file
"jitter/example-vms/jitterlisp/jitterlispvm-vm1.c")
+ (delete-file
"jitter/example-vms/jitterlisp/jitterlispvm-vm2.c")
+ (delete-file
"jitter/example-vms/jitterlisp/jitterlispvm-vm.h")
+ (delete-file
"jitter/example-vms/structured/structuredvm-vm1.c")
+ (delete-file
"jitter/example-vms/structured/structuredvm-vm2.c")
+ (delete-file
"jitter/example-vms/structured/structuredvm-vm.h")
+ (delete-file
"jitter/example-vms/structured/structuredvm-vm-main.c")
+ (delete-file
"jitter/example-vms/uninspired/uninspired-vm1.c")
+ (delete-file
"jitter/example-vms/uninspired/uninspired-vm2.c")
+ (delete-file
"jitter/example-vms/uninspired/uninspired-vm.h")
+ (delete-file
"jitter/example-vms/uninspired/uninspired-vm-main.c")
+ (delete-file "libpoke/pvm-vm.h")
+ (delete-file "libpoke/pvm-vm1.c")
+ (delete-file "libpoke/pvm-vm2.c")))))
(build-system gnu-build-system)
;; The GUI, which we elide, requires tcl and tk.
- (native-inputs `(;; Requires bison 3.6+ but we currently only have 3.5.
- ;; Bison 3.6 will be available in the next core update.
- ("bison-3.6" ,bison-3.6)
+ (native-inputs `(("bison" ,bison)
- ("clisp" ,clisp)
("dejagnu" ,dejagnu)
("flex" ,flex)
("libtool" ,libtool)
diff --cc gnu/packages/finance.scm
index 7177f20,1f4dd25..9ab860c
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@@ -683,14 -660,9 +683,14 @@@ other machines/servers. Electroncash d
delete-file-recursively
'("external/miniupnp" "external/rapidjson"
"external/unbound"))
+ ;; TODO: Remove the following when upgrading to a newer tagged
+ ;; version as it will already contain the fix for Boost 1.76.
+ (substitute* "contrib/epee/include/storages/portable_storage.h"
+ (("#include \"int-util.h\"" all)
+ (string-append all "\n#include <boost/mpl/contains.hpp>")))
#t))
(sha256
- (base32 "0nax991fshfh51grhh2ryfrwwws35k16gzl1l3niva28zff2xmq6"))))
+ (base32 "1spsf7m3x4psp9s7mivr6x4886jnbq4i8ll2dl8bv5bsdhcd3pjm"))))
(build-system cmake-build-system)
(native-inputs
`(("doxygen" ,doxygen)
diff --cc gnu/packages/gnome-xyz.scm
index a638624,d409d15..35304a7
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@@ -11,8 -11,8 +11,9 @@@
;;; Copyright © 2020 Ellis Kenyo <me@elken.dev>
;;; Copyright © 2020 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Songlin Jiang <hollowman@hollowman.ml>
+ ;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/telephony.scm
index 9ebc91a,30b1457..5e8610a
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@@ -20,7 -20,7 +20,8 @@@
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+ ;;; Copyright © 2021 Demis Balbach <db@minikn.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/terminals.scm
index 292c101,1b88d38..dbe1afd
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@@ -61,6 -61,8 +61,7 @@@
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
- #:use-module (gnu packages build-tools) ;for meson-0.55
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
diff --cc gnu/packages/web.scm
index 3d4ee58,ca48560..d28c60e
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@@ -52,7 -51,7 +52,8 @@@
;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Jack Hill <jackhill@jackhill.us>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+ ;;; Copyright © 2021 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;;
;;; This file is part of GNU Guix.
;;;