[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: |
Thu, 20 Sep 2018 07:43:26 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 2817ac3c18c1b1a6291c052bc61edd0947890a82
Merge: ecd1301 3e12df7
Author: Marius Bakke <address@hidden>
Date: Thu Sep 20 13:37:58 2018 +0200
Merge branch 'master' into core-updates
build-aux/hydra/gnu-system.scm | 11 +-
doc/guix.texi | 85 +++++++++
gnu/bootloader/u-boot.scm | 6 +-
gnu/local.mk | 3 +-
gnu/packages/admin.scm | 10 +-
gnu/packages/bioinformatics.scm | 24 +++
gnu/packages/bootloaders.scm | 4 +-
gnu/packages/busybox.scm | 4 +-
gnu/packages/cdrom.scm | 12 +-
gnu/packages/cinnamon.scm | 10 +-
gnu/packages/cran.scm | 78 ++++++++
gnu/packages/cups.scm | 4 +-
gnu/packages/electronics.scm | 4 +-
gnu/packages/emacs.scm | 36 +++-
gnu/packages/enlightenment.scm | 8 +-
gnu/packages/games.scm | 6 +-
gnu/packages/gnome.scm | 6 +-
gnu/packages/golang.scm | 4 +-
gnu/packages/guile.scm | 27 +++
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 17 +-
gnu/packages/libreoffice.scm | 16 +-
gnu/packages/linux.scm | 16 +-
gnu/packages/lisp.scm | 114 ++++++++++--
gnu/packages/llvm.scm | 10 +-
gnu/packages/mail.scm | 15 +-
gnu/packages/maths.scm | 37 ++--
gnu/packages/mpd.scm | 20 +-
gnu/packages/mtools.scm | 4 +-
gnu/packages/nutrition.scm | 7 +-
gnu/packages/ocaml.scm | 33 ++--
...hash-in.patch => openssl-1.1-c-rehash-in.patch} | 6 +-
.../patches/xf86-video-ast-remove-mibstore.patch | 90 ---------
gnu/packages/perl.scm | 24 +++
gnu/packages/php.scm | 5 +-
gnu/packages/python.scm | 111 ++++++++++--
gnu/packages/rails.scm | 14 +-
gnu/packages/ruby.scm | 201 ++++++++++++++++-----
gnu/packages/rust.scm | 17 +-
gnu/packages/scheme.scm | 19 +-
gnu/packages/scsi.scm | 31 ++--
gnu/packages/security-token.scm | 10 +-
gnu/packages/shells.scm | 24 +--
gnu/packages/telephony.scm | 46 ++---
gnu/packages/time.scm | 4 +-
gnu/packages/tls.scm | 34 +++-
gnu/packages/version-control.scm | 7 +
gnu/packages/video.scm | 14 +-
gnu/packages/virtualization.scm | 4 +-
gnu/packages/wine.scm | 10 +-
gnu/packages/xdisorg.scm | 16 +-
gnu/packages/xiph.scm | 4 +-
gnu/packages/xorg.scm | 48 +++--
gnu/services/base.scm | 45 ++---
gnu/services/networking.scm | 56 +++++-
gnu/system/install.scm | 6 +-
gnu/tests/networking.scm | 129 ++++++++++++-
guix/build/lisp-utils.scm | 63 ++++---
guix/channels.scm | 16 +-
guix/git-download.scm | 36 ++--
guix/git.scm | 3 +-
guix/gnupg.scm | 58 ++++--
guix/scripts/describe.scm | 6 +-
guix/scripts/graph.scm | 12 +-
guix/scripts/pull.scm | 35 ++--
guix/scripts/refresh.scm | 13 +-
guix/store.scm | 3 +
tests/pack.scm | 7 +-
68 files changed, 1302 insertions(+), 560 deletions(-)
diff --cc gnu/local.mk
index 6a48782,0ead43a..c10894c
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1012,7 -1009,9 +1012,7 @@@ dist_patch_DATA =
%D%/packages/patches/openocd-nrf52.patch \
%D%/packages/patches/opensmtpd-fix-crash.patch \
%D%/packages/patches/openssl-runpath.patch \
- %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch \
- %D%/packages/patches/openssl-1.0.2-CVE-2018-0495.patch \
- %D%/packages/patches/openssl-1.0.2-CVE-2018-0732.patch \
+ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \
%D%/packages/patches/openssl-c-rehash-in.patch \
%D%/packages/patches/orpheus-cast-errors-and-includes.patch \
%D%/packages/patches/osip-CVE-2017-7853.patch \