guix-commits
[Top][All Lists]
Advanced

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

01/04: Merge branch 'master' into staging


From: guix-commits
Subject: 01/04: Merge branch 'master' into staging
Date: Mon, 4 Mar 2019 16:37:33 -0500 (EST)

mbakke pushed a commit to branch staging
in repository guix.

commit 4f8dc1536adf5965597d53a1e7867690429a12b2
Merge: 1946417 5ae458b
Author: Marius Bakke <address@hidden>
Date:   Mon Mar 4 22:31:59 2019 +0100

    Merge branch 'master' into staging

 doc/contributing.fr.texi                           |   539 +-
 doc/guix.fr.texi                                   | 18524 ++++++++++---------
 doc/guix.texi                                      |    38 +-
 gnu/build/activation.scm                           |     6 +-
 gnu/local.mk                                       |     5 +-
 gnu/packages/admin.scm                             |    15 +-
 gnu/packages/arcan.scm                             |   179 +
 gnu/packages/audio.scm                             |    32 +-
 gnu/packages/bioconductor.scm                      |    29 +
 gnu/packages/bioinformatics.scm                    |     4 +-
 gnu/packages/calcurse.scm                          |    29 +-
 gnu/packages/chromium.scm                          |     4 +-
 gnu/packages/coq.scm                               |    24 +-
 gnu/packages/cran.scm                              |    21 +
 gnu/packages/databases.scm                         |    19 +-
 gnu/packages/django.scm                            |    44 +-
 gnu/packages/emacs-xyz.scm                         |    91 +-
 gnu/packages/emacs.scm                             |     7 +-
 gnu/packages/glib.scm                              |     4 +-
 gnu/packages/gnome.scm                             |    10 +-
 gnu/packages/java-maths.scm                        |    89 +
 gnu/packages/java.scm                              |    10 +-
 gnu/packages/mail.scm                              |     2 +-
 gnu/packages/music.scm                             |     4 +-
 gnu/packages/networking.scm                        |     5 +-
 gnu/packages/patches/libopenshot-fixup-tests.patch |   148 +
 gnu/packages/patches/lyx-2.2.3-fix-test.patch      |    13 -
 .../patches/thermald-make-int-max32-visible.patch  |    24 +
 gnu/packages/python-web.scm                        |     4 +-
 gnu/packages/python-xyz.scm                        |    55 +-
 gnu/packages/rails.scm                             |    28 +
 gnu/packages/ruby.scm                              |   700 +-
 gnu/packages/samba.scm                             |    26 +-
 gnu/packages/sdl.scm                               |     5 +-
 gnu/packages/tex.scm                               |   701 +-
 gnu/packages/tls.scm                               |    29 +-
 gnu/packages/video.scm                             |    54 +-
 gnu/packages/virtualization.scm                    |    11 +-
 gnu/packages/vpn.scm                               |    66 +
 gnu/packages/web.scm                               |   140 +-
 gnu/packages/webkit.scm                            |     4 +-
 gnu/packages/wine.scm                              |    17 +-
 gnu/packages/xorg.scm                              |    19 +-
 gnu/services/cuirass.scm                           |     4 +-
 gnu/services/monitoring.scm                        |     4 +-
 gnu/services/rsync.scm                             |     2 +-
 gnu/services/ssh.scm                               |     4 +-
 gnu/tests/base.scm                                 |     2 +-
 guix/scripts/environment.scm                       |    12 +-
 po/doc/guix-manual.fr.po                           |  1886 +-
 tests/guix-environment.sh                          |    14 +-
 51 files changed, 13378 insertions(+), 10328 deletions(-)




reply via email to

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