guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge branch 'master' into staging


From: Leo Famulari
Subject: 01/01: Merge branch 'master' into staging
Date: Tue, 6 Mar 2018 13:59:30 -0500 (EST)

lfam pushed a commit to branch staging
in repository guix.

commit 613ef763a52d7825f062eb7b58354504b64d2869
Merge: 86990ee 8a32574
Author: Leo Famulari <address@hidden>
Date:   Tue Mar 6 13:39:12 2018 -0500

    Merge branch 'master' into staging

 Makefile.am                                        |     4 +-
 config-daemon.ac                                   |    20 +-
 doc/guix.texi                                      |   183 +-
 gnu/build/linux-modules.scm                        |   169 +-
 gnu/local.mk                                       |    13 +-
 gnu/packages/abiword.scm                           |     2 +-
 gnu/packages/accessibility.scm                     |     9 +-
 gnu/packages/admin.scm                             |     5 +-
 gnu/packages/algebra.scm                           |   103 +-
 gnu/packages/animation.scm                         |     1 +
 gnu/packages/audio.scm                             |    11 +-
 gnu/packages/base.scm                              |    11 +
 gnu/packages/bioconductor.scm                      |    42 +
 gnu/packages/bioinformatics.scm                    |   866 +-
 gnu/packages/boost.scm                             |    14 +
 gnu/packages/cmake.scm                             |    59 +-
 gnu/packages/code.scm                              |    25 +-
 gnu/packages/compression.scm                       |    45 +-
 gnu/packages/conky.scm                             |     4 +-
 gnu/packages/cran.scm                              |   529 +-
 gnu/packages/crypto.scm                            |    11 +-
 gnu/packages/curl.scm                              |     1 +
 gnu/packages/databases.scm                         |    78 +-
 gnu/packages/debug.scm                             |     4 +-
 gnu/packages/dictionaries.scm                      |    17 +-
 gnu/packages/django.scm                            |     4 +-
 gnu/packages/emacs.scm                             |    56 +-
 gnu/packages/enlightenment.scm                     |     8 +-
 gnu/packages/file-systems.scm                      |     1 +
 gnu/packages/firmware.scm                          |    52 +-
 gnu/packages/games.scm                             |     3 +-
 gnu/packages/gnuzilla.scm                          |   133 +-
 gnu/packages/golang.scm                            |     3 +
 gnu/packages/graph.scm                             |    29 +-
 gnu/packages/haskell.scm                           |    10 +-
 gnu/packages/image-viewers.scm                     |     4 +-
 gnu/packages/inkscape.scm                          |     5 +-
 gnu/packages/irc.scm                               |    14 +-
 gnu/packages/java.scm                              |   491 +-
 gnu/packages/libftdi.scm                           |     2 +-
 gnu/packages/linux.scm                             |    34 +-
 gnu/packages/mail.scm                              |     4 +-
 gnu/packages/monitoring.scm                        |     5 +-
 gnu/packages/music.scm                             |    28 +
 gnu/packages/networking.scm                        |    50 +-
 gnu/packages/ntp.scm                               |    13 +-
 .../patches/antlr3-3_1-fix-java8-compilation.patch |    35 +
 .../patches/antlr3-3_3-fix-java8-compilation.patch |    35 +
 .../patches/ceph-disable-cpu-optimizations.patch   |    64 +-
 .../patches/ceph-disable-unittest-throttle.patch   |    52 -
 gnu/packages/patches/ceph-rocksdb-compat.patch     |    63 +
 gnu/packages/patches/gd-CVE-2018-5711.patch        |    61 +
 .../patches/glibc-allow-kernel-2.6.32.patch        |    39 +
 gnu/packages/patches/icecat-bug-1348660-pt5.patch  |   727 -
 gnu/packages/patches/icecat-bug-1414945.patch      |    73 -
 gnu/packages/patches/icecat-bug-1415133.patch      |    40 -
 gnu/packages/patches/icecat-bug-1424373-pt2.patch  |   183 -
 gnu/packages/perl-check.scm                        |     4 +-
 gnu/packages/perl.scm                              |     8 +-
 gnu/packages/php.scm                               |    22 +-
 gnu/packages/pretty-print.scm                      |    14 +-
 gnu/packages/profiling.scm                         |    34 +-
 gnu/packages/python-web.scm                        |    60 +-
 gnu/packages/python.scm                            |    21 +-
 gnu/packages/qt.scm                                |     2 +-
 gnu/packages/regex.scm                             |     4 +-
 gnu/packages/ruby.scm                              |   258 +
 gnu/packages/sdcc.scm                              |    11 +-
 gnu/packages/sdl.scm                               |     4 +-
 gnu/packages/search.scm                            |     4 +-
 gnu/packages/statistics.scm                        |    99 +-
 gnu/packages/storage.scm                           |    42 +-
 gnu/packages/suckless.scm                          |     4 +-
 gnu/packages/syncthing.scm                         |   226 +-
 gnu/packages/tex.scm                               |    41 +
 gnu/packages/textutils.scm                         |     8 +-
 gnu/packages/tor.scm                               |    11 +-
 gnu/packages/version-control.scm                   |    22 +-
 gnu/packages/video.scm                             |     4 +-
 gnu/packages/vpn.scm                               |     9 +-
 gnu/packages/web.scm                               |    20 +-
 gnu/packages/wv.scm                                |    12 +-
 gnu/packages/xml.scm                               |    12 +-
 gnu/packages/xorg.scm                              |    12 +-
 gnu/services/configuration.scm                     |    17 +-
 gnu/services/databases.scm                         |    15 +-
 gnu/services/messaging.scm                         |   106 +-
 gnu/services/networking.scm                        |   102 +-
 gnu/system.scm                                     |     7 +
 gnu/system/examples/beaglebone-black.tmpl          |     9 +-
 gnu/system/install.scm                             |     7 +-
 gnu/system/linux-initrd.scm                        |   118 +-
 gnu/system/mapped-devices.scm                      |    53 +-
 gnu/system/vm.scm                                  |    10 +-
 gnu/tests/install.scm                              |    11 +-
 guix/build/git.scm                                 |    43 +-
 guix/gexp.scm                                      |     7 +
 guix/glob.scm                                      |    97 +
 guix/scripts/environment.scm                       |   159 +-
 guix/scripts/system.scm                            |    67 +-
 guix/ui.scm                                        |    18 +-
 po/packages/LINGUAS                                |     1 +
 po/packages/zh_CN.po                               | 19383 +++++++++++++++++++
 tests/glob.scm                                     |    58 +
 tests/guix-environment-container.sh                |    25 +
 105 files changed, 23708 insertions(+), 2120 deletions(-)




reply via email to

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