[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'upstream/master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'upstream/master' into staging |
|
Date: |
Tue, 13 Apr 2021 10:37:04 -0400 (EDT) |
nckx pushed a commit to branch staging
in repository guix.
commit b13ef6ee7489b78be7f700489792ea672de13d36
Merge: 533a893 b5607d8
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Apr 13 16:36:03 2021 +0200
Merge remote-tracking branch 'upstream/master' into staging
.guix-authorizations | 4 +
Makefile.am | 1 +
doc/guix.texi | 340 +-
etc/committer.scm.in | 10 +-
gnu/bootloader/grub.scm | 2 +-
gnu/ci.scm | 24 +-
gnu/local.mk | 4 +-
gnu/packages/admin.scm | 35 +-
gnu/packages/antivirus.scm | 4 +-
gnu/packages/astronomy.scm | 18 +-
gnu/packages/audio.scm | 39 +-
gnu/packages/autotools.scm | 2 +-
gnu/packages/bioconductor.scm | 34 +-
gnu/packages/bioinformatics.scm | 6 +-
gnu/packages/boost.scm | 26 +
gnu/packages/bootloaders.scm | 6 +-
gnu/packages/build-tools.scm | 4 +-
gnu/packages/c.scm | 4 +-
gnu/packages/check.scm | 67 +-
gnu/packages/chromium.scm | 8 +-
gnu/packages/ci.scm | 133 +-
gnu/packages/cpp.scm | 4 +-
gnu/packages/cran.scm | 53 +-
gnu/packages/crates-graphics.scm | 3 +
gnu/packages/crates-io.scm | 11 +-
gnu/packages/databases.scm | 30 +-
gnu/packages/disk.scm | 2 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/ebook.scm | 137 +-
gnu/packages/emacs-xyz.scm | 133 +-
gnu/packages/embedded.scm | 37 +-
gnu/packages/engineering.scm | 2 +-
gnu/packages/fcitx5.scm | 6 +-
gnu/packages/file-systems.scm | 12 +-
gnu/packages/finance.scm | 9 +-
gnu/packages/freedesktop.scm | 21 +
gnu/packages/game-development.scm | 8 +-
gnu/packages/games.scm | 16 +-
gnu/packages/gcc.scm | 4 +-
gnu/packages/geo.scm | 16 +-
gnu/packages/gl.scm | 6 +-
gnu/packages/gnome-xyz.scm | 4 +-
gnu/packages/gnu-doc.scm | 8 +-
gnu/packages/golang.scm | 6 +-
gnu/packages/gpodder.scm | 14 +-
gnu/packages/graphics.scm | 37 +
gnu/packages/gtk.scm | 2 +-
gnu/packages/guile-xyz.scm | 12 +-
gnu/packages/hardware.scm | 6 +-
gnu/packages/haskell-web.scm | 2 +-
gnu/packages/image-processing.scm | 4 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/jami.scm | 26 +-
gnu/packages/julia-xyz.scm | 2 +-
gnu/packages/jupyter.scm | 128 +-
gnu/packages/kde-pim.scm | 2 +-
gnu/packages/language.scm | 2 +-
gnu/packages/libreoffice.scm | 4 +-
gnu/packages/linux.scm | 34 +-
gnu/packages/lisp-xyz.scm | 143 +-
gnu/packages/llvm.scm | 11 -
gnu/packages/mail.scm | 47 +-
gnu/packages/maths.scm | 147 +-
gnu/packages/messaging.scm | 25 +-
gnu/packages/music.scm | 4 +-
gnu/packages/networking.scm | 43 +-
gnu/packages/ocaml.scm | 2 +-
gnu/packages/package-management.scm | 32 +-
.../patches/calibre-no-updates-dialog.patch | 22 +-
.../patches/calibre-remove-test-sqlite.patch | 21 +-
.../patches/calibre-remove-test-unrar.patch | 24 +-
.../lksctp-tools-1.0.18-fix-header-file-name.patch | 32 +
gnu/packages/patches/pyqt-public-sip.patch | 55 -
gnu/packages/patches/racket-sh-via-rktio.patch | 87 +
gnu/packages/pdf.scm | 2 +-
gnu/packages/popt.scm | 2 +-
gnu/packages/python-build.scm | 18 +
gnu/packages/python-check.scm | 47 +
gnu/packages/python-compression.scm | 150 +-
gnu/packages/python-web.scm | 130 +-
gnu/packages/python-xyz.scm | 562 +-
gnu/packages/qt.scm | 137 +-
gnu/packages/radio.scm | 50 +-
gnu/packages/rdf.scm | 4 +-
gnu/packages/rsync.scm | 6 +-
gnu/packages/ruby.scm | 5 +-
gnu/packages/scheme.scm | 191 +-
gnu/packages/sphinx.scm | 24 +-
gnu/packages/syncthing.scm | 74 +-
gnu/packages/tcl.scm | 2 +-
gnu/packages/telegram.scm | 4 +-
gnu/packages/tex.scm | 85 +
gnu/packages/text-editors.scm | 7 +-
gnu/packages/version-control.scm | 4 +-
gnu/packages/visidata.scm | 4 +-
gnu/packages/vpn.scm | 9 +-
gnu/packages/web-browsers.scm | 38 +
gnu/packages/web.scm | 92 +-
gnu/packages/wm.scm | 49 +-
gnu/services.scm | 27 +-
gnu/services/ci.scm | 127 +
gnu/services/databases.scm | 2 +-
gnu/services/networking.scm | 141 +
gnu/services/version-control.scm | 2 +-
gnu/system/vm.scm | 20 +-
gnu/tests.scm | 26 +-
gnu/tests/base.scm | 4 -
gnu/tests/ci.scm | 128 +
gnu/tests/docker.scm | 3 +-
gnu/tests/guix.scm | 5 +-
gnu/tests/monitoring.scm | 7 +-
gnu/tests/networking.scm | 92 +-
gnu/tests/nfs.scm | 2 +-
gnu/tests/web.scm | 7 +-
guix/build-system/go.scm | 24 +-
guix/build/qt-build-system.scm | 93 +-
guix/channels.scm | 17 +-
guix/git.scm | 23 +-
guix/gnu-maintenance.scm | 63 +-
guix/import/go.scm | 466 +-
guix/import/utils.scm | 47 +-
guix/ipfs.scm | 183 +
guix/scripts/import.scm | 3 +-
guix/scripts/import/go.scm | 75 +-
guix/scripts/substitute.scm | 191 +-
guix/scripts/system.scm | 2 +-
nix/libstore/build.cc | 4 +-
nix/libstore/local-store.cc | 12 +-
po/guix/LINGUAS | 1 +
po/guix/sk.po | 7845 ++++++++++++++++++++
tests/go.scm | 139 +-
tests/ipfs.scm | 55 +
tests/substitute.scm | 4 +-
133 files changed, 12302 insertions(+), 1511 deletions(-)
diff --cc gnu/packages/web-browsers.scm
index 52df3f4,cff761a..a48eb7e
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@@ -15,9 -15,9 +15,10 @@@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
+;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Cage <cage-dev@twistfold.it>
;;; Copyright © 2021 Benoit Joly <benoit@benoitj.ca>
+ ;;; Copyright © 2021 Alexander Krotov <krotov@iitp.ru>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc guix/build/qt-build-system.scm
index a6955ce,f59b0c4..b0d6dda
--- a/guix/build/qt-build-system.scm
+++ b/guix/build/qt-build-system.scm
@@@ -1,8 -1,8 +1,8 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Federico Beffa <beffa@fbengineering.ch>
- ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+ ;;; Copyright © 2014, 2015, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2019, 2020, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;;
;;; This file is part of GNU Guix.
;;;