[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
From: |
guix-commits |
Subject: |
01/01: Merge branch 'master' into staging |
Date: |
Thu, 26 Nov 2020 18:00:35 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 24c86ad0c05bac966c3f5f3c5f40c6b0945adf09
Merge: bff94a5 4a914de
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Nov 26 23:59:28 2020 +0100
Merge branch 'master' into staging
doc/guix.texi | 2 +-
etc/news.scm | 19 +++-
gnu/local.mk | 2 +-
gnu/packages/c.scm | 2 +
gnu/packages/cmake.scm | 6 +-
gnu/packages/commencement.scm | 6 +
gnu/packages/cross-base.scm | 6 +
gnu/packages/djvu.scm | 57 +++++++---
gnu/packages/ebook.scm | 8 +-
gnu/packages/education.scm | 4 +-
gnu/packages/emacs-xyz.scm | 44 ++++----
gnu/packages/emacs.scm | 32 ++++++
gnu/packages/finance.scm | 57 +++++-----
gnu/packages/games.scm | 122 ++++++++++-----------
gnu/packages/graph.scm | 7 +-
gnu/packages/haskell-check.scm | 27 +++++
gnu/packages/haskell-xyz.scm | 35 +++---
gnu/packages/lean.scm | 7 +-
gnu/packages/libusb.scm | 4 +-
gnu/packages/linphone.scm | 15 ++-
gnu/packages/linux.scm | 6 +-
gnu/packages/mail.scm | 37 +++++--
gnu/packages/messaging.scm | 6 +-
gnu/packages/music.scm | 117 ++++++++++++++++++++
gnu/packages/package-management.scm | 12 +-
gnu/packages/patches/openssh-fix-ssh-copy-id.patch | 38 +++++++
.../python-aiohttp-3.6.2-no-warning-fail.patch | 34 ------
gnu/packages/php.scm | 4 +-
gnu/packages/python-compression.scm | 4 +-
gnu/packages/python-web.scm | 49 +++++----
gnu/packages/python-xyz.scm | 114 ++++++++++++-------
gnu/packages/security-token.scm | 4 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/ssh.scm | 3 +-
gnu/packages/video.scm | 9 +-
gnu/packages/web.scm | 4 +-
guix/scripts/deploy.scm | 33 ++++--
guix/ui.scm | 1 +
38 files changed, 616 insertions(+), 325 deletions(-)