guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge branch 'master' into core-updates


From: guix-commits
Subject: 01/01: Merge branch 'master' into core-updates
Date: Thu, 11 Feb 2021 13:13:39 -0500 (EST)

dannym pushed a commit to branch core-updates
in repository guix.

commit abd318ff4b741eac11227778bf2e569ee7b186ff
Merge: 71cb6df c5dc87f
Author: Danny Milosavljevic <dannym@scratchpost.org>
AuthorDate: Thu Feb 11 19:12:36 2021 +0100

    Merge branch 'master' into core-updates

 Makefile.am                                        |     6 +-
 build-aux/build-self.scm                           |    11 +-
 configure.ac                                       |     1 +
 doc/guix.texi                                      |    13 +
 etc/guix-publish.service.in                        |     3 +
 etc/news.scm                                       |    74 +
 gnu/bootloader/u-boot.scm                          |     9 +-
 gnu/build/activation.scm                           |     4 +-
 gnu/local.mk                                       |     9 +-
 gnu/packages/admin.scm                             |    12 +-
 gnu/packages/antivirus.scm                         |     6 +-
 gnu/packages/astronomy.scm                         |    34 +
 gnu/packages/aux-files/guile-launcher.c            |     8 +-
 gnu/packages/aux-files/linux-libre/5.10-arm.conf   |     6 +-
 gnu/packages/aux-files/linux-libre/5.10-arm64.conf |    14 +-
 gnu/packages/aux-files/linux-libre/5.10-i686.conf  |    13 +-
 .../aux-files/linux-libre/5.10-x86_64.conf         |    35 +-
 gnu/packages/aux-files/linux-libre/5.9-arm.conf    |  9791 -----------------
 gnu/packages/aux-files/linux-libre/5.9-arm64.conf  |  9895 -----------------
 gnu/packages/aux-files/linux-libre/5.9-i686.conf   | 10645 -------------------
 gnu/packages/aux-files/linux-libre/5.9-x86_64.conf | 10638 ------------------
 gnu/packages/bioinformatics.scm                    |     2 +-
 gnu/packages/bootloaders.scm                       |    46 +-
 gnu/packages/browser-extensions.scm                |     8 +-
 gnu/packages/cdrom.scm                             |     4 +
 gnu/packages/chromium.scm                          |     9 +-
 gnu/packages/ci.scm                                |     6 +-
 gnu/packages/compression.scm                       |    11 +-
 gnu/packages/connman.scm                           |     4 +-
 gnu/packages/cran.scm                              |  1509 ++-
 gnu/packages/crates-graphics.scm                   |    24 +-
 gnu/packages/crates-io.scm                         |  1163 +-
 gnu/packages/databases.scm                         |     3 +-
 gnu/packages/debian.scm                            |     4 +-
 gnu/packages/dictionaries.scm                      |     6 +-
 gnu/packages/diffoscope.scm                        |     8 +-
 gnu/packages/disk.scm                              |     6 +-
 gnu/packages/docker.scm                            |     7 +-
 gnu/packages/documentation.scm                     |    76 +-
 gnu/packages/emacs-xyz.scm                         |   844 +-
 gnu/packages/embedded.scm                          |    27 +
 gnu/packages/emulators.scm                         |    16 +-
 gnu/packages/file-systems.scm                      |    24 +-
 gnu/packages/finance.scm                           |     6 +-
 gnu/packages/firmware.scm                          |    78 +-
 gnu/packages/fonts.scm                             |    35 +-
 gnu/packages/game-development.scm                  |    27 +-
 gnu/packages/games.scm                             |    63 +-
 gnu/packages/geo.scm                               |   143 +-
 gnu/packages/gnome-xyz.scm                         |    41 +
 gnu/packages/gnome.scm                             |    65 +-
 gnu/packages/gnupg.scm                             |     4 +-
 gnu/packages/gnuzilla.scm                          |     8 +-
 gnu/packages/gtk.scm                               |    12 +-
 gnu/packages/guile-xyz.scm                         |    22 +-
 gnu/packages/guile.scm                             |     4 +-
 gnu/packages/irc.scm                               |     7 +-
 gnu/packages/linux.scm                             |    46 +-
 gnu/packages/lisp-xyz.scm                          |   744 +-
 gnu/packages/lisp.scm                              |     4 +-
 gnu/packages/mail.scm                              |     4 +-
 gnu/packages/mastodon.scm                          |     4 +-
 gnu/packages/maths.scm                             |    16 +-
 gnu/packages/mc.scm                                |     6 +-
 gnu/packages/messaging.scm                         |    27 +-
 gnu/packages/mingw.scm                             |   113 +-
 gnu/packages/monitoring.scm                        |    78 +
 gnu/packages/mpd.scm                               |     4 +-
 gnu/packages/multiprecision.scm                    |    77 +-
 gnu/packages/music.scm                             |   226 +-
 gnu/packages/networking.scm                        |    10 +-
 gnu/packages/nim.scm                               |     4 +-
 gnu/packages/package-management.scm                |    54 +-
 gnu/packages/patches/clementine-fix-sqlite.patch   |    23 -
 .../clementine-remove-crypto++-dependency.patch    |    19 -
 gnu/packages/patches/clementine-use-openssl.patch  |    67 -
 gnu/packages/patches/emacs-undohist-ignored.patch  |    27 -
 .../patches/hdf5-1.8-mpi-deprecations.patch        |   169 -
 .../patches/owncloud-disable-updatecheck.patch     |     8 +-
 gnu/packages/patches/qpdfview-qt515-compat.patch   |    17 +
 .../patches/renpy-use-system-fribidi.patch         |    23 +-
 .../vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch |    83 -
 .../patches/vorbis-tools-CVE-2014-9640.patch       |    29 -
 .../patches/vorbis-tools-CVE-2015-6749.patch       |    44 -
 gnu/packages/pdf.scm                               |    45 +-
 gnu/packages/perl-check.scm                        |    32 +-
 gnu/packages/perl.scm                              |    14 +-
 gnu/packages/php.scm                               |    12 +-
 gnu/packages/plotutils.scm                         |    66 +-
 gnu/packages/python-science.scm                    |    13 +-
 gnu/packages/python-xyz.scm                        |   150 +-
 gnu/packages/radio.scm                             |    40 +
 gnu/packages/ruby.scm                              |   256 +-
 gnu/packages/rust-apps.scm                         |     5 +-
 gnu/packages/samba.scm                             |     8 +-
 gnu/packages/security-token.scm                    |     4 +-
 gnu/packages/shells.scm                            |     8 +-
 gnu/packages/skarnet.scm                           |    16 +-
 gnu/packages/sphinx.scm                            |    47 +-
 gnu/packages/ssh.scm                               |    22 +-
 gnu/packages/statistics.scm                        |    89 +-
 gnu/packages/sync.scm                              |    29 +-
 gnu/packages/syndication.scm                       |     2 +-
 gnu/packages/task-management.scm                   |    14 +-
 gnu/packages/telegram.scm                          |   225 +-
 gnu/packages/terminals.scm                         |    10 +-
 gnu/packages/tex.scm                               |     4 +-
 gnu/packages/text-editors.scm                      |    54 +-
 gnu/packages/time.scm                              |     7 +-
 gnu/packages/tor.scm                               |    13 +-
 gnu/packages/tryton.scm                            |   640 +-
 gnu/packages/version-control.scm                   |     8 +-
 gnu/packages/video.scm                             |     8 +-
 gnu/packages/vim.scm                               |     2 +
 gnu/packages/visidata.scm                          |     4 +-
 gnu/packages/web-browsers.scm                      |    31 +-
 gnu/packages/web.scm                               |    18 +-
 gnu/packages/xfce.scm                              |    16 +-
 gnu/packages/xiph.scm                              |     8 +-
 gnu/services/cuirass.scm                           |     8 +
 gnu/services/databases.scm                         |     6 +-
 gnu/services/dns.scm                               |    14 +-
 gnu/services/linux.scm                             |     3 +-
 gnu/services/nfs.scm                               |     4 +-
 gnu/services/xorg.scm                              |    37 +
 guix/build-system/renpy.scm                        |   131 +
 guix/build/renpy-build-system.scm                  |    99 +
 guix/channels.scm                                  |    44 +-
 guix/config.scm.in                                 |    25 +-
 guix/describe.scm                                  |    28 +-
 guix/docker.scm                                    |    11 +-
 guix/git-authenticate.scm                          |     9 +-
 guix/scripts.scm                                   |    15 +-
 guix/scripts/describe.scm                          |    78 +-
 guix/scripts/environment.scm                       |    22 +-
 guix/self.scm                                      |    25 +-
 guix/store.scm                                     |    10 +-
 guix/ui.scm                                        |    18 +-
 guix/utils.scm                                     |    47 +-
 m4/guix.m4                                         |    30 +-
 tests/utils.scm                                    |    18 +
 141 files changed, 6320 insertions(+), 43757 deletions(-)

