[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
02/02: Merge branch 'master' into core-updates |
|
Date: |
Thu, 30 Apr 2020 17:48:32 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e
Merge: 5d9e218 229f4fa
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Apr 30 23:47:49 2020 +0200
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/backup.scm
gnu/packages/emacs-xyz.scm
gnu/packages/guile.scm
gnu/packages/lisp.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/web.scm
gnu/packages/xorg.scm
doc/guix-cookbook.texi | 7 +-
doc/guix.texi | 15 +-
gnu/local.mk | 3 +-
gnu/packages/admin.scm | 14 +-
gnu/packages/aspell.scm | 8 +
gnu/packages/astronomy.scm | 4 +-
gnu/packages/audio.scm | 4 +-
gnu/packages/backup.scm | 41 +-
gnu/packages/bioconductor.scm | 278 +-
gnu/packages/bioinformatics.scm | 169 +-
gnu/packages/chromium.scm | 8 +-
gnu/packages/compression.scm | 65 +-
gnu/packages/cran.scm | 427 ++-
gnu/packages/crates-io.scm | 3941 ++++++++++++++++++++--
gnu/packages/cups.scm | 4 +-
gnu/packages/databases.scm | 28 +-
gnu/packages/diffoscope.scm | 11 +-
gnu/packages/emacs-xyz.scm | 192 +-
gnu/packages/emacs.scm | 11 +
gnu/packages/game-development.scm | 2 +-
gnu/packages/gnome.scm | 5 +-
gnu/packages/gsasl.scm | 4 +-
gnu/packages/hardware.scm | 37 +
gnu/packages/linphone.scm | 52 +-
gnu/packages/linux.scm | 12 +-
gnu/packages/lisp-xyz.scm | 140 +-
gnu/packages/lisp.scm | 41 +-
gnu/packages/machine-learning.scm | 75 +-
gnu/packages/magic-wormhole.scm | 12 +-
gnu/packages/maths.scm | 41 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/music.scm | 7 +-
gnu/packages/openldap.scm | 15 +
gnu/packages/openstack.scm | 19 +-
gnu/packages/package-management.scm | 4 +-
gnu/packages/patches/emacs-telega-test-env.patch | 14 +
gnu/packages/python-science.scm | 35 +-
gnu/packages/python-web.scm | 112 +-
gnu/packages/python-xyz.scm | 285 +-
gnu/packages/radio.scm | 138 +-
gnu/packages/rust-apps.scm | 51 +-
gnu/packages/sphinx.scm | 48 +-
gnu/packages/statistics.scm | 87 +-
gnu/packages/tex.scm | 26 +
gnu/packages/text-editors.scm | 4 +-
gnu/packages/valgrind.scm | 6 +-
gnu/packages/video.scm | 155 +-
gnu/packages/vpn.scm | 31 +-
gnu/packages/web.scm | 58 +-
gnu/packages/wm.scm | 95 +-
gnu/packages/xdisorg.scm | 38 +
gnu/packages/xorg.scm | 62 +
gnu/services.scm | 13 +-
gnu/services/docker.scm | 3 +-
gnu/system.scm | 41 +-
gnu/system/file-systems.scm | 3 +-
gnu/system/linux-container.scm | 6 +-
gnu/tests/install.scm | 9 +-
gnu/tests/reconfigure.scm | 16 +-
guix/channels.scm | 4 +-
guix/import/crate.scm | 14 +-
guix/profiles.scm | 36 +
guix/scripts/edit.scm | 7 +-
guix/scripts/pack.scm | 33 +-
guix/scripts/substitute.scm | 8 +-
tests/crate.scm | 23 +-
tests/gem.scm | 2 +-
tests/profiles.scm | 13 +-
tests/pypi.scm | 7 +-
69 files changed, 6316 insertions(+), 867 deletions(-)
diff --cc gnu/local.mk
index 57346cc,9426ee3..ca6ccb2
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -10,11 -10,11 +10,11 @@@
# Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <address@hidden>
# Copyright © 2016 Ben Woodcroft <address@hidden>
# Copyright © 2016, 2017, 2018, 2019 Alex Vong <address@hidden>
- # Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <address@hidden>
+ # Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <address@hidden>
-# Copyright © 2016, 2017, 2018, 2019 Jan (janneke) Nieuwenhuizen
<address@hidden>
+# Copyright © 2016, 2017, 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen
<address@hidden>
# Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <address@hidden>
# Copyright © 2017, 2018 Clément Lassieur <address@hidden>
-# Copyright © 2017 Mathieu Othacehe <address@hidden>
+# Copyright © 2017, 2020 Mathieu Othacehe <address@hidden>
# Copyright © 2017, 2018, 2019 Gábor Boskovits <address@hidden>
# Copyright © 2018 Amirouche Boubekki <address@hidden>
# Copyright © 2018, 2019, 2020 Oleg Pykhalov <address@hidden>
diff --cc gnu/packages/backup.scm
index 149f857,00986a3..6a5080b
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@@ -11,10 -11,10 +11,11 @@@
;;; Copyright © 2017 Rutger Helling <address@hidden>
;;; Copyright © 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2018 Oleg Pykhalov <address@hidden>
- ;;; Copyright © 2018, 2019 Ricardo Wurmus <address@hidden>
+ ;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus <address@hidden>
;;; Copyright © 2019 Alex Vong <address@hidden>
;;; Copyright © 2019 Marius Bakke <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
+ ;;; Copyright © 2020 Nicolas Goaziou <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/emacs-xyz.scm
index 0197ee5,776dcbb..d09df46
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@@ -68,7 -68,7 +68,8 @@@
;;; Copyright © 2020 John Soo <address@hidden>
;;; Copyright © 2020 Jérémy Korwin-Zmijowski <address@hidden>
;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
+ ;;; Copyright © 2020 pinoaffe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/gnome.scm
index 16728d9,e6b1942..0a034be
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -8071,10 -8091,10 +8071,9 @@@ desktop. It supports world clock, sto
(native-inputs
`(("gettext" ,gettext-minimal)
("glib-bin" ,glib "bin") ; For glib-compile-schemas
- ("gtk+-bin" ,gtk+ "bin") ; For gtk-update-icon-cache
("pkg-config" ,pkg-config)))
(inputs
- `(("evolution-data-server" ,evolution-data-server)
- ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
+ `(("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("libdazzle" ,libdazzle)
("libedataserverui" ,evolution-data-server)
diff --cc gnu/packages/openldap.scm
index 75fe8f9,53c57e8..14bf874
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@@ -4,8 -4,8 +4,9 @@@
;;; Copyright © 2016 Leo Famulari <address@hidden>
;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;; Copyright © 2020 Lars-Dominik Braun <address@hidden>
+ ;;; Copyright © 2020 Efraim Flashner <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -60,7 -59,8 +61,8 @@@
(define-public openldap
(package
(name "openldap")
+ (replacement openldap-2.4.50)
- (version "2.4.47")
+ (version "2.4.49")
(source (origin
(method url-fetch)
diff --cc gnu/packages/web.scm
index 03cb897,092ff30..1797e52
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@@ -7142,9 -7149,36 +7166,9 @@@ compressed JSON header blocks
@end itemize\n")
(license license:expat)))
-(define nghttp2-1.39.2
- (package
- (inherit nghttp2)
- (version "1.39.2")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/nghttp2/nghttp2/";
- "releases/download/v" version "/"
- "nghttp2-" version ".tar.xz"))
- (sha256
- (base32
- "12yfsjghbaypp4w964d45ih9vs38g6anih80wbsflaxx192idlm2"))))))
-
-;; 'Node' requires this newer version, to be removed on the next rebuild
cycle.
-(define-public nghttp2-1.40
- (package
- (inherit nghttp2)
- (version "1.40.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/nghttp2/nghttp2/";
- "releases/download/v" version "/"
- "nghttp2-" version ".tar.xz"))
- (sha256
- (base32
- "0wwhwv7cvi1vxpdjwvg0kpa4jzhszclpnwrwfcw728zz53a47z09"))))))
-
(define-public hpcguix-web
- (let ((commit "f39c90b35e99e4122b0866ec4337020d61c81508")
- (revision "4"))
+ (let ((commit "9de63562b06b4aef3a3afe5ecb18d3c91e57ee74")
+ (revision "5"))
(package
(name "hpcguix-web")
(version (git-version "0.0.1" revision commit))
diff --cc gnu/packages/xorg.scm
index 21a2467,95479f1..7d427d8
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -20,10 -20,9 +20,11 @@@
;;; Copyright © 2018 Benjamin Slade <address@hidden>
;;; Copyright © 2019 nee <address@hidden>
;;; Copyright © 2019 Yoshinori Arai <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;; Copyright © 2020 Leo Prikler <address@hidden>
;;; Copyright © 2020 Florian Pelz <address@hidden>
+;;; Copyright © 2020 Michael Rohleder <address@hidden>
+ ;;; Copyright © 2020 Maxim Cournoyer <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;