guix-commits
[Top][All Lists]
Advanced

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

63/63: Merge branch 'master' into staging


From: guix-commits
Subject: 63/63: Merge branch 'master' into staging
Date: Tue, 26 May 2020 17:18:16 -0400 (EDT)

mbakke pushed a commit to branch staging2
in repository guix.

commit 8a7a5dc7805f4628e60f90af6b2416f951d0c034
Merge: c37b621 8bd0b53
Author: Marius Bakke <address@hidden>
AuthorDate: Tue May 26 22:38:12 2020 +0200

    Merge branch 'master' into staging

 Makefile.am                                        |   8 +-
 build-aux/check-channel-news.scm                   |  82 ++++
 doc/contributing.texi                              |   8 +
 doc/guix-cookbook.texi                             |  41 ++
 doc/guix.texi                                      | 201 ++++++----
 doc/images/gcc-core-mesboot0-graph.dot             | 114 ++++++
 doc/images/gcc-mesboot-bag-graph.dot               | 123 ------
 doc/local.mk                                       |   2 +-
 etc/guix-install.sh                                |   3 +-
 gnu/local.mk                                       |  11 +-
 gnu/packages/admin.scm                             |   4 +-
 gnu/packages/aspell.scm                            |   8 +-
 gnu/packages/bash.scm                              |  13 +-
 gnu/packages/bootstrap.scm                         |   6 +-
 gnu/packages/check.scm                             |   5 +-
 gnu/packages/easyrpg.scm                           |   4 +-
 gnu/packages/emacs-xyz.scm                         |  31 +-
 gnu/packages/enlightenment.scm                     |  90 +++--
 gnu/packages/fonts.scm                             |   7 +-
 gnu/packages/freedesktop.scm                       |  10 +-
 gnu/packages/freeipmi.scm                          |   8 +-
 gnu/packages/games.scm                             |   4 +-
 gnu/packages/gl.scm                                |  47 +++
 gnu/packages/gnome.scm                             | 417 ++++++++++++---------
 gnu/packages/gnupg.scm                             |   8 +-
 gnu/packages/gnuzilla.scm                          |  26 ++
 gnu/packages/golang.scm                            |  97 +++--
 gnu/packages/guile-xyz.scm                         |  50 ++-
 gnu/packages/haskell-apps.scm                      |   6 +-
 gnu/packages/image.scm                             |   4 +-
 gnu/packages/kodi.scm                              |   6 +-
 gnu/packages/llvm.scm                              |  29 --
 gnu/packages/mail.scm                              |   4 +-
 gnu/packages/messaging.scm                         |  18 +-
 gnu/packages/music.scm                             |   6 +-
 gnu/packages/nano.scm                              |   4 +-
 gnu/packages/password-utils.scm                    |  16 +-
 .../deja-dup-use-ref-keyword-for-iter.patch        |  41 --
 .../patches/enlightenment-fix-setuid-path.patch    | 223 +++--------
 gnu/packages/patches/git-annex-S3v4.patch          |  77 ----
 .../guile-fibers-destroy-peer-schedulers.patch     |  24 ++
 gnu/packages/patches/libexif-CVE-2016-6328.patch   |  72 ----
 gnu/packages/patches/libexif-CVE-2017-7544.patch   |  29 --
 gnu/packages/patches/libexif-CVE-2018-20030.patch  | 120 ------
 ...ath.patch => network-manager-plugin-path.patch} |   0
 gnu/packages/patches/pidgin-libnm.patch            |  60 +++
 .../patches/python-argcomplete-1.11.1-fish31.patch |  29 ++
 gnu/packages/photo.scm                             |  18 +-
 gnu/packages/python-xyz.scm                        |  85 ++++-
 gnu/packages/readline.scm                          |   8 +-
 gnu/packages/spice.scm                             |  19 +-
 gnu/packages/syncthing.scm                         |  51 ++-
 gnu/packages/video.scm                             |  23 +-
 gnu/packages/virtualization.scm                    |   4 +-
 gnu/packages/vpn.scm                               |  36 ++
 gnu/packages/wm.scm                                |   4 +-
 gnu/packages/xdisorg.scm                           |  72 +++-
 gnu/services/desktop.scm                           |  29 +-
 guix/channels.scm                                  | 160 +++++---
 guix/git.scm                                       |  38 +-
 guix/import/opam.scm                               |   2 +-
 guix/import/utils.scm                              |   2 +-
 guix/lint.scm                                      |  19 +-
 guix/packages.scm                                  | 157 ++++++--
 guix/scripts/download.scm                          |  26 +-
 guix/scripts/hash.scm                              |  35 +-
 guix/scripts/package.scm                           |  20 +-
 guix/scripts/pull.scm                              |  35 +-
 guix/tests.scm                                     |   2 +-
 guix/upstream.scm                                  |   5 +-
 nix/local.mk                                       |   1 +
 tests/challenge.scm                                |   6 +-
 tests/channels.scm                                 |  47 ++-
 tests/derivations.scm                              |  65 ++--
 tests/git.scm                                      |  42 ++-
 tests/graph.scm                                    |   6 +-
 tests/guix-hash.sh                                 |   7 +-
 tests/guix-package-net.sh                          |  12 +
 tests/packages.scm                                 |  29 +-
 tests/store.scm                                    |  20 +-
 80 files changed, 1937 insertions(+), 1344 deletions(-)

diff --cc gnu/local.mk
index 7c83412,ef4c5d2..2e97309
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1166,10 -1166,7 +1165,7 @@@ dist_patch_DATA =                              
                
    %D%/packages/patches/libbase-use-own-logging.patch          \
    %D%/packages/patches/libbonobo-activation-test-race.patch   \
    %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \
 -  %D%/packages/patches/libdrm-symbol-check.patch              \
 +  %D%/packages/patches/libdrm-realpath-virtio.patch           \
-   %D%/packages/patches/libexif-CVE-2016-6328.patch            \
-   %D%/packages/patches/libexif-CVE-2017-7544.patch            \
-   %D%/packages/patches/libexif-CVE-2018-20030.patch           \
    %D%/packages/patches/libextractor-exiv2.patch                       \
    %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch        
        \
    %D%/packages/patches/libgit2-mtime-0.patch                  \



reply via email to

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