[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Wed, 17 Oct 2018 15:18:39 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit d02bb02f7d833ad371c53c346b6cb77f01377cf4
Merge: fb3ff26 acce0a4
Author: Marius Bakke <address@hidden>
Date: Wed Oct 17 20:47:11 2018 +0200
Merge branch 'master' into core-updates
build-aux/run-system-tests.scm | 49 +--
configure.ac | 6 +-
doc/contributing.texi | 8 +
doc/guix.texi | 42 ++-
etc/guix-install.sh | 3 +
etc/snippets/scheme-mode/guix-origin | 4 +-
gnu/local.mk | 14 +-
gnu/packages/abiword.scm | 6 +-
gnu/packages/audio.scm | 17 +-
gnu/packages/augeas.scm | 16 +-
gnu/packages/backup.scm | 6 +-
gnu/packages/batik.scm | 14 +-
gnu/packages/bioconductor.scm | 27 ++
gnu/packages/bioinformatics.scm | 94 +++++-
gnu/packages/bootloaders.scm | 12 +-
gnu/packages/calendar.scm | 4 +-
gnu/packages/compression.scm | 21 +-
gnu/packages/databases.scm | 4 +-
gnu/packages/disk.scm | 100 +++---
gnu/packages/emacs.scm | 97 ++++--
gnu/packages/engineering.scm | 24 ++
gnu/packages/fabric-management.scm | 24 +-
gnu/packages/fonts.scm | 50 +++
gnu/packages/fontutils.scm | 53 +++
gnu/packages/game-development.scm | 4 +-
gnu/packages/games.scm | 31 +-
gnu/packages/gimp.scm | 65 ++++
gnu/packages/gnupg.scm | 12 +-
gnu/packages/gnuzilla.scm | 7 +-
gnu/packages/golang.scm | 8 +-
gnu/packages/graphics.scm | 10 +-
gnu/packages/gstreamer.scm | 7 +-
gnu/packages/guile.scm | 77 +++--
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/kde.scm | 87 ++++-
gnu/packages/linux.scm | 63 ++--
gnu/packages/lisp.scm | 66 ++--
gnu/packages/maths.scm | 44 +++
gnu/packages/messaging.scm | 10 +-
gnu/packages/music.scm | 77 +++++
gnu/packages/networking.scm | 4 +-
gnu/packages/ocaml.scm | 31 +-
gnu/packages/package-management.scm | 38 ++-
gnu/packages/patches/clisp-glibc-2.26.patch | 20 --
gnu/packages/patches/crawl-upgrade-saves.patch | 25 +-
.../patches/emacs-exwm-fix-fullscreen-issue.patch | 27 --
gnu/packages/patches/python-CVE-2018-14647.patch | 61 ++++
.../patches/python2-CVE-2018-1000802.patch | 47 +++
gnu/packages/patches/python2-CVE-2018-1060.patch | 20 ++
gnu/packages/patches/python2-CVE-2018-1061.patch | 20 ++
gnu/packages/patches/python2-CVE-2018-14647.patch | 61 ++++
gnu/packages/patches/x265-arm-asm-primitives.patch | 360 ---------------------
.../patches/x265-detect512-all-arches.patch | 37 +++
gnu/packages/patches/x265-fix-ppc64le-build.patch | 25 --
.../patches/zstd-fix-stdin-list-test.patch | 30 --
.../patches/zstd-fix-stdin-list-without-tty.patch | 67 ----
gnu/packages/python-web.scm | 80 +++++
gnu/packages/python.scm | 59 +++-
gnu/packages/ruby.scm | 44 +--
gnu/packages/textutils.scm | 3 +-
gnu/packages/video.scm | 91 +++---
gnu/packages/vulkan.scm | 7 +-
gnu/packages/wine.scm | 6 +-
gnu/packages/xdisorg.scm | 24 ++
gnu/packages/xml.scm | 4 +-
gnu/packages/xorg.scm | 4 +-
gnu/services/networking.scm | 86 +++--
guix/import/json.scm | 3 +-
guix/profiles.scm | 87 +++--
guix/scripts.scm | 4 +-
guix/scripts/build.scm | 9 +-
guix/scripts/describe.scm | 2 +-
guix/scripts/environment.scm | 1 +
guix/scripts/import/cran.scm | 2 +
guix/scripts/pack.scm | 1 +
guix/scripts/package.scm | 43 +--
guix/scripts/pull.scm | 69 +++-
guix/scripts/system.scm | 1 +
guix/self.scm | 9 +-
guix/status.scm | 194 ++++++++---
guix/store.scm | 15 +-
nix/libstore/build.cc | 25 +-
nix/libstore/globals.cc | 2 +
nix/libstore/globals.hh | 9 +-
nix/libstore/worker-protocol.hh | 2 +-
nix/nix-daemon/nix-daemon.cc | 2 +-
po/guix/POTFILES.in | 1 +
tests/guix-build.sh | 4 +
tests/status.scm | 70 +++-
tests/store.scm | 63 ++++
90 files changed, 2007 insertions(+), 1159 deletions(-)
diff --cc gnu/packages/fontutils.scm
index 2ea4ff0,09ba9b7..2ff4294
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@@ -7,7 -7,7 +7,8 @@@
;;; Copyright © 2017 Leo Famulari <address@hidden>
;;; Copyright © 2017 Nils Gillmann <address@hidden>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
+ ;;; Copyright © 2018 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/python.scm
index 2e88b0b,e3a04b0..39ec96f
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -148,7 -147,8 +148,8 @@@
(define-public python-2.7
(package
(name "python2")
- (version "2.7.14")
+ (version "2.7.15")
+ (replacement python-2/fixed)
(source
(origin
(method url-fetch)
@@@ -324,10 -366,11 +337,11 @@@ data types."
(name "python")
(properties `((superseded . ,python-2)))))
-(define-public python-3.6
+(define-public python-3.7
(package (inherit python-2)
(name "python")
- (version "3.6.5")
+ (version "3.7.0")
+ (replacement python-3/fixed)
(source (origin
(method url-fetch)
(uri (string-append "https://www.python.org/ftp/python/";
@@@ -397,8 -468,26 +411,26 @@@
"/site-packages"))))))))
;; Current 3.x version.
-(define-public python-3 python-3.6)
+(define-public python-3 python-3.7)
+ (define python-3/fixed
+ (package
+ (inherit python-3)
+ (source (origin
+ (inherit (package-source python-3))
+ (patches (append (origin-patches (package-source python-3))
+ (search-patches
"python-CVE-2018-14647.patch")))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments python-3)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'unpack 'delete-broken-test
+ (lambda _
+ ;; Delete test which fails on recent kernels:
+ ;; <https://bugs.python.org/issue34587>.
+ (delete-file "Lib/test/test_socket.py")
+ #t))))))))
+
;; Current major version.
(define-public python python-3)
diff --cc guix/self.scm
index 733c4a2,ecf8464..3e29c9a
--- a/guix/self.scm
+++ b/guix/self.scm
@@@ -913,7 -924,11 +917,8 @@@ is not supported.
#:name (string-append "guix-"
(shorten version))
#:pull-version pull-version
- #:guile-version guile-version
+ #:guile-version (if (>= pull-version 1)
- "2.2"
- (match guile-version
- ("2.2.2" "2.2")
- (version version)))
++ "2.2" guile-version)
#:guile-for-build guile)))
(if guix
(lower-object guix)