[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into staging |
|
Date: |
Wed, 9 Jan 2019 04:18:42 -0500 (EST) |
efraim pushed a commit to branch staging
in repository guix.
commit 0e289672503a4e1599ef826d49f2fa5575081942
Merge: 0109b89 6df4d83
Author: Efraim Flashner <address@hidden>
Date: Wed Jan 9 10:48:42 2019 +0200
Merge remote-tracking branch 'origin/master' into staging
Makefile.am | 7 +-
build-aux/build-self.scm | 15 +-
build-aux/hydra/evaluate.scm | 55 +-
build-aux/hydra/gnu-system.scm | 466 +-
doc/guix.texi | 46 +-
build-aux/hydra/gnu-system.scm => gnu/ci.scm | 128 +-
gnu/local.mk | 28 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/aspell.scm | 8 +-
gnu/packages/assembly.scm | 48 +-
gnu/packages/astronomy.scm | 9 +-
gnu/packages/autotools.scm | 6 +-
gnu/packages/aux-files/linux-libre/4.20-arm.conf | 8602 +++++++++++++++++
gnu/packages/aux-files/linux-libre/4.20-arm64.conf | 8380 +++++++++++++++++
gnu/packages/aux-files/linux-libre/4.20-i686.conf | 9751 ++++++++++++++++++++
.../aux-files/linux-libre/4.20-x86_64.conf | 9651 +++++++++++++++++++
gnu/packages/backup.scm | 22 +-
gnu/packages/batik.scm | 1 -
gnu/packages/bioinformatics.scm | 39 +-
gnu/packages/boost.scm | 3 +-
gnu/packages/bootloaders.scm | 17 +-
gnu/packages/bootstrap.scm | 1 +
gnu/packages/calendar.scm | 1 -
gnu/packages/cdrom.scm | 46 +-
gnu/packages/check.scm | 25 +-
gnu/packages/code.scm | 6 +-
gnu/packages/compression.scm | 12 +-
gnu/packages/coq.scm | 454 +
gnu/packages/cran.scm | 1101 ++-
gnu/packages/databases.scm | 84 +-
gnu/packages/datastructures.scm | 32 +-
gnu/packages/disk.scm | 72 +-
gnu/packages/dns.scm | 28 +
gnu/packages/docker.scm | 70 +-
gnu/packages/emacs.scm | 437 +-
gnu/packages/emulators.scm | 12 +-
gnu/packages/game-development.scm | 53 +-
gnu/packages/geo.scm | 118 -
gnu/packages/gettext.scm | 21 +-
gnu/packages/gl.scm | 1 -
gnu/packages/gnome.scm | 46 +-
gnu/packages/gnucash.scm | 3 +-
gnu/packages/gnunet.scm | 20 +-
gnu/packages/gnupg.scm | 175 +-
gnu/packages/gps.scm | 6 +-
gnu/packages/image-processing.scm | 57 +
gnu/packages/image.scm | 26 +
gnu/packages/iso-codes.scm | 6 +-
gnu/packages/jose.scm | 51 +
gnu/packages/kde-frameworks.scm | 106 +-
gnu/packages/libcanberra.scm | 6 +-
gnu/packages/libphidget.scm | 10 +-
gnu/packages/libreoffice.scm | 21 +-
gnu/packages/linux.scm | 127 +-
gnu/packages/llvm.scm | 29 +
gnu/packages/lua.scm | 88 +-
gnu/packages/machine-learning.scm | 34 +
gnu/packages/maths.scm | 100 +-
gnu/packages/messaging.scm | 79 +-
gnu/packages/moe.scm | 10 +-
gnu/packages/music.scm | 39 +-
gnu/packages/networking.scm | 37 +-
gnu/packages/ocaml.scm | 562 +-
.../patches/biber-fix-encoding-write.patch | 31 +
.../gnucash-fix-test-transaction-failure.patch | 54 +
.../patches/kinit-kdeinit-extra_libs.patch | 55 +
gnu/packages/patches/kinit-kdeinit-libpath.patch | 37 +
gnu/packages/patches/kio-search-smbd-on-PATH.patch | 30 +
.../patches/kpackage-allow-external-paths.patch | 13 +
.../patches/libarchive-CVE-2018-1000877.patch | 45 +
.../patches/libarchive-CVE-2018-1000878.patch | 86 +
.../patches/libarchive-CVE-2018-1000880.patch | 51 +
.../patches/libextractor-CVE-2018-20430.patch | 60 +
.../patches/libextractor-CVE-2018-20431.patch | 53 +
.../patches/owncloud-disable-updatecheck.patch | 38 +-
gnu/packages/patches/streamlink-update-test.patch | 70 +
gnu/packages/patches/unrtf-CVE-2016-10091.patch | 189 -
.../vboot-utils-fix-format-load-address.patch | 33 +
.../vboot-utils-fix-tests-show-contents.patch | 142 +
.../patches/vboot-utils-skip-test-workbuf.patch | 21 +
gnu/packages/patches/vinagre-newer-freerdp.patch | 320 +
.../patches/vinagre-newer-rdp-parameters.patch | 212 +
gnu/packages/patches/vinagre-revert-1.patch | 56 -
gnu/packages/patches/vinagre-revert-2.patch | 448 -
gnu/packages/pdf.scm | 27 +-
gnu/packages/perl-check.scm | 15 +-
gnu/packages/perl.scm | 24 +-
gnu/packages/php.scm | 11 +-
gnu/packages/python-crypto.scm | 10 +-
gnu/packages/python-web.scm | 10 +-
gnu/packages/python.scm | 505 +-
gnu/packages/qt.scm | 25 +-
gnu/packages/rdesktop.scm | 123 +-
gnu/packages/ruby.scm | 76 +-
gnu/packages/scheme.scm | 24 +-
gnu/packages/serialization.scm | 33 +-
gnu/packages/simulation.scm | 1 -
gnu/packages/statistics.scm | 128 +
gnu/packages/sync.scm | 28 +-
gnu/packages/syncthing.scm | 4 +-
gnu/packages/terminals.scm | 105 +-
gnu/packages/tex.scm | 18 +-
gnu/packages/time.scm | 28 +-
gnu/packages/tls.scm | 8 +-
gnu/packages/tor.scm | 10 +-
gnu/packages/unrtf.scm | 30 +-
gnu/packages/video.scm | 63 +-
gnu/packages/vim.scm | 24 +-
gnu/packages/virtualization.scm | 24 +-
gnu/packages/web.scm | 501 +-
gnu/packages/wget.scm | 19 +-
gnu/packages/wine.scm | 9 +-
gnu/packages/wxwidgets.scm | 4 +-
gnu/packages/xdisorg.scm | 29 +-
gnu/services/xorg.scm | 11 +-
gnu/tests/monitoring.scm | 5 +-
guix/build/git.scm | 52 +-
guix/build/pull.scm | 154 -
guix/channels.scm | 24 +-
guix/gexp.scm | 64 +-
guix/import/cran.scm | 17 +-
guix/import/github.scm | 30 +-
guix/import/opam.scm | 126 +-
guix/scripts/build.scm | 8 +-
guix/scripts/import/opam.scm | 27 +-
guix/scripts/lint.scm | 13 +-
guix/scripts/pull.scm | 4 +-
guix/self.scm | 137 +-
guix/ui.scm | 4 +-
tests/gexp.scm | 20 +-
130 files changed, 42158 insertions(+), 3996 deletions(-)
diff --cc gnu/local.mk
index 4d8813a,bc54b61..e4c5561
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1162,8 -1181,8 +1175,9 @@@ dist_patch_DATA =
%D%/packages/patches/soundconverter-remove-gconf-dependency.patch \
%D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch \
%D%/packages/patches/soundtouch-CVE-2018-1000223.patch \
- %D%/packages/patches/sssd-curl-compat.patch \
++ %D%/packages/patches/sssd-curl-compat.patch \
%D%/packages/patches/steghide-fixes.patch \
+ %D%/packages/patches/streamlink-update-test.patch \
%D%/packages/patches/superlu-dist-scotchmetis.patch \
%D%/packages/patches/swig-guile-gc.patch \
%D%/packages/patches/swish-e-search.patch \
diff --cc gnu/packages/gl.scm
index 2c64b0b,39b3c52..5fff383
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@@ -50,10 -50,8 +50,9 @@@
#:use-module (gnu packages xorg)
#:use-module (guix download)
#:use-module (guix git-download)
- #:use-module (guix build utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system meson)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)