[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Wed, 7 Nov 2018 15:13:11 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 55174e668f2985d1c4efda4fbf58f4061dde0db2
Merge: 1badc85 b31e156
Author: Marius Bakke <address@hidden>
Date: Wed Nov 7 21:09:57 2018 +0100
Merge branch 'master' into core-updates
Makefile.am | 5 +-
doc/guix.texi | 22 +-
etc/completion/bash/guix | 4 +-
.../substitutes/berlin.guixsd.org.pub | 0
.../substitutes/hydra.gnu.org.pub | 0
gnu/build/install.scm | 77 +--
gnu/build/linux-initrd.scm | 8 +-
gnu/build/vm.scm | 19 +-
gnu/local.mk | 3 +-
gnu/packages/benchmark.scm | 6 +-
gnu/packages/bioconductor.scm | 134 ++--
gnu/packages/bioinformatics.scm | 761 +++++++++++----------
gnu/packages/ci.scm | 6 +-
gnu/packages/cran.scm | 156 ++++-
gnu/packages/gnupg.scm | 4 +-
gnu/packages/graph.scm | 4 +-
gnu/packages/guile.scm | 40 +-
gnu/packages/kodi.scm | 4 +-
gnu/packages/libreoffice.scm | 4 +-
gnu/packages/maths.scm | 19 +
gnu/packages/music.scm | 2 +-
gnu/packages/patches/gemma-intel-compat.patch | 44 --
gnu/packages/patches/jq-CVE-2015-8863.patch | 45 --
gnu/packages/patches/libgit2-oom-test.patch | 62 ++
gnu/packages/slang.scm | 14 +-
gnu/packages/statistics.scm | 39 +-
gnu/packages/syncthing.scm | 4 +-
gnu/packages/terminals.scm | 178 ++---
gnu/packages/terraform.scm | 11 +-
gnu/packages/version-control.scm | 3 +-
gnu/packages/video.scm | 8 +-
gnu/packages/web.scm | 18 +-
gnu/packages/xorg.scm | 52 ++
gnu/services/base.scm | 11 +-
gnu/services/cuirass.scm | 6 +-
gnu/services/dns.scm | 4 +-
guix/build-system/r.scm | 2 +-
guix/build/store-copy.scm | 28 +
guix/docker.scm | 16 +-
guix/import/cran.scm | 4 +-
guix/scripts/pack.scm | 415 ++++++-----
guix/scripts/pull.scm | 17 +-
guix/self.scm | 47 +-
guix/ssh.scm | 2 +-
po/guix/de.po | 20 +-
tests/guix-pack-relocatable.sh | 61 ++
tests/guix-pack.sh | 28 +-
tests/pack.scm | 156 ++++-
48 files changed, 1594 insertions(+), 979 deletions(-)
diff --cc gnu/local.mk
index 86f081f,9a8330a..90dbe94
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -836,9 -830,9 +835,8 @@@ dist_patch_DATA =
%D%/packages/patches/java-xerces-bootclasspath.patch \
%D%/packages/patches/java-xerces-build_dont_unzip.patch \
%D%/packages/patches/java-xerces-xjavac_taskdef.patch \
- %D%/packages/patches/jemalloc-arm-address-bits.patch \
%D%/packages/patches/jbig2dec-ignore-testtest.patch \
%D%/packages/patches/json-glib-fix-tests-32bit.patch \
- %D%/packages/patches/jq-CVE-2015-8863.patch \
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
%D%/packages/patches/khmer-use-libraries.patch \
%D%/packages/patches/libziparchive-add-includes.patch \
@@@ -880,8 -874,8 +878,9 @@@
%D%/packages/patches/libevent-2.1-skip-failing-test.patch \
%D%/packages/patches/libexif-CVE-2016-6328.patch \
%D%/packages/patches/libexif-CVE-2017-7544.patch \
+ %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \
%D%/packages/patches/libgit2-mtime-0.patch \
+ %D%/packages/patches/libgit2-oom-test.patch \
%D%/packages/patches/libgdata-fix-tests.patch \
%D%/packages/patches/libgdata-glib-duplicate-tests.patch \
%D%/packages/patches/libgnome-encoding.patch \