[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Thu, 29 Mar 2018 11:41:25 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 5576cfabf3485e0cf794cc3de085a3578151ee64
Merge: 12cb6c3 e086d2f
Author: Marius Bakke <address@hidden>
Date: Thu Mar 29 17:34:41 2018 +0200
Merge branch 'master' into core-updates
Makefile.am | 6 +-
build-aux/check-final-inputs-self-contained.scm | 36 +-
doc/guix.texi | 508 ++++++++++++---------
etc/guix-install.sh | 19 +-
gnu/build/activation.scm | 5 +-
gnu/build/vm.scm | 20 +-
gnu/local.mk | 10 +-
gnu/packages/admin.scm | 14 +-
gnu/packages/algebra.scm | 14 +-
gnu/packages/audio.scm | 111 +++++
gnu/packages/bioinformatics.scm | 41 +-
gnu/packages/boost.scm | 36 ++
gnu/packages/bootloaders.scm | 24 +-
gnu/packages/bootstrap.scm | 3 +-
gnu/packages/ccache.scm | 6 +-
gnu/packages/ci.scm | 6 +-
gnu/packages/compression.scm | 4 +-
gnu/packages/cran.scm | 383 +++++++++++++++-
gnu/packages/cups.scm | 4 +-
gnu/packages/dictionaries.scm | 11 +-
gnu/packages/disk.scm | 94 +++-
gnu/packages/django.scm | 6 +-
gnu/packages/dunst.scm | 14 +-
gnu/packages/emacs.scm | 97 ++--
gnu/packages/embedded.scm | 4 +-
gnu/packages/firmware.scm | 97 +++-
gnu/packages/flashing-tools.scm | 11 +-
gnu/packages/fonts.scm | 159 +++----
gnu/packages/fribidi.scm | 9 +-
gnu/packages/ftp.scm | 4 +-
gnu/packages/games.scm | 6 +-
gnu/packages/gnome.scm | 33 +-
gnu/packages/gnupg.scm | 8 +-
gnu/packages/gnuzilla.scm | 3 +-
gnu/packages/graph.scm | 5 +-
gnu/packages/graphviz.scm | 4 +-
gnu/packages/gtk.scm | 2 +
gnu/packages/guile.scm | 1 -
gnu/packages/haskell-crypto.scm | 7 +-
gnu/packages/haskell.scm | 284 +++---------
gnu/packages/image-viewers.scm | 17 +-
gnu/packages/java.scm | 448 +++++++-----------
gnu/packages/kde.scm | 27 +-
gnu/packages/lego.scm | 25 +-
gnu/packages/libffi.scm | 4 +-
gnu/packages/libreoffice.scm | 13 +-
gnu/packages/libusb.scm | 15 +-
gnu/packages/linux.scm | 22 +-
gnu/packages/lisp.scm | 13 +-
gnu/packages/mail.scm | 90 +++-
gnu/packages/mate.scm | 4 +-
gnu/packages/maths.scm | 34 +-
gnu/packages/messaging.scm | 4 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/mpi.scm | 9 +-
gnu/packages/music.scm | 4 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 3 +
gnu/packages/node.scm | 4 +-
gnu/packages/ntp.scm | 4 +-
gnu/packages/ocaml.scm | 19 +-
gnu/packages/package-management.scm | 2 +
gnu/packages/parallel.scm | 4 +-
.../patches/classpath-aarch64-support.patch | 29 ++
.../patches/hwloc-tests-without-sysfs.patch | 42 --
gnu/packages/patches/libusb-for-axoloti.patch | 14 +-
gnu/packages/patches/links-CVE-2017-11114.patch | 99 ----
gnu/packages/patches/lyx-2.2.3-fix-test.patch | 13 +
gnu/packages/patches/mupdf-CVE-2018-1000051.patch | 88 ++++
gnu/packages/patches/mupdf-CVE-2018-6544.patch | 109 +++++
gnu/packages/patches/shepherd-close-fds.patch | 36 --
.../patches/shepherd-herd-status-sorted.patch | 79 ----
.../patches/translate-shell-fix-curl-tests.patch | 60 +++
gnu/packages/pdf.scm | 4 +-
gnu/packages/perl-web.scm | 24 +
gnu/packages/perl.scm | 4 +-
gnu/packages/photo.scm | 12 +-
gnu/packages/pure.scm | 68 +++
gnu/packages/python-crypto.scm | 8 +-
gnu/packages/python.scm | 61 ++-
gnu/packages/ruby.scm | 10 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/scheme.scm | 67 +++
gnu/packages/serialization.scm | 4 +-
gnu/packages/spice.scm | 4 +
gnu/packages/ssh.scm | 4 +-
gnu/packages/statistics.scm | 18 +-
gnu/packages/syndication.scm | 9 +-
gnu/packages/tex.scm | 94 ++++
gnu/packages/text-editors.scm | 6 +-
gnu/packages/tls.scm | 16 +-
gnu/packages/tv.scm | 5 +-
gnu/packages/version-control.scm | 13 +-
gnu/packages/video.scm | 43 +-
gnu/packages/virtualization.scm | 5 +-
gnu/packages/web-browsers.scm | 7 +-
gnu/packages/web.scm | 25 +-
gnu/packages/wm.scm | 1 -
gnu/packages/xdisorg.scm | 25 +-
gnu/packages/xorg.scm | 8 +-
gnu/services.scm | 4 +-
gnu/services/admin.scm | 7 +-
gnu/system.scm | 3 +-
gnu/system/examples/docker-image.tmpl | 47 ++
gnu/system/nss.scm | 10 +-
gnu/system/vm.scm | 117 ++++-
guix/ci.scm | 78 ++++
guix/docker.scm | 200 ++++----
guix/gexp.scm | 51 ++-
guix/git.scm | 7 +
guix/modules.scm | 3 +-
guix/scripts/build.scm | 16 +-
guix/scripts/environment.scm | 2 +-
guix/scripts/gc.scm | 10 +-
guix/scripts/graph.scm | 38 +-
guix/scripts/pack.scm | 73 ++-
guix/scripts/system.scm | 12 +-
guix/scripts/weather.scm | 109 ++++-
tests/gexp.scm | 61 ++-
tests/graph.scm | 20 +-
tests/guix-gc.sh | 5 +-
tests/guix-pack.sh | 83 ++++
tests/guix-system.sh | 17 +
tests/publish.scm | 10 +-
124 files changed, 3349 insertions(+), 1634 deletions(-)
diff --cc gnu/local.mk
index 0ae2e4e,0575a2f..7bb09fc
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -894,8 -901,8 +894,9 @@@ dist_patch_DATA =
%D%/packages/patches/luminance-hdr-qt-printer.patch \
%D%/packages/patches/lvm2-static-link.patch \
%D%/packages/patches/lxsession-use-gapplication.patch \
+ %D%/packages/patches/lyx-2.2.3-fix-test.patch \
%D%/packages/patches/mailutils-uninitialized-memory.patch \
+ %D%/packages/patches/make-glibc-compat.patch \
%D%/packages/patches/make-impure-dirs.patch \
%D%/packages/patches/mars-install.patch \
%D%/packages/patches/mars-sfml-2.3.patch \
diff --cc gnu/packages/boost.scm
index f7e90b4,d347674..674877a
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@@ -6,8 -6,7 +6,9 @@@
;;; Copyright © 2015 Ludovic Courtès <address@hidden>
;;; Copyright © 2017 Thomas Danckaert <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2018 Arun Isaac <address@hidden>
+;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
+ ;;; Copyright © 2018 Maxim Cournoyer <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -110,6 -114,52 +114,38 @@@ across a broad spectrum of applications
(license (license:x11-style "http://www.boost.org/LICENSE_1_0.txt";
"Some components have other similar
licences."))))
-(define-public boost-1.66
- (package
- (inherit boost)
- (version "1.66.0")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "mirror://sourceforge/boost/boost/" version "/boost_"
- (string-map (lambda (x) (if (eq? x #\.) #\_ x)) version)
- ".tar.bz2"))
- (sha256
- (base32
- "1aaw48cmimsskzgiclwn0iifp62a5iw9cbqrhfari876af1828ap"))))))
-
+ (define-public boost-sync
+ (let ((commit "c72891d9b90e2ceb466ec859f640cd012b2d8709")
+ (version "1.55")
+ (revision "1"))
+ (package
+ (name "boost-sync")
+ (version (git-version version revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/boostorg/sync.git";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "197mp5z048vz5kv1m4v3jm447l2gqsyv0rbfz11dz0ns343ihbyx"))))
+ (build-system trivial-build-system)
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let ((source (assoc-ref %build-inputs "source")))
+ (copy-recursively (string-append source "/include")
+ (string-append %output "/include"))))))
+ (home-page "https://github.com/boostorg/sync";)
+ (synopsis "Boost.Sync library")
+ (description "The Boost.Sync library provides mutexes, semaphores, locks
+ and events and other thread related facilities. Boost.Sync originated from
+ Boost.Thread.")
+ (license (license:x11-style "http://www.boost.org/LICENSE_1_0.txt";)))))
+
(define-public mdds
(package
(name "mdds")
diff --cc gnu/packages/bootstrap.scm
index f332018,b754b1f..936d6c1
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@@ -1,6 -1,6 +1,6 @@@
;;; GNU Guix --- Functional package management for GNU
- ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès
<address@hidden>
+ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<address@hidden>
-;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2014, 2015, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2017 Efraim Flashner <address@hidden>
;;;
;;; This file is part of GNU Guix.
diff --cc gnu/packages/emacs.scm
index f7bf2db,6f13176..0011ee0
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@@ -539,10 -541,8 +543,9 @@@ operations."
(parameterize ((%emacs emacs))
(emacs-generate-autoloads ,name lisp-dir)
(setenv "EMACSLOADPATH"
- (string-append ":" magit ":" dash))
+ (string-append ":" magit ":" dash ":" with-editor))
- (emacs-batch-eval '(byte-compile-file "magit-svn.el"))))))))
+ (emacs-batch-eval '(byte-compile-file "magit-svn.el"))))
-
+ #t))))
(home-page "https://github.com/magit/magit-svn";)
(synopsis "Git-SVN extension to Magit")
(description
diff --cc gnu/packages/libreoffice.scm
index 922c82b,ef40e01..50f44b5
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@@ -4,9 -4,9 +4,9 @@@
;;; Copyright © 2016 Efraim Flashner <address@hidden>
;;; Copyright © 2017 Alex Griffin <address@hidden>
;;; Copyright © 2017 Thomas Danckaert <address@hidden>
- ;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2017 Andy Wingo <address@hidden>
-;;; Copyright © 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2017, 2018 Ludovic Courtès <address@hidden>
;;; Copyright © 2017, 2018 Marius Bakke <address@hidden>
;;; Copyright © 2017 Rutger Helling <address@hidden>
;;;
diff --cc gnu/packages/messaging.scm
index eb1ab34,b3eff1e..db5407e
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@@ -1403,8 -1406,14 +1403,8 @@@ manual SSL certificate verification."
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1hzwdax4nsz0fncf5bjfza0cn0lc6xsf38y569ql1gg5hvwr6169"))))
+ "0vxfcyfnhnlaj6spm2b0ljw5i3knbphy6mvzpl5zv9b52ny4b08m"))))
(build-system gnu-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'configure 'bootstrap
- (lambda _
- (zero? (system* "./bootstrap.sh")))))))
(inputs
`(("expat" ,expat)
("openssl" ,openssl)))
diff --cc gnu/packages/tls.scm
index d8ff5a1,79bf884..9143af3
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -4,9 -4,9 +4,9 @@@
;;; Copyright © 2014 Ian Denhardt <address@hidden>
;;; Copyright © 2013, 2015 Andreas Enge <address@hidden>
;;; Copyright © 2015 David Thompson <address@hidden>
-;;; Copyright © 2015, 2016, 2017 Leo Famulari <address@hidden>
+;;; Copyright © 2015, 2016, 2017, 2018 Leo Famulari <address@hidden>
;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
- ;;; Copyright © 2016, 2017 Nils Gillmann <address@hidden>
+ ;;; Copyright © 2016, 2017, 2018 Nils Gillmann <address@hidden>
;;; Copyright © 2016 Hartmut Goebel <address@hidden>
;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
;;; Copyright © 2017 Marius Bakke <address@hidden>
diff --cc gnu/packages/xorg.scm
index 190b4cc,38ce45b..d664850
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -2683,10 -2663,10 +2683,10 @@@ as USB mice."
".tar.bz2"))
(sha256
(base32
- "0yafix56vkqglw243cwb94nv91vbjv12sqh29x1bap0hwd1dclgf"))))
+ "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj"))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
- ("xxf86driproto" ,xf86driproto)
+ ("xorgproto" ,xorgproto)
("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config)))
(arguments `(#:configure-flags `("--disable-glamor"))) ; TODO: Enable
glamor
diff --cc gnu/system.scm
index eb4b63c,592a0ea..c35615a
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@@ -515,7 -515,9 +515,8 @@@ explicitly appear in OS.
;; required for basic administrator tasks.
(cons* procps psmisc which less zile nano
pciutils usbutils
- util-linux inetutils isc-dhcp
- ;; temporary package to fix CVE-2018-7738 without a graft
- util-linux-2.31.1
++ util-linux
+ inetutils isc-dhcp
(@ (gnu packages admin) shadow) ;for 'passwd'
;; wireless-tools is deprecated in favor of iw, but it's still what