mbakke pushed a commit to branch core-updates in repository guix. commit dd0568a77951804d97884a0a0a3a3ed38ca0a184 Merge: 142cd4d baab9ee Author: Marius Bakke <mba...@fastmail.com> AuthorDate: Thu Mar 19 08:50:35 2020 +0100
Merge branch 'master' into core-updates build-aux/build-self.scm | 3 ++- doc/guix.texi | 2 +- gnu/packages/admin.scm | 4 ++-- gnu/packages/cran.scm | 4 ++-- gnu/packages/databases.scm | 4 ++-- gnu/packages/dns.scm | 4 ++-- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/gnome.scm | 15 +++++++++------ gnu/packages/gpodder.scm | 2 +- gnu/packages/image-viewers.scm | 4 ++-- gnu/packages/jrnl.scm | 2 +- gnu/packages/linux.scm | 8 ++++---- gnu/packages/lisp-xyz.scm | 4 ++-- gnu/packages/mail.scm | 12 +++++++----- gnu/packages/messaging.scm | 8 ++++---- gnu/packages/music.scm | 10 +++++----- gnu/packages/networking.scm | 5 ++--- gnu/packages/ocaml.scm | 10 +++++----- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++------ gnu/packages/tls.scm | 19 +++++++++++++++++++ gnu/packages/version-control.scm | 9 +++------ gnu/packages/video.scm | 4 ++-- gnu/packages/web.scm | 4 ++-- gnu/packages/webkit.scm | 8 ++++---- 24 files changed, 102 insertions(+), 69 deletions(-) diff --cc gnu/packages/tls.scm index ce8abfb,bb80d86..45ee67f --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@@ -280,7 -306,8 +280,8 @@@ required structures." (define-public openssl (package (name "openssl") - (version "1.1.1c") + (version "1.1.1d") + (replacement openssl-1.1.1e) (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-"