[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Tue, 10 Mar 2020 15:55:52 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 50b99c90c87642f664f9c9523a6e40fc8542ddcf
Merge: bda4b5e 21656ff
Author: Marius Bakke <address@hidden>
AuthorDate: Tue Mar 10 20:50:02 2020 +0100
Merge branch 'master' into core-updates
Makefile.am | 8 +-
build-aux/git-authenticate.scm | 6 +-
build-aux/hydra/gnu-system.scm | 4 +-
build-aux/hydra/guix-modular.scm | 4 +-
build-aux/run-system-tests.scm | 115 ----
doc/contributing.texi | 28 +-
doc/fdl-1.3.texi | 4 +-
doc/guix.texi | 32 +-
etc/system-tests.scm | 94 ++++
gnu/ci.scm | 125 +++--
gnu/installer.scm | 21 +
gnu/installer/final.scm | 98 +++-
gnu/installer/newt/final.scm | 40 +-
gnu/installer/newt/network.scm | 10 +-
gnu/installer/newt/page.scm | 587 ++++++++++++++-------
gnu/installer/newt/partition.scm | 8 +-
gnu/installer/newt/user.scm | 64 ++-
gnu/installer/newt/welcome.scm | 44 +-
gnu/installer/steps.scm | 25 +-
gnu/installer/tests.scm | 340 ++++++++++++
gnu/installer/utils.scm | 158 ++++--
gnu/local.mk | 13 +-
gnu/packages/admin.scm | 4 +-
gnu/packages/assembly.scm | 2 +-
gnu/packages/audio.scm | 61 ++-
gnu/packages/bioconductor.scm | 24 +-
gnu/packages/bioinformatics.scm | 90 +++-
gnu/packages/ccache.scm | 23 +-
gnu/packages/chemistry.scm | 5 +-
gnu/packages/chromium.scm | 4 +-
gnu/packages/compression.scm | 53 +-
gnu/packages/coq.scm | 3 +-
gnu/packages/cpp.scm | 2 +-
gnu/packages/cran.scm | 139 +++--
gnu/packages/crates-io.scm | 4 +-
gnu/packages/cups.scm | 6 +-
gnu/packages/databases.scm | 35 ++
gnu/packages/debug.scm | 71 ++-
gnu/packages/dictionaries.scm | 2 +-
gnu/packages/dns.scm | 8 +-
gnu/packages/education.scm | 6 +-
gnu/packages/emacs-xyz.scm | 98 +++-
gnu/packages/engineering.scm | 2 +-
gnu/packages/finance.scm | 8 +-
gnu/packages/fonts.scm | 47 +-
gnu/packages/fontutils.scm | 101 ++--
gnu/packages/freedesktop.scm | 1 +
gnu/packages/game-development.scm | 2 +-
gnu/packages/games.scm | 2 +-
gnu/packages/geo.scm | 64 ++-
gnu/packages/gkrellm.scm | 7 +-
gnu/packages/gnome.scm | 153 ++++--
gnu/packages/gnuzilla.scm | 12 +-
gnu/packages/golang.scm | 2 +-
gnu/packages/guile-xyz.scm | 50 +-
gnu/packages/guile.scm | 27 +-
gnu/packages/haskell-apps.scm | 6 +-
gnu/packages/idris.scm | 2 +-
gnu/packages/image.scm | 4 +-
gnu/packages/java.scm | 36 +-
gnu/packages/kde-multimedia.scm | 4 +-
gnu/packages/kde-pim.scm | 55 +-
gnu/packages/kde-systemtools.scm | 12 +-
gnu/packages/kerberos.scm | 2 +-
gnu/packages/linux.scm | 35 +-
gnu/packages/lisp-xyz.scm | 109 +++-
gnu/packages/machine-learning.scm | 10 +-
gnu/packages/mail.scm | 12 +-
gnu/packages/man.scm | 4 +-
gnu/packages/maths.scm | 50 +-
gnu/packages/messaging.scm | 2 +-
gnu/packages/music.scm | 60 ++-
gnu/packages/networking.scm | 2 +-
gnu/packages/ntp.scm | 8 +-
gnu/packages/package-management.scm | 10 +-
...i-Revert-Make-installation-properly-relo.patch} | 0
gnu/packages/patches/anki-mpv-args.patch | 42 ++
gnu/packages/patches/csvkit-fix-tests.patch | 45 --
gnu/packages/patches/guile-3.0-crash.patch | 17 +
gnu/packages/patches/icecat-makeicecat.patch | 4 +-
gnu/packages/patches/libseccomp-open-aarch64.patch | 27 -
gnu/packages/patches/qemu-CVE-2020-8608.patch | 269 ++++++++++
...ngo-fix-explicit-SDLPango_CopyFTBitmapTo.patch} | 0
gnu/packages/patches/spice-fix-test-armhf.patch | 19 -
.../patches/suitesparse-mongoose-cmake.patch | 27 +
gnu/packages/patches/woff2-libbrotli.patch | 84 ---
gnu/packages/perl.scm | 93 +++-
gnu/packages/plotutils.scm | 2 +-
gnu/packages/pretty-print.scm | 12 +-
gnu/packages/python-web.scm | 6 +-
gnu/packages/python-xyz.scm | 359 +++++++++++--
gnu/packages/re2c.scm | 2 +-
gnu/packages/rust-apps.scm | 7 +-
gnu/packages/samba.scm | 88 +--
gnu/packages/scheme.scm | 4 +-
gnu/packages/sdl.scm | 2 +-
gnu/packages/shells.scm | 2 +-
gnu/packages/skarnet.scm | 26 +-
gnu/packages/slang.scm | 2 +-
gnu/packages/sphinx.scm | 26 +-
gnu/packages/spice.scm | 11 +-
gnu/packages/statistics.scm | 39 +-
gnu/packages/telephony.scm | 7 +
gnu/packages/terminals.scm | 8 +-
gnu/packages/toys.scm | 36 ++
gnu/packages/unicode.scm | 2 +-
gnu/packages/version-control.scm | 41 +-
gnu/packages/video.scm | 4 +-
gnu/packages/vim.scm | 25 +
gnu/packages/virtualization.scm | 5 +-
gnu/packages/web-browsers.scm | 12 +-
gnu/packages/web.scm | 29 +-
gnu/packages/wireservice.scm | 8 +-
gnu/packages/wm.scm | 2 +-
gnu/packages/xdisorg.scm | 2 +-
gnu/packages/xfce.scm | 24 +-
gnu/packages/xml.scm | 2 +-
gnu/services/base.scm | 6 +-
gnu/services/certbot.scm | 12 +-
gnu/services/cuirass.scm | 13 +-
gnu/services/guix.scm | 15 +-
gnu/services/nfs.scm | 1 +
gnu/system.scm | 8 +
gnu/system/vm.scm | 5 +-
gnu/tests.scm | 8 +-
gnu/tests/base.scm | 23 +-
gnu/tests/docker.scm | 4 +-
gnu/tests/install.scm | 204 ++++++-
gnu/tests/mail.scm | 96 ++--
gnu/tests/monitoring.scm | 7 +
guix/download.scm | 1 -
guix/import/cran.scm | 9 +-
guix/scripts.scm | 2 +-
guix/scripts/build.scm | 24 +-
guix/scripts/weather.scm | 41 +-
po/doc/local.mk | 4 +-
tests/guix-build.sh | 13 +-
137 files changed, 3812 insertions(+), 1475 deletions(-)
diff --cc gnu/ci.scm
index 33c2e84,e024c09..70e86b9
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@@ -139,6 -136,49 +140,49 @@@ SYSTEM.
"i686-w64-mingw32"
"x86_64-w64-mingw32"))
+ (define (cross-jobs store system)
+ "Return a list of cross-compilation jobs for SYSTEM."
+ (define (from-32-to-64? target)
+ ;; Return true if SYSTEM is 32-bit and TARGET is 64-bit. This hack
+ ;; prevents known-to-fail cross-builds from i686-linux or armhf-linux to
+ ;; mips64el-linux-gnuabi64.
+ (and (or (string-prefix? "i686-" system)
+ (string-prefix? "i586-" system)
+ (string-prefix? "armhf-" system))
+ (string-contains target "64"))) ;x86_64, mips64el, aarch64, etc.
+
+ (define (same? target)
+ ;; Return true if SYSTEM and TARGET are the same thing. This is so we
+ ;; don't try to cross-compile to 'mips64el-linux-gnu' from
+ ;; 'mips64el-linux'.
+ (or (string-contains target system)
+ (and (string-prefix? "armhf" system) ;armhf-linux
+ (string-prefix? "arm" target)))) ;arm-linux-gnueabihf
+
+ (define (pointless? target)
+ ;; Return #t if it makes no sense to cross-build to TARGET from SYSTEM.
+ (match system
+ ((or "x86_64-linux" "i686-linux")
+ (if (string-contains target "mingw")
+ (not (string=? "x86_64-linux" system))
+ #f))
+ (_
+ ;; Don't try to cross-compile from non-Intel platforms: this isn't
+ ;; very useful and these are often brittle configurations.
+ #t)))
+
+ (define (either proc1 proc2 proc3)
+ (lambda (x)
+ (or (proc1 x) (proc2 x) (proc3 x))))
+
+ (append-map (lambda (target)
+ (map (lambda (package)
+ (package-cross-job store (job-name package)
+ package target system))
- %packages-to-cross-build))
++ (packages-to-cross-build target)))
+ (remove (either from-32-to-64? same? pointless?)
+ %cross-targets)))
+
(define %guixsd-supported-systems
'("x86_64-linux" "i686-linux" "armhf-linux"))
diff --cc gnu/local.mk
index 7c3e264,99badde..cc219b4
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -801,15 -798,11 +803,14 @@@ dist_patch_DATA =
%D%/packages/patches/cpufrequtils-fix-aclocal.patch \
%D%/packages/patches/crawl-upgrade-saves.patch \
%D%/packages/patches/crda-optional-gcrypt.patch \
- %D%/packages/patches/csvkit-fix-tests.patch \
%D%/packages/patches/clucene-contribs-lib.patch \
%D%/packages/patches/cube-nocheck.patch \
+ %D%/packages/patches/curl-use-ssl-cert-env.patch \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-CVE-2017-12836.patch \
+ %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \
%D%/packages/patches/darkice-workaround-fpermissive-error.patch \
+ %D%/packages/patches/datefudge-gettimeofday.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
%D%/packages/patches/dbus-c++-gcc-compat.patch \
%D%/packages/patches/dbus-c++-threading-mutex.patch \
@@@ -988,9 -977,9 +989,10 @@@
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-2.2-default-utf8.patch \
%D%/packages/patches/guile-2.2-skip-oom-test.patch \
+ %D%/packages/patches/guile-3.0-crash.patch \
%D%/packages/patches/guile-default-utf8.patch \
%D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \
+ %D%/packages/patches/guile-finalization-crash.patch \
%D%/packages/patches/guile-linux-syscalls.patch \
%D%/packages/patches/guile-present-coding.patch \
%D%/packages/patches/guile-relocatable.patch \
diff --cc gnu/packages/fontutils.scm
index 71d7a19,3daa518..ea2f509
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@@ -9,8 -9,9 +9,9 @@@
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2018, 2019 Ludovic Courtès <address@hidden>
-;;; Copyright © 2019 Marius Bakke <address@hidden>
+;;; Copyright © 2019, 2020 Marius Bakke <address@hidden>
;;; Copyright © 2020 Roel Janssen <address@hidden>
+ ;;; Copyright © 2020 Nicolas Goaziou <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;