[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: Merge branch 'master' into core-updates-frozen
|
From: |
guix-commits |
|
Subject: |
01/04: Merge branch 'master' into core-updates-frozen |
|
Date: |
Sun, 1 Aug 2021 17:26:31 -0400 (EDT) |
mbakke pushed a commit to branch core-updates-frozen
in repository guix.
commit d2e102d4e4fc5288d93e1100e86b35938a9ac162
Merge: b2a5a18 536bec1
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Aug 1 23:23:32 2021 +0200
Merge branch 'master' into core-updates-frozen
gnu/local.mk | 12 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/bootloaders.scm | 6 +-
gnu/packages/check.scm | 29 +-
gnu/packages/code.scm | 1 +
gnu/packages/compression.scm | 44 +
gnu/packages/coq.scm | 151 +-
gnu/packages/debug.scm | 56 +-
gnu/packages/disk.scm | 1 +
gnu/packages/django.scm | 4 +-
gnu/packages/ebook.scm | 46 +
gnu/packages/emacs-xyz.scm | 69 +-
gnu/packages/emulators.scm | 4 +-
gnu/packages/freedesktop.scm | 1 +
gnu/packages/games.scm | 66 +-
gnu/packages/golang.scm | 163 ++-
gnu/packages/gtk.scm | 4 +-
gnu/packages/guile-xyz.scm | 28 +-
gnu/packages/haskell-xyz.scm | 2 +-
gnu/packages/language.scm | 1 +
gnu/packages/linux.scm | 16 +-
gnu/packages/lisp-xyz.scm | 7 +-
gnu/packages/machine-learning.scm | 128 +-
gnu/packages/mail.scm | 32 +-
gnu/packages/maths.scm | 61 +
gnu/packages/music.scm | 49 +-
gnu/packages/ocaml.scm | 21 +-
gnu/packages/parallel.scm | 94 +-
.../patches/cpuinfo-system-libraries.patch | 50 +
gnu/packages/patches/fp16-system-libraries.patch | 105 ++
gnu/packages/patches/fxdiv-system-libraries.patch | 44 +
gnu/packages/patches/onnx-shared-libraries.patch | 24 +
.../patches/onnx-skip-model-downloads.patch | 16 +
...test.patch => onnx-use-system-googletest.patch} | 3 +
.../patches/pthreadpool-system-libraries.patch | 79 ++
...tio.patch => racket-minimal-sh-via-rktio.patch} | 8 +-
.../patches/xnnpack-system-libraries.patch | 1499 ++++++++++++++++++++
gnu/packages/pdf.scm | 4 +-
gnu/packages/pulseaudio.scm | 11 +
gnu/packages/python-web.scm | 12 +-
gnu/packages/python-xyz.scm | 28 +-
gnu/packages/racket.scm | 597 ++++++--
gnu/packages/rpm.scm | 200 +++
gnu/packages/security-token.scm | 18 +
gnu/packages/serialization.scm | 71 +-
gnu/packages/text-editors.scm | 11 +-
gnu/packages/web.scm | 129 +-
guix/licenses.scm | 6 +-
48 files changed, 3626 insertions(+), 389 deletions(-)
diff --cc gnu/local.mk
index c3a5e9c,c530507..7491e22
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -929,9 -928,9 +930,10 @@@ dist_patch_DATA =
%D%/packages/patches/collectd-5.11.0-noinstallvar.patch \
%D%/packages/patches/combinatorial-blas-awpm.patch \
%D%/packages/patches/combinatorial-blas-io-fix.patch \
+ %D%/packages/patches/coreutils-gnulib-tests.patch \
%D%/packages/patches/coreutils-ls.patch \
%D%/packages/patches/cpufrequtils-fix-aclocal.patch \
+ %D%/packages/patches/cpuinfo-system-libraries.patch \
%D%/packages/patches/crawl-upgrade-saves.patch \
%D%/packages/patches/crda-optional-gcrypt.patch \
%D%/packages/patches/clucene-contribs-lib.patch \
@@@ -1025,12 -1028,14 +1027,14 @@@
%D%/packages/patches/foobillard++-pkg-config.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
- %D%/packages/patches/fontconfig-hurd-path-max.patch \
+ %D%/packages/patches/fp16-system-libraries.patch \
%D%/packages/patches/fpc-reproducibility.patch \
%D%/packages/patches/fplll-std-fenv.patch \
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
+ %D%/packages/patches/freeglut-gcc-compat.patch \
%D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/fuse-overlapping-headers.patch
\
+ %D%/packages/patches/fxdiv-system-libraries.patch \
%D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \
%D%/packages/patches/ganeti-deterministic-manual.patch \
%D%/packages/patches/ganeti-disable-version-symlinks.patch \
@@@ -1599,8 -1636,6 +1607,7 @@@
%D%/packages/patches/python-memcached-syntax-warnings.patch \
%D%/packages/patches/python-mox3-python3.6-compat.patch \
%D%/packages/patches/python-testtools.patch \
+ %D%/packages/patches/python-typing-inspect-fix.patch \
- %D%/packages/patches/python-onnx-use-system-googletest.patch \
%D%/packages/patches/python-packaging-test-arch.patch \
%D%/packages/patches/python2-parameterized-docstring-test.patch \
%D%/packages/patches/python-paste-remove-timing-test.patch \
diff --cc gnu/packages/bootloaders.scm
index b4bf722,261184f..d8d1691
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@@ -925,10 -931,11 +925,10 @@@ to Novena upstream, does not load u-boo
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
`(modify-phases ,phases
- (add-after 'patch-rockpro64-config 'set-environment
+ (add-after 'unpack 'set-environment
(lambda* (#:key inputs #:allow-other-keys)
- (setenv "BL31" (string-append (assoc-ref inputs "firmware")
- "/bl31.elf"))
- #t))
+ (setenv "BL31"
+ (search-input-file inputs "/bl31.elf"))))
;; Phases do not succeed on the bl31 ELF.
(delete 'strip)
(delete 'validate-runpath)))))
diff --cc gnu/packages/check.scm
index fbdc46c,0d02293..fd35eed
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@@ -25,8 -25,8 +25,8 @@@
;;; Copyright © 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2015, 2017, 2018, 2020, 2021 Ricardo Wurmus
<rekado@elephly.net>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke
<mbakke@fastmail.com>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke
<marius@gnu.org>
- ;;; Copyright © 2017, 2018, 2020 Ludovic Courtès <ludo@gnu.org>
+ ;;; Copyright © 2017, 2018, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2019, 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com>
diff --cc gnu/packages/compression.scm
index c6ddfb4,26cddb1..560e9d0
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@@ -32,7 -32,7 +32,8 @@@
;;; Copyright © 2020 Léo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
+;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
+ ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/security-token.scm
index f722c27,1f60e25..b2a59de
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@@ -10,8 -10,8 +10,9 @@@
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Raphaël Mélotte <raphael.melotte@mind.be>
;;; Copyright © 2021 Antero Mejr <antero@kodmin.com>
+;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 Sergey Trofimov <sarg@sarg.org.ru>
+ ;;; Copyright © 2021 Dhruvin Gandhi <contact@dhruvin.dev>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/serialization.scm
index 7fd083f,19fbafa..2362b07
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@@ -10,7 -10,7 +10,8 @@@
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
+;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+ ;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
;;;
;;; This file is part of GNU Guix.
;;;