diff --cc gnu/packages/crates-io.scm
index 5d31895,0c1c0f4..9cf0c8b
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@@ -12,7 -12,8 +12,9 @@@
  ;;; Copyright © 2020 André Batista <nandre@riseup.net>
  ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
  ;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
 +;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+ ;;; Copyright © 2021 aecepoglu <aecepoglu@fastmail.fm>
+ ;;; Copyright @ 2021 Zheng Junjie <873216071@qq.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/gnuzilla.scm
index 5fd6e92,7f33019..8370963
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -1598,9 -1598,9 +1598,9 @@@ standards of the IceCat project."
               (file-name (string-append "thunderbird-" version "-checkout"))
               (sha256
                (base32
-                "0yabs4zlwb5jvlyk45lbw1nzfmra1f8bbwvwcwxjs1a8wcmrmb39")))))
+                "0kpn6jvymryf2gpj0dl5lpgln8mc3kxi3makms0wb84aajn842jv")))))
         ("autoconf" ,autoconf-2.13)
 -       ("cargo" ,rust-1.41 "cargo")
 +       ("cargo" ,rust "cargo")
         ("clang" ,clang)
         ("llvm" ,llvm)
         ("nasm" ,nasm)
diff --cc guix/utils.scm
index edc3503,1625cab..96cd8c7
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@@ -8,7 -8,7 +8,8 @@@
  ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
  ;;; Copyright © 2018, 2020 Marius Bakke <marius@gnu.org>
  ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
 +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+ ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
@@@ -36,10 -36,9 +37,11 @@@
    #:use-module (rnrs io ports)                    ;need 'port-position' etc.
    #:use-module ((rnrs bytevectors) #:select (bytevector-u8-set!))
    #:use-module (guix memoization)
 -  #:use-module ((guix build utils) #:select (dump-port mkdir-p 
delete-file-recursively))
 +  #:use-module ((guix build utils)
 +                #:select (dump-port mkdir-p delete-file-recursively
 +                          call-with-temporary-output-file %xz-parallel-args))
    #:use-module ((guix build syscalls) #:select (mkdtemp! fdatasync))
+   #:use-module ((guix combinators) #:select (fold2))
    #:use-module (guix diagnostics)           ;<location>, &error-location, etc.
    #:use-module (ice-9 format)
    #:use-module (ice-9 regex)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]