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: Tue, 24 Sep 2019 04:12:37 -0400 (EDT)

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

commit 11da634a6e64afa2904542e2174aa2a185f9ac3a
Merge: e5efdbc 7b3f56f
Author: Ludovic Courtès <address@hidden>
Date:   Tue Sep 24 10:11:38 2019 +0200

    Merge branch 'master' into core-updates

 .dir-locals.el                                     |   1 +
 .gitignore                                         |  31 +-
 .guix-channel                                      |   5 +
 Makefile.am                                        |  12 +-
 bootstrap                                          |  12 +-
 doc/guix-cookbook.texi                             | 821 +++++++++++++++++++++
 doc/guix.texi                                      | 180 ++++-
 doc/local.mk                                       |   9 +-
 etc/news.scm                                       |  30 +
 gnu/installer/newt/partition.scm                   |   6 +-
 gnu/local.mk                                       |   4 +-
 gnu/packages/admin.scm                             |  64 +-
 gnu/packages/android.scm                           |  58 ++
 gnu/packages/audio.scm                             |   2 +-
 gnu/packages/aux-files/linux-libre/4.19-arm.conf   |  39 +-
 gnu/packages/aux-files/linux-libre/4.19-arm64.conf |  43 +-
 gnu/packages/aux-files/linux-libre/4.19-i686.conf  |  35 +-
 .../aux-files/linux-libre/4.19-x86_64.conf         |  35 +-
 gnu/packages/aux-files/linux-libre/5.2-arm.conf    |  32 +-
 gnu/packages/aux-files/linux-libre/5.2-arm64.conf  |  42 +-
 gnu/packages/aux-files/linux-libre/5.2-i686.conf   |  28 +-
 gnu/packages/aux-files/linux-libre/5.2-x86_64.conf |  28 +-
 gnu/packages/ci.scm                                |   6 +-
 gnu/packages/crates-io.scm                         | 638 +++++++++++++++-
 gnu/packages/datamash.scm                          |   6 +-
 gnu/packages/diffoscope.scm                        | 279 +++++++
 gnu/packages/dns.scm                               |   8 +-
 gnu/packages/elixir.scm                            |  27 +-
 gnu/packages/emacs-xyz.scm                         | 572 +++++++++-----
 gnu/packages/enchant.scm                           |   4 +-
 gnu/packages/engineering.scm                       | 217 ++++++
 gnu/packages/enlightenment.scm                     |   4 +-
 gnu/packages/gdb.scm                               |   6 +-
 gnu/packages/gnome.scm                             |   4 +-
 gnu/packages/graphics.scm                          |  47 ++
 gnu/packages/guile-xyz.scm                         |  76 +-
 gnu/packages/haskell-xyz.scm                       |   2 +-
 gnu/packages/javascript.scm                        |   4 +-
 gnu/packages/jupyter.scm                           | 189 +++++
 gnu/packages/libevent.scm                          |   4 +-
 gnu/packages/linux.scm                             |  12 +-
 gnu/packages/lisp.scm                              | 434 ++++++++++-
 gnu/packages/llvm.scm                              |  19 +-
 gnu/packages/mail.scm                              |  10 +-
 gnu/packages/maths.scm                             |   7 +-
 gnu/packages/messaging.scm                         |   6 +-
 gnu/packages/mpd.scm                               |   4 +-
 gnu/packages/node.scm                              |   1 -
 gnu/packages/package-management.scm                | 187 +----
 gnu/packages/parallel.scm                          |   4 +-
 gnu/packages/patches/emacs-unpackaged-req.patch    |  24 -
 gnu/packages/patches/enjarify-setup-py.patch       |  19 +
 .../python-slugify-depend-on-unidecode.patch       |   4 +-
 gnu/packages/perl.scm                              |   6 +-
 gnu/packages/python-crypto.scm                     |   6 +-
 gnu/packages/python-web.scm                        |  19 +-
 gnu/packages/python-xyz.scm                        | 139 +++-
 gnu/packages/qt.scm                                | 174 +++++
 gnu/packages/samba.scm                             |   4 +-
 gnu/packages/scheme.scm                            |   4 +-
 gnu/packages/serialization.scm                     |  33 +-
 gnu/packages/speech.scm                            | 237 ++++++
 gnu/packages/sphinx.scm                            |   2 +-
 gnu/packages/statistics.scm                        |   2 +-
 gnu/packages/sync.scm                              |   4 +-
 gnu/packages/syncthing.scm                         |   2 +-
 gnu/packages/telephony.scm                         |   2 +-
 gnu/packages/terminals.scm                         |   9 +-
 gnu/packages/tex.scm                               | 451 +++++------
 gnu/packages/text-editors.scm                      |   2 +-
 gnu/packages/tor.scm                               |   4 +-
 gnu/packages/usb-modeswitch.scm                    |   2 +-
 gnu/packages/video.scm                             |   9 +-
 gnu/packages/web-browsers.scm                      |  43 +-
 gnu/packages/web.scm                               |  40 +
 gnu/packages/xdisorg.scm                           |  34 +-
 gnu/packages/xml.scm                               |   2 +-
 gnu/services/cuirass.scm                           | 120 ++-
 gnu/services/mail.scm                              |   4 +-
 gnu/services/networking.scm                        |  82 +-
 gnu/services/virtualization.scm                    |   2 +-
 gnu/services/xorg.scm                              |  23 +
 gnu/system/linux-container.scm                     |  12 +-
 gnu/tests.scm                                      |   7 +-
 guix/build/ruby-build-system.scm                   |   2 +-
 guix/channels.scm                                  | 145 +++-
 guix/gexp.scm                                      |  26 +-
 guix/git.scm                                       |  58 +-
 guix/import/github.scm                             |   6 +
 guix/import/pypi.scm                               |   3 +-
 guix/import/stackage.scm                           |   2 +-
 guix/inferior.scm                                  |  33 +-
 guix/lint.scm                                      |   2 +-
 guix/repl.scm                                      |   6 +-
 guix/scripts/container/exec.scm                    |   2 +-
 guix/scripts/deploy.scm                            |  47 +-
 guix/scripts/package.scm                           |   9 +-
 guix/scripts/pull.scm                              | 242 +++++-
 guix/scripts/search.scm                            |  11 +-
 guix/scripts/{search.scm => show.scm}              |  29 +-
 guix/tests/git.scm                                 | 105 +++
 guix/ui.scm                                        |  66 +-
 po/doc/local.mk                                    |  33 +-
 po/guix/POTFILES.in                                |   1 +
 tests/channels.scm                                 | 104 +++
 tests/containers.scm                               |  27 +
 tests/gexp.scm                                     |   7 +
 tests/git.scm                                      |  99 +++
 tests/guix-package-aliases.sh                      |   7 +
 tests/guix-package.sh                              |  11 +
 tests/inferior.scm                                 |  13 +
 tests/ui.scm                                       |   5 +-
 112 files changed, 5871 insertions(+), 1051 deletions(-)

