[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: |
Mon, 19 Nov 2018 19:41:56 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 4f70db97a040b35f125484ce8885766ca5807dd4
Merge: 2d54685 9acfe27
Author: Marius Bakke <address@hidden>
Date: Tue Nov 20 01:14:12 2018 +0100
Merge branch 'master' into core-updates
Makefile.am | 2 +
config-daemon.ac | 4 +-
doc/contributing.texi | 3 +-
doc/guix.texi | 81 +-
gnu/bootloader/extlinux.scm | 6 +-
gnu/bootloader/grub.scm | 104 +-
gnu/bootloader/u-boot.scm | 5 -
gnu/build/activation.scm | 17 +-
gnu/local.mk | 6 +
gnu/packages/algebra.scm | 36 +-
gnu/packages/antivirus.scm | 156 ++
gnu/packages/audio.scm | 122 +-
gnu/packages/bioinformatics.scm | 111 +-
gnu/packages/bootloaders.scm | 6 +-
gnu/packages/cran.scm | 24 +-
gnu/packages/emacs.scm | 6 +-
gnu/packages/game-development.scm | 4 +-
gnu/packages/games.scm | 4 +-
gnu/packages/gl.scm | 3 +-
gnu/packages/guile.scm | 6 +-
gnu/packages/image.scm | 4 +-
gnu/packages/java.scm | 145 --
gnu/packages/linux.scm | 16 +-
gnu/packages/lisp.scm | 276 ++-
gnu/packages/llvm.scm | 35 +-
gnu/packages/machine-learning.scm | 5 +-
gnu/packages/man.scm | 14 +-
gnu/packages/maths.scm | 127 +-
gnu/packages/mpi.scm | 42 +
gnu/packages/multiprecision.scm | 66 +
gnu/packages/ocaml.scm | 2328 ++++++++++++++------
gnu/packages/package-management.scm | 7 +-
gnu/packages/patches/clamav-config-llvm-libs.patch | 14 +
.../patches/clamav-system-tomsfastmath.patch | 102 +
.../patches/emacs-realgud-fix-configure-ac.patch | 27 +
...ml-bisect-fix-camlp4-in-another-directory.patch | 246 ++-
gnu/packages/patches/tomsfastmath-constness.patch | 76 +
gnu/packages/python.scm | 73 +-
gnu/packages/simulation.scm | 490 +++-
gnu/packages/statistics.scm | 8 +-
gnu/packages/version-control.scm | 52 +
gnu/packages/web.scm | 4 +-
gnu/system.scm | 166 +-
gnu/system/linux-initrd.scm | 13 +-
gnu/system/vm.scm | 210 +-
gnu/tests/base.scm | 11 +-
guix/build-system/clojure.scm | 195 ++
guix/build-system/ocaml.scm | 24 +-
guix/build/clojure-build-system.scm | 110 +
guix/build/clojure-utils.scm | 265 +++
guix/build/ocaml-build-system.scm | 45 +-
guix/download.scm | 35 +-
guix/progress.scm | 28 +-
guix/scripts/system.scm | 115 +-
nix/libstore/local-store.cc | 17 +-
nix/local.mk | 7 +-
nix/nix-daemon/guix-daemon.cc | 12 -
.../{guix-authenticate.in => authenticate.in} | 0
58 files changed, 4688 insertions(+), 1428 deletions(-)
diff --cc gnu/local.mk
index 447f08d,d2f085e..3582227
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -608,14 -610,14 +610,16 @@@ dist_patch_DATA =
%D%/packages/patches/catdoc-CVE-2017-11110.patch \
%D%/packages/patches/cdparanoia-fpic.patch \
%D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \
+ %D%/packages/patches/ceph-detect-rocksdb.patch \
%D%/packages/patches/ceph-disable-cpu-optimizations.patch \
- %D%/packages/patches/ceph-rocksdb-compat.patch \
%D%/packages/patches/ceph-skip-collect-sys-info-test.patch \
%D%/packages/patches/ceph-skip-unittest_blockdev.patch \
+ %D%/packages/patches/ceph-volume-respect-PATH.patch \
%D%/packages/patches/chmlib-inttypes.patch \
+ %D%/packages/patches/clamav-config-llvm-libs.patch \
+ %D%/packages/patches/clamav-system-tomsfastmath.patch \
%D%/packages/patches/clang-3.5-libc-search-path.patch \
+ %D%/packages/patches/clang-3.5-libsanitizer-ustat-fix.patch \
%D%/packages/patches/clang-3.8-libc-search-path.patch \
%D%/packages/patches/clang-6.0-libc-search-path.patch \
%D%/packages/patches/clang-runtime-asan-build-fixes.patch \