[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: |
Sun, 22 Oct 2017 14:20:45 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 119a749db9c9847e0766860c17109b0f0b6bf349
Merge: 530d9e1 2566927
Author: Marius Bakke <address@hidden>
Date: Sun Oct 22 20:12:52 2017 +0200
Merge branch 'master' into core-updates
Makefile.am | 2 +
doc/guix.texi | 7 +-
gnu/local.mk | 10 +-
gnu/packages/admin.scm | 26 +-
gnu/packages/audio.scm | 32 +-
gnu/packages/axoloti.scm | 352 ++++++++++++++++
gnu/packages/backup.scm | 108 +++++
gnu/packages/bioinformatics.scm | 173 ++++----
gnu/packages/check.scm | 4 +-
gnu/packages/compression.scm | 38 ++
gnu/packages/cran.scm | 24 ++
gnu/packages/crypto.scm | 2 +-
gnu/packages/cups.scm | 4 +-
gnu/packages/databases.scm | 4 +-
gnu/packages/display-managers.scm | 9 +
gnu/packages/dns.scm | 10 +-
gnu/packages/emacs.scm | 32 +-
gnu/packages/engineering.scm | 2 +-
gnu/packages/erlang.scm | 2 +-
gnu/packages/fonts.scm | 21 +-
gnu/packages/game-development.scm | 5 +-
gnu/packages/games.scm | 22 +-
gnu/packages/gnome.scm | 19 +-
gnu/packages/graph.scm | 30 ++
gnu/packages/graphics.scm | 2 +-
gnu/packages/gtk.scm | 6 +-
gnu/packages/haskell.scm | 6 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/java.scm | 4 +-
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/lighting.scm | 5 +-
gnu/packages/linux.scm | 37 +-
gnu/packages/mail.scm | 23 +-
gnu/packages/mate.scm | 28 +-
gnu/packages/messaging.scm | 4 +-
gnu/packages/mp3.scm | 8 +-
gnu/packages/music.scm | 12 +-
gnu/packages/musl.scm | 5 +-
gnu/packages/networking.scm | 8 +-
gnu/packages/ocaml.scm | 76 +++-
gnu/packages/package-management.scm | 6 +-
gnu/packages/password-utils.scm | 5 +-
gnu/packages/patches/libusb-for-axoloti.patch | 14 +
.../patches/libvirt-CVE-2017-1000256.patch | 84 ++++
gnu/packages/patches/mupdf-CVE-2017-15587.patch | 21 +
gnu/packages/patches/musl-CVE-2016-8859.patch | 81 ----
.../patches/wpa-supplicant-CVE-2017-13082.patch | 182 +++++++++
.../patches/wpa-supplicant-fix-key-reuse.patch | 448 +++++++++++++++++++++
.../patches/wpa-supplicant-fix-nonce-reuse.patch | 72 ++++
.../patches/wpa-supplicant-fix-zeroed-keys.patch | 86 ++++
.../patches/wpa-supplicant-krack-followups.patch | 275 +++++++++++++
gnu/packages/patchutils.scm | 2 +-
gnu/packages/pdf.scm | 38 +-
gnu/packages/perl.scm | 67 +++
gnu/packages/protobuf.scm | 55 ++-
gnu/packages/python.scm | 58 ++-
gnu/packages/qt.scm | 14 +-
gnu/packages/serialization.scm | 2 +-
gnu/packages/spice.scm | 4 +-
gnu/packages/statistics.scm | 28 +-
gnu/packages/textutils.scm | 41 +-
gnu/packages/version-control.scm | 32 +-
gnu/packages/video.scm | 91 ++++-
gnu/packages/vim.scm | 4 +-
gnu/packages/virtualization.scm | 31 +-
gnu/packages/web.scm | 8 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/xdisorg.scm | 4 +-
gnu/packages/xiph.scm | 13 +-
gnu/system/vm.scm | 10 +-
guix/build-system/r.scm | 2 +-
guix/build/download-nar.scm | 125 ++++++
guix/build/download.scm | 216 ++--------
guix/cvs-download.scm | 38 +-
guix/git-download.scm | 37 +-
guix/hg-download.scm | 36 +-
guix/import/cran.scm | 8 +-
guix/progress.scm | 228 +++++++++++
guix/scripts/download.scm | 4 +-
guix/scripts/substitute.scm | 16 +-
guix/utils.scm | 30 +-
81 files changed, 3037 insertions(+), 651 deletions(-)
diff --cc gnu/packages/backup.scm
index 44670d3,4c5c9c7..781cc26
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@@ -6,7 -6,7 +6,8 @@@
;;; Copyright © 2017 Thomas Danckaert <address@hidden>
;;; Copyright © 2017 Arun Isaac <address@hidden>
;;; Copyright © 2017 Kei Kebreau <address@hidden>
+;;; Copyright © 2017 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2017 Christopher Allan Webber <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;