diff --cc Makefile.am
index b5e7a01,6a4cfcd..2b78091
--- a/Makefile.am
+++ b/Makefile.am
@@@ -814,10 -821,10 +821,11 @@@ assert-no-store-file-names
        $(AM_V_at)if grep -r --exclude=*.texi --exclude=*.info                  
\
             --exclude=*.info-[0-9] --exclude=*.dot                             
\
             --exclude=*.eps --exclude-dir=bootstrap                            
\
-                --exclude=guix-manual.pot --exclude=guix-manual.*.po           
\
+            --exclude=guix-manual.pot --exclude=guix-manual.*.po               
\
+            --exclude=guix-cookbook.pot --exclude=guix-cookbook.*.po           
\
             --exclude=guix-prettify.el                                         
\
             --exclude=ChangeLog*                                               
\
 +           --exclude=binutils-boot-2.20*.patch                                
\
             -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ;                        
\
        then                                                                    
\
          echo "error: store file names embedded in the distribution" >&2 ;     
\
diff --cc gnu/packages/android.scm
index fd900aa,337e60a..b312c5b
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@@ -38,8 -38,8 +38,9 @@@
    #:use-module (gnu packages check)
    #:use-module (gnu packages compression)
    #:use-module (gnu packages docker)
 +  #:use-module (gnu packages gcc)
    #:use-module (gnu packages gnupg)
+   #:use-module (gnu packages java)
    #:use-module (gnu packages linux)
    #:use-module (gnu packages pcre)
    #:use-module (gnu packages python)
diff --cc gnu/packages/node.scm
index 05da1ba,bf585a9..83427d9
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@@ -90,7 -91,12 +90,6 @@@
         (modify-phases %standard-phases
           (add-before 'configure 'patch-files
             (lambda* (#:key inputs #:allow-other-keys)
 -
 -             ;; FIXME: These tests fail with openssl@1.1.1d.
 -             (for-each delete-file
 -                       '("test/parallel/test-crypto-binary-default.js"
 -                         "test/parallel/test-crypto-dh.js"))
--
               ;; Fix hardcoded /bin/sh references.
               (substitute* '("lib/child_process.js"
                              "lib/internal/v8_prof_polyfill.js"
diff --cc gnu/packages/qt.scm
index 768c4e5,3ee3a2c..929144f
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@@ -11,7 -11,7 +11,8 @@@
  ;;; Copyright © 2018 Nicolas Goaziou <address@hidden>
  ;;; Copyright © 2018 Hartmut Goebel <address@hidden>
  ;;; Copyright © 2018 Eric Bavier <address@hidden>
 +;;; Copyright © 2019 Marius Bakke <address@hidden>
+ ;;; Copyright © 2018 John Soo <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;



reply via email to

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