[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
01/03: Merge branch 'master' into core-updates |
|
Date: |
Thu, 1 Feb 2018 07:26:32 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit bee7bb315cd0b4529a4117b6220c29ca297fc023
Merge: c2f0e5a 8a46443
Author: Marius Bakke <address@hidden>
Date: Thu Feb 1 13:18:47 2018 +0100
Merge branch 'master' into core-updates
Makefile.am | 6 +-
build-aux/hydra/gnu-system.scm | 47 ++-
doc/guix.texi | 39 +-
etc/guix-install.sh | 425 +++++++++++++++++++++
gnu/build/linux-boot.scm | 11 +
gnu/local.mk | 8 +-
gnu/packages/admin.scm | 43 +++
gnu/packages/algebra.scm | 39 +-
gnu/packages/astronomy.scm | 13 +-
gnu/packages/aux-files/linux-libre/4.1-i686.conf | 8 +-
gnu/packages/aux-files/linux-libre/4.1-x86_64.conf | 10 +-
gnu/packages/aux-files/linux-libre/4.14-arm.conf | 4 +-
gnu/packages/aux-files/linux-libre/4.14-i686.conf | 9 +-
.../aux-files/linux-libre/4.14-x86_64.conf | 12 +-
.../linux-libre/{4.14-arm.conf => 4.15-arm.conf} | 150 +++++---
.../linux-libre/{4.14-i686.conf => 4.15-i686.conf} | 198 ++++++----
.../{4.14-x86_64.conf => 4.15-x86_64.conf} | 201 ++++++----
gnu/packages/aux-files/linux-libre/4.4-i686.conf | 17 +-
gnu/packages/aux-files/linux-libre/4.4-x86_64.conf | 20 +-
gnu/packages/aux-files/linux-libre/4.9-i686.conf | 26 +-
gnu/packages/aux-files/linux-libre/4.9-x86_64.conf | 31 +-
gnu/packages/bioinformatics.scm | 4 +-
gnu/packages/bittorrent.scm | 12 +-
gnu/packages/bootloaders.scm | 2 +-
gnu/packages/check.scm | 25 ++
gnu/packages/code.scm | 6 +-
gnu/packages/compression.scm | 28 ++
gnu/packages/cpp.scm | 24 ++
gnu/packages/databases.scm | 132 +++++++
gnu/packages/dico.scm | 8 +-
gnu/packages/dictionaries.scm | 6 +-
gnu/packages/emacs.scm | 50 +++
gnu/packages/fonts.scm | 31 +-
gnu/packages/game-development.scm | 10 +-
gnu/packages/games.scm | 230 ++++++++---
gnu/packages/gdb.scm | 4 +-
gnu/packages/gnunet.scm | 7 +-
gnu/packages/golang.scm | 50 +++
gnu/packages/guile.scm | 60 +--
gnu/packages/ibus.scm | 11 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/irc.scm | 6 +-
gnu/packages/linux.scm | 91 +++--
gnu/packages/mail.scm | 4 +-
gnu/packages/mate.scm | 5 +-
gnu/packages/maths.scm | 21 +-
gnu/packages/messaging.scm | 8 +-
gnu/packages/music.scm | 47 ++-
gnu/packages/nano.scm | 6 +-
gnu/packages/networking.scm | 91 ++++-
gnu/packages/openstack.scm | 7 +-
gnu/packages/patches/python-axolotl-AES-fix.patch | 24 ++
gnu/packages/patches/rsync-CVE-2017-16548.patch | 31 --
.../patches/rsync-CVE-2017-17433-fix-tests.patch | 42 --
gnu/packages/patches/rsync-CVE-2017-17433.patch | 45 ---
.../patches/rsync-CVE-2017-17434-pt1.patch | 28 --
.../patches/rsync-CVE-2017-17434-pt2.patch | 39 --
.../transmission-fix-dns-rebinding-vuln.patch | 302 ---------------
gnu/packages/photo.scm | 4 +-
gnu/packages/php.scm | 19 +-
gnu/packages/python-crypto.scm | 5 +-
gnu/packages/python.scm | 8 +-
gnu/packages/regex.scm | 4 +-
gnu/packages/robotics.scm | 126 ++++++
gnu/packages/rsync.scm | 13 +-
gnu/packages/rust.scm | 4 +-
gnu/packages/samba.scm | 8 +-
gnu/packages/selinux.scm | 16 +-
gnu/packages/terminals.scm | 95 +++++
gnu/packages/textutils.scm | 24 ++
gnu/packages/tls.scm | 6 +-
gnu/packages/video.scm | 108 +++---
gnu/packages/web.scm | 39 +-
gnu/packages/wordnet.scm | 8 +-
gnu/packages/xml.scm | 6 +-
gnu/services/xorg.scm | 2 +-
gnu/system/linux-initrd.scm | 1 -
guix/build/download.scm | 2 +-
scripts/guix.in | 5 +-
tests/derivations.scm | 11 +-
81 files changed, 2229 insertions(+), 1107 deletions(-)
diff --cc gnu/local.mk
index 9df027a,6fdea16..3da59ec
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -996,7 -1015,9 +997,8 @@@ dist_patch_DATA =
%D%/packages/patches/python-2.7-source-date-epoch.patch \
%D%/packages/patches/python-3-deterministic-build-info.patch \
%D%/packages/patches/python-3-search-paths.patch \
- %D%/packages/patches/python-3.5-fix-tests.patch \
- %D%/packages/patches/python-3.5-getentropy-on-old-kernels.patch \
+ %D%/packages/patches/python-3-fix-tests.patch \
+ %D%/packages/patches/python-axolotl-AES-fix.patch \
%D%/packages/patches/python-dendropy-fix-tests.patch \
%D%/packages/patches/python-fix-tests.patch \
%D%/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch
\
diff --cc gnu/packages/games.scm
index 27a14ac,e2f855a..8d987f7
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@@ -136,9 -136,9 +136,10 @@@
#:use-module (gnu packages gnuzilla)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages networking)
+ #:use-module (gnu packages vulkan)
#:use-module (gnu packages web)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system go)
#:use-module (guix build-system haskell)
#:use-module (guix build-system python)
#:use-module (guix build-system cmake)