[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into core-updates
|
From: |
Efraim Flashner |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into core-updates |
|
Date: |
Sun, 31 Dec 2017 08:04:33 -0500 (EST) |
efraim pushed a commit to branch core-updates
in repository guix.
commit 23de2e1d5f8f7548e6f73085de23d9964774edbf
Merge: ec6ba5c 1c27f72
Author: Efraim Flashner <address@hidden>
Date: Sun Dec 31 14:10:25 2017 +0200
Merge remote-tracking branch 'origin/master' into core-updates
doc/guix.texi | 146 ++--
gnu/local.mk | 9 +-
gnu/packages/admin.scm | 36 +-
gnu/packages/astronomy.scm | 10 +-
gnu/packages/audio.scm | 15 +-
gnu/packages/aux-files/linux-libre/4.14-i686.conf | 4 +-
.../aux-files/linux-libre/4.14-x86_64.conf | 6 +-
gnu/packages/backup.scm | 42 +-
gnu/packages/bioinformatics.scm | 18 +-
gnu/packages/bittorrent.scm | 31 +-
gnu/packages/check.scm | 33 +-
gnu/packages/compression.scm | 132 +++-
gnu/packages/cran.scm | 85 +--
gnu/packages/databases.scm | 61 +-
gnu/packages/emacs.scm | 63 +-
gnu/packages/enlightenment.scm | 21 +-
gnu/packages/finance.scm | 223 ++++++
gnu/packages/firmware.scm | 4 +-
gnu/packages/games.scm | 232 +++++-
gnu/packages/gnome.scm | 52 +-
gnu/packages/gnupg.scm | 14 +-
gnu/packages/gnustep.scm | 1 +
gnu/packages/gnuzilla.scm | 30 +-
gnu/packages/gtk.scm | 29 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/irc.scm | 9 +-
gnu/packages/java.scm | 2 +-
gnu/packages/javascript.scm | 8 +-
gnu/packages/language.scm | 4 +-
gnu/packages/libevent.scm | 10 +-
gnu/packages/libreoffice.scm | 3 +-
gnu/packages/libupnp.scm | 53 --
gnu/packages/libusb.scm | 61 ++
gnu/packages/linux.scm | 12 +-
gnu/packages/lisp.scm | 5 +-
gnu/packages/llvm.scm | 8 +-
gnu/packages/machine-learning.scm | 4 +-
gnu/packages/mail.scm | 4 +-
gnu/packages/man.scm | 4 +-
gnu/packages/markup.scm | 7 +-
gnu/packages/mate.scm | 777 +++++++++++++++++++++
gnu/packages/maths.scm | 20 +-
gnu/packages/messaging.scm | 3 +-
gnu/packages/music.scm | 9 +-
gnu/packages/ocaml.scm | 21 +-
gnu/packages/openstack.scm | 26 +-
gnu/packages/package-management.scm | 6 +-
gnu/packages/parallel.scm | 4 +-
.../patches/borg-fix-archive-corruption-bug.patch | 68 --
gnu/packages/patches/chicken-CVE-2017-11343.patch | 57 --
gnu/packages/patches/chicken-CVE-2017-6949.patch | 132 ----
gnu/packages/patches/icecat-bug-1414945.patch | 73 ++
gnu/packages/patches/icecat-bug-1424373-pt2.patch | 183 +++++
gnu/packages/patches/libgxps-CVE-2017-11590.patch | 48 ++
.../patches/python-pillow-fix-failing-tests.patch | Bin 0 -> 112373 bytes
.../python-pillow-freetype-2.7-test-failure.patch | 75 --
gnu/packages/pdf.scm | 71 +-
gnu/packages/perl-web.scm | 5 +-
gnu/packages/perl.scm | 35 +-
gnu/packages/photo.scm | 4 +-
gnu/packages/pretty-print.scm | 11 +-
gnu/packages/protobuf.scm | 4 +-
gnu/packages/pulseaudio.scm | 5 +-
gnu/packages/python-crypto.scm | 43 ++
gnu/packages/python-web.scm | 30 +-
gnu/packages/python.scm | 272 ++++++--
gnu/packages/qt.scm | 5 +-
gnu/packages/ruby.scm | 134 ++--
gnu/packages/scheme.scm | 222 +++---
gnu/packages/serialization.scm | 11 +-
gnu/packages/shells.scm | 14 +-
gnu/packages/ssh.scm | 36 +-
gnu/packages/statistics.scm | 150 ++--
gnu/packages/storage.scm | 5 +
gnu/packages/suckless.scm | 30 +-
gnu/packages/syncthing.scm | 16 +-
gnu/packages/upnp.scm | 30 +
gnu/packages/video.scm | 59 +-
gnu/packages/virtualization.scm | 25 +-
gnu/packages/web-browsers.scm | 8 +-
gnu/packages/web.scm | 14 +-
gnu/packages/wine.scm | 50 ++
gnu/packages/xdisorg.scm | 29 +-
gnu/packages/xorg.scm | 14 +-
gnu/services/base.scm | 255 ++++---
gnu/services/desktop.scm | 33 +
gnu/services/mail.scm | 30 +-
gnu/services/messaging.scm | 46 +-
gnu/services/networking.scm | 14 +-
gnu/system.scm | 2 +-
gnu/system/examples/beaglebone-black.tmpl | 5 +
gnu/system/file-systems.scm | 65 +-
gnu/system/mapped-devices.scm | 34 +-
gnu/tests/networking.scm | 110 ++-
guix/build/dub-build-system.scm | 12 +-
guix/man-db.scm | 3 +-
guix/scripts/build.scm | 85 ++-
guix/scripts/system.scm | 24 +-
tests/scripts-build.scm | 29 +
99 files changed, 3657 insertions(+), 1419 deletions(-)
diff --cc gnu/local.mk
index 514daec,346c828..2a2def9
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -749,6 -747,11 +745,8 @@@ dist_patch_DATA =
%D%/packages/patches/icecat-avoid-bundled-libraries.patch \
%D%/packages/patches/icecat-bug-1348660-pt5.patch \
%D%/packages/patches/icecat-bug-1415133.patch \
+ %D%/packages/patches/icecat-bug-1414945.patch \
+ %D%/packages/patches/icecat-bug-1424373-pt2.patch \
- %D%/packages/patches/icu4c-CVE-2017-7867-CVE-2017-7868.patch \
- %D%/packages/patches/icu4c-CVE-2017-14952.patch \
- %D%/packages/patches/icu4c-reset-keyword-list-iterator.patch \
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
diff --cc gnu/packages/backup.scm
index db1af03,2fba1a9..b29256d
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@@ -6,8 -6,8 +6,9 @@@
;;; 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>
+ ;;; Copyright © 2017 Rutger Helling <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/check.scm
index 4f24335,05ed3ee..1dcecb6
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@@ -1399,8 -1449,8 +1407,8 @@@ pytest report."
"038049nyjl7di59ycnxvc9nydivc5m8np3hqq84j2iirkccdbs5n"))))
(build-system python-build-system)
(propagated-inputs
- `(("pytest" ,python-pytest-3.0)))
+ `(("pytest" ,python-pytest)))
- (home-page "http://bitbucket.org/memedough/pytest-capturelog/overview";)
+ (home-page "https://bitbucket.org/memedough/pytest-capturelog/overview";)
(synopsis "Pytest plugin to catch log messages")
(description
"Python-pytest-catchlog is a pytest plugin to catch log messages.")
diff --cc gnu/packages/python.scm
index b2a2d84,ce3aa29..34f40f0
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -963,18 -962,12 +963,18 @@@ from the Python interpreter, or as a sm
(uri (pypi-uri "six" version))
(sha256
(base32
- "0snmb8xffb3vsma0z67i0h0w2g2dy0p3gsgh9gi4i0kgc5l8spqh"))))
+ "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h"))))
(build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (zero? (system* "py.test" "-v")))))))
(native-inputs
`(("python-py" ,python-py)
- ("python-pytest" ,python-pytest)))
+ ("python-pytest" ,python-pytest-bootstrap)))
- (home-page "http://pypi.python.org/pypi/six/";)
+ (home-page "https://pypi.python.org/pypi/six/";)
(synopsis "Python 2 and 3 compatibility utilities")
(description
"Six is a Python 2 and 3 compatibility library. It provides utility
diff --cc gnu/packages/ruby.scm
index 0ed29f7,2741bd6..4d0ca09
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@@ -5,9 -5,10 +5,11 @@@
;;; Copyright © 2014, 2015 David Thompson <address@hidden>
;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
;;; Copyright © 2015, 2016, 2017 Ben Woodcroft <address@hidden>
- ;;; Copyright © 2017 ng0 <address@hidden>
+ ;;; Copyright © 2017 ng0 <address@hidden>
;;; Copyright © 2017 Marius Bakke <address@hidden>
+;;; Copyright © 2017 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2017 Clément Lassieur <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -100,9 -102,29 +102,9 @@@
(synopsis "Programming language interpreter")
(description "Ruby is a dynamic object-oriented programming language with
a focus on simplicity and productivity.")
- (home-page "https://ruby-lang.org";)
+ (home-page "https://www.ruby-lang.org";)
(license license:ruby)))
-(define-public ruby-2.4.3
- (package
- (inherit ruby)
- (name "ruby")
- (version "2.4.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://cache.ruby-lang.org/pub/ruby/";
- (version-major+minor version)
- "/ruby-" version ".tar.xz"))
- (sha256
- (base32
- "0l9bv67dgsphk42lmiskhrnh47hbyj6rfg2rcjx22xivpx07srr3"))
- (modules '((guix build utils)))
- (snippet `(begin
- ;; Remove bundled libffi
- (delete-file-recursively "ext/fiddle/libffi-3.2.1")
- #t))))))
-
(define-public ruby-2.3
(package
(inherit ruby)