[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: |
Wed, 15 Apr 2020 13:36:31 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit bd21acf6c390e4fe87eb6053f0b5185d6ecbcf9f
Merge: a4f1a7e b44e19a
Author: Marius Bakke <address@hidden>
AuthorDate: Wed Apr 15 19:26:55 2020 +0200
Merge branch 'master' into core-updates
Makefile.am | 29 +-
NEWS | 146 +-
build-aux/compile-all.scm | 12 +-
doc/guix.texi | 5 +-
etc/release-manifest.scm | 30 +-
gnu/installer.scm | 5 +-
gnu/local.mk | 4 +-
gnu/packages/bioconductor.scm | 16 +-
gnu/packages/bioinformatics.scm | 14 +-
gnu/packages/bootloaders.scm | 4 +-
gnu/packages/cook.scm | 8 +
gnu/packages/cran.scm | 117 +-
gnu/packages/dlang.scm | 51 +-
gnu/packages/emacs-xyz.scm | 209 +-
gnu/packages/engineering.scm | 32 +-
gnu/packages/games.scm | 50 +
gnu/packages/gnome.scm | 3 +-
gnu/packages/gnuzilla.scm | 2 +-
gnu/packages/gpodder.scm | 6 +-
gnu/packages/guile-xyz.scm | 88 +-
gnu/packages/hardware.scm | 31 +
gnu/packages/i2p.scm | 8 +-
gnu/packages/kawa.scm | 16 +-
gnu/packages/linux.scm | 24 +-
gnu/packages/lisp-xyz.scm | 81 +-
gnu/packages/lisp.scm | 39 +-
gnu/packages/mail.scm | 4 +-
gnu/packages/man.scm | 4 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/package-management.scm | 8 +-
gnu/packages/patches/gdm-default-session.patch | 91 +
.../libvpx-use-after-free-in-postproc.patch | 34 -
.../patches/python-jedi-deleted-variables.patch | 38 -
gnu/packages/patches/txr-shell.patch | 59 -
gnu/packages/perl.scm | 190 +
gnu/packages/python-xyz.scm | 42 +-
gnu/packages/radio.scm | 21 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/statistics.scm | 81 +-
gnu/packages/version-control.scm | 10 +-
gnu/packages/video.scm | 23 +-
gnu/packages/virtualization.scm | 21 +-
gnu/packages/webkit.scm | 6 +-
gnu/services/linux.scm | 1 -
gnu/services/shepherd.scm | 7 +
gnu/system/install.scm | 43 +-
guix/scripts/weather.scm | 5 +-
po/doc/guix-manual.de.po | 18793 ++++++++-------
po/doc/guix-manual.es.po | 18819 ++++++++-------
po/doc/guix-manual.ru.po | 502 +-
po/guix/de.po | 1262 +-
po/guix/es.po | 1266 +-
po/guix/fr.po | 1262 +-
po/guix/pt_BR.po | 1266 +-
po/packages/de.po | 9349 ++++----
po/packages/fr.po | 23311 +++++++++++--------
57 files changed, 42894 insertions(+), 34666 deletions(-)
diff --cc gnu/local.mk
index 0d49838,952fc55..b11876d
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -941,12 -926,17 +941,13 @@@ dist_patch_DATA =
%D%/packages/patches/gcc-8-strmov-store-file-names.patch \
%D%/packages/patches/gcc-9-asan-fix-limits-include.patch \
%D%/packages/patches/gcc-9-strmov-store-file-names.patch \
- %D%/packages/patches/gd-CVE-2018-5711.patch \
- %D%/packages/patches/gd-CVE-2018-1000222.patch \
- %D%/packages/patches/gd-CVE-2019-6977.patch \
- %D%/packages/patches/gd-CVE-2019-6978.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \
- %D%/packages/patches/gd-freetype-test-failure.patch \
+ %D%/packages/patches/gd-brect-bounds.patch \
+ %D%/packages/patches/gdm-default-session.patch \
%D%/packages/patches/geoclue-config.patch \
- %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
- %D%/packages/patches/ghc-diff-swap-cover-args.patch \
- %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch
\
+ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
+ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \
+ %D%/packages/patches/ghc-diff-swap-cover-args.patch \
%D%/packages/patches/ghc-haddock-api-fix-haddock.patch \
%D%/packages/patches/ghc-hpack-fix-tests.patch \
%D%/packages/patches/ghc-microlens-aeson-fix-tests.patch \
diff --cc gnu/system/install.scm
index 0dc26b2,0965c4d..8b3a5d5
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@@ -407,7 -443,13 +442,13 @@@ Access documentation at any time by pre
(list bare-bones-os
glibc-utf8-locales
texinfo
- guile-2.2)))))
- (canonical-package guile-2.2)))
++ guile-2.2))
+
+ ;; Machines without Kernel Mode Setting (those with many old and
+ ;; current AMD GPUs, SiS GPUs, ...) need uvesafb to show the GUI
+ ;; installer. Some may also need a kernel parameter like nomodeset
+ ;; or vga=793, but we leave that for the user to specify in GRUB.
+ (service uvesafb-service-type))))
(define %issue
;; Greeting.