[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
01/04: Merge branch 'master' into core-updates |
|
Date: |
Sun, 9 Sep 2018 12:15:15 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 0aeb13485055975d71ec8283040f007c79599bba
Merge: b03f270 0084744
Author: Marius Bakke <address@hidden>
Date: Sun Sep 9 17:40:35 2018 +0200
Merge branch 'master' into core-updates
Makefile.am | 7 +-
README | 3 +-
build-aux/build-self.scm | 93 ++-
config-daemon.ac | 2 +-
configure.ac | 13 +-
doc/guix.texi | 120 +++-
gnu/local.mk | 4 +
gnu/packages/audio.scm | 4 +-
gnu/packages/bash.scm | 2 +-
gnu/packages/bioconductor.scm | 51 +-
gnu/packages/bioinformatics.scm | 206 +++---
gnu/packages/ccache.scm | 11 +-
gnu/packages/ci.scm | 30 +-
gnu/packages/code.scm | 19 +-
gnu/packages/cran.scm | 736 ++++++++++++++++++---
gnu/packages/crypto.scm | 4 +-
gnu/packages/curl.scm | 14 +
gnu/packages/dns.scm | 4 +-
gnu/packages/emacs.scm | 78 ++-
gnu/packages/emulators.scm | 6 +-
gnu/packages/engineering.scm | 25 +-
gnu/packages/fonts.scm | 4 +-
gnu/packages/games.scm | 157 +++++
gnu/packages/gcc.scm | 22 +
gnu/packages/gdb.scm | 4 +-
gnu/packages/ghostscript.scm | 44 +-
gnu/packages/gnome.scm | 5 +-
gnu/packages/graph.scm | 9 +-
gnu/packages/gtk.scm | 9 +-
gnu/packages/guile.scm | 28 +-
gnu/packages/haskell-check.scm | 4 +-
gnu/packages/haskell.scm | 39 +-
gnu/packages/image.scm | 17 +
gnu/packages/julia.scm | 6 +-
gnu/packages/linux.scm | 16 +-
gnu/packages/machine-learning.scm | 12 +-
gnu/packages/mail.scm | 7 +-
gnu/packages/maths.scm | 129 +++-
gnu/packages/mes.scm | 26 +-
gnu/packages/mp3.scm | 16 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/multiprecision.scm | 2 +-
gnu/packages/music.scm | 11 +-
gnu/packages/musl.scm | 6 +-
gnu/packages/networking.scm | 56 +-
gnu/packages/openldap.scm | 4 +-
gnu/packages/package-management.scm | 16 +-
.../patches/ghostscript-CVE-2018-16509.patch | 193 ++++++
gnu/packages/patches/ghostscript-bug-699708.patch | 160 +++++
gnu/packages/patches/mes-nyacc-0.86.0.patch | 197 ++++++
gnu/packages/patches/nyacc-binary-literals.patch | 29 +
gnu/packages/perl.scm | 38 +-
gnu/packages/plotutils.scm | 12 +-
gnu/packages/python.scm | 4 +-
gnu/packages/shells.scm | 17 +-
gnu/packages/statistics.scm | 137 ++--
gnu/packages/web-browsers.scm | 4 +-
gnu/packages/web.scm | 20 +-
gnu/packages/xorg.scm | 42 ++
gnu/services.scm | 24 +-
gnu/services/web.scm | 19 +-
gnu/system/vm.scm | 81 ++-
gnu/tests/base.scm | 16 +-
guix/channels.scm | 30 +-
guix/derivations.scm | 2 +-
guix/describe.scm | 4 +-
guix/docker.scm | 2 +-
guix/gcrypt.scm | 49 --
guix/gexp.scm | 39 +-
guix/git.scm | 19 +-
guix/hash.scm | 184 ------
guix/http-client.scm | 2 +-
guix/import/cpan.scm | 2 +-
guix/import/cran.scm | 2 +-
guix/import/crate.scm | 2 +-
guix/import/elpa.scm | 2 +-
guix/import/gnu.scm | 2 +-
guix/import/hackage.scm | 2 +-
guix/import/texlive.scm | 2 +-
guix/import/utils.scm | 2 +-
guix/inferior.scm | 20 +-
guix/nar.scm | 4 +-
guix/pk-crypto.scm | 407 ------------
guix/pki.scm | 2 +-
guix/profiles.scm | 6 +-
guix/scripts/archive.scm | 2 +-
guix/scripts/authenticate.scm | 2 +-
guix/scripts/describe.scm | 159 +++++
guix/scripts/download.scm | 2 +-
guix/scripts/hash.scm | 6 +-
guix/scripts/pack.scm | 60 +-
guix/scripts/package.scm | 57 +-
guix/scripts/publish.scm | 4 +-
guix/scripts/pull.scm | 22 +-
guix/scripts/refresh.scm | 2 +-
guix/scripts/substitute.scm | 4 +-
guix/self.scm | 26 +-
guix/store.scm | 2 +-
guix/store/deduplication.scm | 2 +-
guix/tests.scm | 2 +-
m4/guix.m4 | 18 -
po/guix/POTFILES.in | 1 +
tests/base32.scm | 2 +-
tests/builders.scm | 2 +-
tests/challenge.scm | 2 +-
tests/cpan.scm | 2 +-
tests/crate.scm | 2 +-
tests/derivations.scm | 2 +-
tests/gem.scm | 2 +-
tests/gexp.scm | 18 +
tests/guix-describe.sh | 47 ++
tests/guix-system.sh | 8 +
tests/hash.scm | 128 ----
tests/inferior.scm | 26 +-
tests/nar.scm | 2 +-
tests/opam.scm | 2 +-
tests/packages.scm | 2 +-
tests/pk-crypto.scm | 290 --------
tests/pki.scm | 4 +-
tests/publish.scm | 4 +-
tests/pypi.scm | 2 +-
tests/services.scm | 25 +
tests/store-deduplication.scm | 2 +-
tests/store.scm | 10 +-
tests/substitute.scm | 4 +-
125 files changed, 2984 insertions(+), 1839 deletions(-)
diff --cc gnu/local.mk
index 21f0482,0407fdc..c3cd1d4
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -728,7 -726,8 +728,9 @@@ dist_patch_DATA =
%D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
%D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch
\
+ %D%/packages/patches/ghostscript-CVE-2018-10194.patch \
+ %D%/packages/patches/ghostscript-CVE-2018-16509.patch \
+ %D%/packages/patches/ghostscript-bug-699708.patch \
%D%/packages/patches/ghostscript-no-header-id.patch \
%D%/packages/patches/ghostscript-no-header-uuid.patch \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
diff --cc gnu/packages/curl.scm
index a0fbd77,6d45dc0..d4a620f
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -50,7 -50,8 +50,8 @@@
(define-public curl
(package
(name "curl")
- (version "7.59.0")
+ (version "7.61.0")
+ (replacement curl-7.61.1)
(source (origin
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-";
diff --cc gnu/packages/ghostscript.scm
index cd7cd60,518e183..3808d81
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@@ -4,9 -4,10 +4,10 @@@
;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
;;; Copyright © 2013, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2017 Alex Vong <address@hidden>
-;;; Copyright © 2017 Efraim Flashner <address@hidden>
+;;; Copyright © 2017, 2018 Efraim Flashner <address@hidden>
;;; Copyright © 2017 Leo Famulari <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2018 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;