[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Mon, 5 Nov 2018 18:06:45 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit f4a5faa9dcadc698383e15743ac5f974ee0e3c8b
Merge: 16b89ec adde151
Author: Marius Bakke <address@hidden>
Date: Mon Nov 5 23:56:22 2018 +0100
Merge branch 'master' into core-updates
Makefile.am | 10 +-
doc/contributing.de.texi | 537 +
doc/{guix.texi => guix.de.texi} | 16925 ++++----
doc/guix.texi | 120 +-
doc/local.mk | 5 +-
gnu/artwork.scm | 4 +-
gnu/build/install.scm | 26 +-
gnu/local.mk | 8 +-
gnu/packages/audio.scm | 4 +-
.../linux-libre/{4.18-arm.conf => 4.19-arm.conf} | 1141 +-
.../{4.18-arm64.conf => 4.19-arm64.conf} | 3562 +-
.../linux-libre/{4.18-i686.conf => 4.19-i686.conf} | 15836 ++++----
.../{4.18-x86_64.conf => 4.19-x86_64.conf} | 2706 +-
gnu/packages/bioconductor.scm | 4 +-
gnu/packages/bioinformatics.scm | 56 +-
gnu/packages/c.scm | 8 +-
gnu/packages/calcurse.scm | 4 +-
gnu/packages/check.scm | 4 +-
gnu/packages/code.scm | 10 +-
gnu/packages/compression.scm | 8 +-
gnu/packages/cran.scm | 1121 +-
gnu/packages/cups.scm | 8 +-
gnu/packages/curl.scm | 14 +
gnu/packages/databases.scm | 17 +-
gnu/packages/debian.scm | 16 +-
gnu/packages/dictionaries.scm | 2 +-
gnu/packages/dns.scm | 8 +-
gnu/packages/electronics.scm | 48 +-
gnu/packages/emacs.scm | 52 +-
gnu/packages/emulators.scm | 15 +-
gnu/packages/file-systems.scm | 6 +-
gnu/packages/fpga.scm | 13 +-
gnu/packages/game-development.scm | 13 +-
gnu/packages/games.scm | 65 +-
gnu/packages/gnome.scm | 8 +-
gnu/packages/gnuzilla.scm | 48 +-
gnu/packages/golang.scm | 1026 +-
gnu/packages/gps.scm | 4 +-
gnu/packages/hardware.scm | 44 +
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 29 +
gnu/packages/ipfs.scm | 212 +
gnu/packages/javascript.scm | 16 +-
gnu/packages/julia.scm | 4 +-
gnu/packages/kde.scm | 40 +
gnu/packages/libreoffice.scm | 5 +
gnu/packages/libusb.scm | 4 +-
gnu/packages/linux.scm | 34 +-
gnu/packages/lisp.scm | 21 +-
gnu/packages/lua.scm | 3 +
gnu/packages/lxqt.scm | 1143 +-
gnu/packages/mail.scm | 65 +-
gnu/packages/maths.scm | 16 +-
gnu/packages/messaging.scm | 235 +-
gnu/packages/monitoring.scm | 26 +
gnu/packages/mono.scm | 2 +-
gnu/packages/mpd.scm | 12 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/package-management.scm | 4 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 26 +-
.../patches/mailutils-uninitialized-memory.patch | 87 -
.../meandmyshadow-define-paths-earlier.patch | 50 +
gnu/packages/patches/myrepos-CVE-2018-7032.patch | 69 -
.../rust-1.25-accept-more-detailed-gdb-lines.patch | 17 +
...roducible-builds-by-forcing-window.search.patch | 25 +
.../patches/telegram-purple-adjust-test.patch | 14 +
gnu/packages/patches/xapian-revert-5489fb2f8.patch | 23 -
.../zathura-pdf-mupdf-link-to-jpeg-libraries.patch | 55 -
gnu/packages/pdf.scm | 84 +-
gnu/packages/photo.scm | 8 +-
gnu/packages/pretty-print.scm | 4 +-
gnu/packages/python-crypto.scm | 4 +-
gnu/packages/python-web.scm | 38 +
gnu/packages/python.scm | 86 +-
gnu/packages/qt.scm | 345 +-
gnu/packages/ruby.scm | 10 +-
gnu/packages/rust.scm | 209 +-
gnu/packages/sdl.scm | 10 +-
gnu/packages/search.scm | 7 +-
gnu/packages/security-token.scm | 4 +-
gnu/packages/serialization.scm | 26 +-
gnu/packages/shells.scm | 26 +-
gnu/packages/shellutils.scm | 14 +-
gnu/packages/ssh.scm | 14 +-
gnu/packages/statistics.scm | 113 +-
gnu/packages/syncthing.scm | 132 -
gnu/packages/textutils.scm | 4 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/version-control.scm | 76 +-
gnu/packages/video.scm | 29 +-
gnu/packages/vpn.scm | 24 +-
gnu/packages/web.scm | 46 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wine.scm | 6 +-
gnu/packages/wm.scm | 4 +-
gnu/packages/xdisorg.scm | 34 +
gnu/packages/xiph.scm | 80 +-
gnu/packages/xml.scm | 33 +-
gnu/packages/xorg.scm | 18 +-
gnu/services/web.scm | 5 +
guix/build/git.scm | 2 +
guix/gexp.scm | 25 +-
guix/import/hackage.scm | 21 +-
guix/profiles.scm | 2 +-
guix/scripts.scm | 38 +-
guix/scripts/pack.scm | 6 +-
guix/scripts/package.scm | 4 +-
guix/scripts/processes.scm | 223 +
guix/scripts/system.scm | 3 +-
po/doc/guix-manual.de.po | 39797 +++++++++++++++++++
po/doc/local.mk | 1 +
po/guix/POTFILES.in | 1 +
tests/gexp.scm | 16 +
tests/pack.scm | 2 +-
tests/processes.scm | 86 +
116 files changed, 66087 insertions(+), 21396 deletions(-)
diff --cc gnu/local.mk
index e0bd431,1f9f6b3..4f1d630
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -940,9 -938,9 +941,8 @@@ dist_patch_DATA =
%D%/packages/patches/lvm2-static-link.patch \
%D%/packages/patches/lxsession-use-gapplication.patch \
%D%/packages/patches/lyx-2.2.3-fix-test.patch \
- %D%/packages/patches/mailutils-uninitialized-memory.patch \
%D%/packages/patches/make-glibc-compat.patch \
%D%/packages/patches/make-impure-dirs.patch \
- %D%/packages/patches/mariadb-gcc-ice.patch \
%D%/packages/patches/mariadb-client-test-32bit.patch \
%D%/packages/patches/mars-install.patch \
%D%/packages/patches/mars-sfml-2.3.patch \
@@@ -974,8 -973,6 +975,7 @@@
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/mutt-store-references.patch \
- %D%/packages/patches/myrepos-CVE-2018-7032.patch \
+ %D%/packages/patches/m4-gnulib-libio.patch \
%D%/packages/patches/net-tools-bitrot.patch \
%D%/packages/patches/netcdf-date-time.patch \
%D%/packages/patches/netcdf-tst_h_par.patch \
@@@ -1165,8 -1165,7 +1166,9 @@@
%D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \
%D%/packages/patches/teensy-loader-cli-help.patch \
%D%/packages/patches/teeworlds-use-latest-wavpack.patch \
+ %D%/packages/patches/texinfo-perl-compat.patch \
+ %D%/packages/patches/texinfo-5-perl-compat.patch \
+ %D%/packages/patches/telegram-purple-adjust-test.patch \
%D%/packages/patches/texi2html-document-encoding.patch \
%D%/packages/patches/texi2html-i18n.patch \
%D%/packages/patches/thefuck-test-environ.patch \
diff --cc gnu/packages/curl.scm
index b09afe3,2fb8725..61313af
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -50,7 -50,8 +50,8 @@@
(define-public curl
(package
(name "curl")
- (version "7.59.0")
+ (version "7.61.1")
+ (replacement curl-7.62.0)
(source (origin
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-";
diff --cc gnu/packages/qt.scm
index 7d1a4ca,d487699..1dd2110
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@@ -492,10 -506,9 +506,10 @@@ system, and the core design of Django i
version ".tar.xz"))
(sha256
(base32
- "0ipv18ypbgpxhh49rfplqmflskmnhhwj1bjr5hrwi0jpvar4gl50"))
+ "01q1rn5rp9biq3z38953z2hgm4nirvp2jfv8wg7isnld8v1yg0b3"))
;; Use TZDIR to avoid depending on package "tzdata".
- (patches (search-patches "qtbase-use-TZDIR.patch"))
+ (patches (search-patches "qtbase-use-TZDIR.patch"
+ "qtbase-glibc-compat.patch"))
(modules '((guix build utils)))
(snippet
;; corelib uses bundled harfbuzz, md4, md5, sha3