guix-commits
[Top][All Lists]
Advanced

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

02/12: Merge branch 'master' into staging


From: Marius Bakke
Subject: 02/12: Merge branch 'master' into staging
Date: Sun, 14 May 2017 11:35:07 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit 61b1df6f2791a2afa291b56708d73a5264ca70eb
Merge: bdb8267 4be0141
Author: Marius Bakke <address@hidden>
Date:   Sun May 14 17:21:46 2017 +0200

    Merge branch 'master' into staging

 .dir-locals.el                                     |    6 +
 .gitignore                                         |    4 +
 Makefile.am                                        |  151 +-
 bayfront.guixsd.org.pub                            |    6 +
 build-aux/build-self.scm                           |   88 +-
 build-aux/check-available-binaries.scm             |    9 +-
 build-aux/check-final-inputs-self-contained.scm    |    6 +-
 build-aux/compile-all.scm                          |    5 +-
 build-aux/git-version-gen                          |  226 +++
 build-aux/hydra/evaluate.scm                       |    9 +-
 build-aux/update-guix-package.scm                  |  144 ++
 configure.ac                                       |    6 +-
 doc/contributing.texi                              |   32 +-
 doc/guix.texi                                      |  140 +-
 doc/htmlxref.cnf                                   |    4 +-
 etc/indent-code.el.in                              |    4 +-
 gnu/build/file-systems.scm                         |   65 +-
 gnu/local.mk                                       |   46 +-
 gnu/packages.scm                                   |  124 +-
 gnu/packages/abiword.scm                           |   18 +-
 gnu/packages/acct.scm                              |    4 +-
 gnu/packages/admin.scm                             |  101 +-
 gnu/packages/audio.scm                             |   17 +-
 gnu/packages/augeas.scm                            |    6 +-
 .../linux-libre/{4.10-i686.conf => 4.11-i686.conf} |  197 ++-
 .../{4.10-x86_64.conf => 4.11-x86_64.conf}         |  194 ++-
 gnu/packages/backup.scm                            |   16 +
 gnu/packages/base.scm                              |    4 +-
 gnu/packages/bioinformatics.scm                    |  165 +-
 gnu/packages/bootloaders.scm                       |   10 +-
 gnu/packages/build-tools.scm                       |    4 +-
 gnu/packages/cdrom.scm                             |  175 ++-
 gnu/packages/check.scm                             |    5 +-
 gnu/packages/ci.scm                                |   33 +-
 gnu/packages/commencement.scm                      |    3 +
 gnu/packages/compression.scm                       |   10 +-
 gnu/packages/connman.scm                           |    4 +-
 gnu/packages/cryptsetup.scm                        |    8 +-
 gnu/packages/cups.scm                              |    4 +-
 gnu/packages/databases.scm                         |   58 +-
 gnu/packages/direct-connect.scm                    |   82 +
 gnu/packages/disk.scm                              |   44 +
 gnu/packages/display-managers.scm                  |  110 ++
 gnu/packages/django.scm                            |  455 +++++-
 gnu/packages/dns.scm                               |   11 +-
 gnu/packages/elf.scm                               |    4 +-
 gnu/packages/elixir.scm                            |   11 +-
 gnu/packages/emacs.scm                             |  292 +++-
 gnu/packages/engineering.scm                       |   27 +-
 gnu/packages/enlightenment.scm                     |   12 +-
 gnu/packages/erlang.scm                            |   14 +-
 gnu/packages/finance.scm                           |    4 +-
 gnu/packages/fonts.scm                             |  111 +-
 gnu/packages/game-development.scm                  |   62 +
 gnu/packages/games.scm                             |  292 ++++
 gnu/packages/gcc.scm                               |   21 +
 gnu/packages/gd.scm                                |    6 +-
 gnu/packages/ghostscript.scm                       |    6 +-
 gnu/packages/gimp.scm                              |    6 +-
 gnu/packages/gnome.scm                             |   15 +-
 gnu/packages/gnustep.scm                           |   32 +-
 gnu/packages/gnuzilla.scm                          |  275 ++--
 gnu/packages/golang.scm                            |    3 +-
 gnu/packages/gstreamer.scm                         |   28 +-
 gnu/packages/guile.scm                             |   88 +-
 gnu/packages/image.scm                             |   52 +-
 gnu/packages/imagemagick.scm                       |    4 +-
 gnu/packages/irc.scm                               |    8 +-
 gnu/packages/java.scm                              | 1371 +++++++++++++++-
 gnu/packages/kde.scm                               |    8 +-
 gnu/packages/kodi.scm                              |    6 +-
 gnu/packages/language.scm                          |   32 +-
 gnu/packages/less.scm                              |    4 +-
 gnu/packages/libevent.scm                          |    4 +-
 gnu/packages/libffcall.scm                         |   19 +-
 gnu/packages/links.scm                             |   81 -
 gnu/packages/linux.scm                             |  284 +++-
 gnu/packages/lisp.scm                              |    5 +-
 gnu/packages/llvm.scm                              |   26 +
 gnu/packages/logging.scm                           |   26 +
 gnu/packages/lxde.scm                              |   16 +
 gnu/packages/lynx.scm                              |   91 --
 gnu/packages/machine-learning.scm                  |    3 +
 gnu/packages/mail.scm                              |   26 +-
 gnu/packages/man.scm                               |    5 +-
 gnu/packages/maths.scm                             |    3 +
 gnu/packages/mes.scm                               |   97 ++
 gnu/packages/messaging.scm                         |   37 +-
 gnu/packages/mpi.scm                               |    6 +-
 gnu/packages/music.scm                             |   68 +-
 gnu/packages/nano.scm                              |    6 +-
 gnu/packages/ncurses.scm                           |    2 +-
 gnu/packages/networking.scm                        |   15 +-
 gnu/packages/nfs.scm                               |   77 +-
 gnu/packages/ocaml.scm                             |   94 +-
 gnu/packages/ocr.scm                               |    4 +-
 gnu/packages/onc-rpc.scm                           |   12 +-
 gnu/packages/package-management.scm                |  371 +++--
 gnu/packages/parallel.scm                          |    4 +-
 gnu/packages/password-utils.scm                    |    7 +-
 .../abiword-black-drawing-with-gtk322.patch        |   49 +
 .../patches/abiword-explictly-cast-bools.patch     |   14 +-
 .../patches/cdrtools-3.01-mkisofs-isoinfo.patch    |  514 ++++++
 .../cool-retro-term-dont-check-uninit-member.patch |   33 +
 .../patches/cool-retro-term-fix-array-size.patch   |   25 +
 .../patches/cool-retro-term-memory-leak-1.patch    |   32 +
 .../cool-retro-term-remove-non-free-fonts.patch    |  205 +++
 .../patches/dvd+rw-tools-add-include.patch         |   14 +
 .../patches/elixir-disable-failing-tests.patch     |  145 +-
 .../patches/gnome-shell-CVE-2017-8288.patch        |   54 +
 gnu/packages/patches/icecat-bug-1299500-pt10.patch | 1639 --------------------
 .../libsndfile-CVE-2017-8361-8363-8365.patch       |   77 +
 .../patches/libsndfile-CVE-2017-8362.patch         |   61 +
 gnu/packages/patches/libtiff-CVE-2017-7593.patch   |  113 ++
 gnu/packages/patches/libtiff-CVE-2017-7594.patch   |   54 +
 .../patches/libtiff-multiple-UBSAN-crashes.patch   |  449 ++++++
 gnu/packages/patches/libtirpc-CVE-2017-8779.patch  |  263 ++++
 .../lierolibre-check-unaligned-access.patch        |   30 +
 .../patches/lierolibre-is-free-software.patch      |   38 +
 .../patches/lierolibre-newer-libconfig.patch       |  190 +++
 .../patches/lierolibre-remove-arch-warning.patch   |   30 +
 .../lierolibre-try-building-other-arch.patch       |   56 +
 .../llvm-3.5-fix-clang-build-with-gcc5.patch       |   35 +
 gnu/packages/patches/lvm2-static-link.patch        |    4 +-
 .../patches/lxterminal-CVE-2016-10369.patch        |   37 +
 gnu/packages/patches/miniupnpc-CVE-2017-8798.patch |   55 +
 .../patches/mozjs38-pkg-config-version.patch       |   24 +
 gnu/packages/patches/mozjs38-shell-version.patch   |   67 +
 gnu/packages/patches/mozjs38-tracelogger.patch     |  608 ++++++++
 .../patches/mozjs38-version-detection.patch        |  180 +++
 gnu/packages/patches/pcre2-CVE-2017-8786.patch     |  155 ++
 ...> perl-net-dns-resolver-programmable-fix.patch} |    0
 gnu/packages/patches/proot-test-fhs.patch          |   98 ++
 gnu/packages/patches/reptyr-fix-gcc-7.patch        |   38 +
 gnu/packages/patches/rpcbind-CVE-2017-8779.patch   |   29 +
 gnu/packages/pcre.scm                              |   10 +-
 gnu/packages/perl.scm                              |    2 +-
 gnu/packages/photo.scm                             |   76 +-
 gnu/packages/php.scm                               |    4 +-
 gnu/packages/pulseaudio.scm                        |   13 +
 gnu/packages/pv.scm                                |    4 +-
 gnu/packages/python.scm                            |  651 +++++++-
 gnu/packages/regex.scm                             |    9 +-
 gnu/packages/samba.scm                             |   41 +-
 gnu/packages/screen.scm                            |    3 +
 gnu/packages/serialization.scm                     |   52 +-
 gnu/packages/shells.scm                            |   32 +-
 gnu/packages/ssh.scm                               |   46 +-
 gnu/packages/suckless.scm                          |   12 +-
 gnu/packages/tcl.scm                               |    2 +-
 gnu/packages/terminals.scm                         |  110 ++
 gnu/packages/tex.scm                               |    2 +-
 gnu/packages/text-editors.scm                      |   38 +
 gnu/packages/tls.scm                               |   22 +-
 gnu/packages/upnp.scm                              |    1 +
 gnu/packages/version-control.scm                   |   19 +-
 gnu/packages/video.scm                             |   37 +-
 gnu/packages/vim.scm                               |   76 +-
 gnu/packages/vpn.scm                               |    4 +-
 gnu/packages/web-browsers.scm                      |  184 ++-
 gnu/packages/web.scm                               |  271 ++--
 gnu/packages/webkit.scm                            |    4 +-
 gnu/packages/wm.scm                                |    2 +-
 gnu/packages/wxwidgets.scm                         |   64 +-
 gnu/packages/xml.scm                               |   59 +-
 gnu/packages/xorg.scm                              |    8 +-
 gnu/packages/zip.scm                               |    5 +-
 gnu/services.scm                                   |   10 +-
 gnu/services/base.scm                              |   11 +-
 gnu/services/herd.scm                              |    9 +-
 gnu/services/shepherd.scm                          |    4 +-
 gnu/system.scm                                     |  289 ++--
 gnu/system/grub.scm                                |   20 +-
 gnu/system/pam.scm                                 |   31 +-
 gnu/system/shadow.scm                              |    4 +-
 gnu/system/vm.scm                                  |    7 +-
 gnu/tests.scm                                      |   19 +-
 gnu/tests/base.scm                                 |   27 +-
 guix/build-system/ant.scm                          |    8 +-
 guix/build-system/ocaml.scm                        |   76 +-
 guix/build/ant-build-system.scm                    |   44 +-
 guix/build/bournish.scm                            |   52 +-
 guix/build/download.scm                            |   16 +-
 guix/build/java-utils.scm                          |   55 +
 guix/build/pull.scm                                |   75 +-
 guix/derivations.scm                               |   52 -
 guix/discovery.scm                                 |  131 ++
 guix/git-download.scm                              |   10 +-
 guix/gnupg.scm                                     |    2 +-
 guix/graph.scm                                     |   32 +-
 guix/http-client.scm                               |    4 +-
 guix/import/cpan.scm                               |    2 +-
 guix/import/cran.scm                               |    6 +-
 guix/import/elpa.scm                               |    4 +-
 guix/import/pypi.scm                               |   27 +-
 guix/licenses.scm                                  |   37 +-
 guix/monads.scm                                    |  211 ++-
 guix/nar.scm                                       |    4 +-
 guix/packages.scm                                  |   13 +-
 guix/scripts.scm                                   |   54 +-
 guix/scripts/archive.scm                           |   46 +-
 guix/scripts/authenticate.scm                      |   12 +-
 guix/scripts/build.scm                             |   84 +-
 guix/scripts/challenge.scm                         |   24 +-
 guix/scripts/container.scm                         |   14 +-
 guix/scripts/container/exec.scm                    |   16 +-
 guix/scripts/copy.scm                              |   16 +-
 guix/scripts/download.scm                          |   24 +-
 guix/scripts/edit.scm                              |   14 +-
 guix/scripts/environment.scm                       |   44 +-
 guix/scripts/gc.scm                                |   44 +-
 guix/scripts/graph.scm                             |   30 +-
 guix/scripts/hash.scm                              |   20 +-
 guix/scripts/import.scm                            |   14 +-
 guix/scripts/import/cpan.scm                       |   14 +-
 guix/scripts/import/cran.scm                       |   16 +-
 guix/scripts/import/crate.scm                      |   14 +-
 guix/scripts/import/elpa.scm                       |   16 +-
 guix/scripts/import/gem.scm                        |   14 +-
 guix/scripts/import/gnu.scm                        |   14 +-
 guix/scripts/import/hackage.scm                    |   24 +-
 guix/scripts/import/nix.scm                        |   10 +-
 guix/scripts/import/pypi.scm                       |   14 +-
 guix/scripts/import/stackage.scm                   |   18 +-
 guix/scripts/lint.scm                              |  110 +-
 guix/scripts/offload.scm                           |   48 +-
 guix/scripts/pack.scm                              |   26 +-
 guix/scripts/package.scm                           |   80 +-
 guix/scripts/perform-download.scm                  |    8 +-
 guix/scripts/publish.scm                           |   82 +-
 guix/scripts/pull.scm                              |  125 +-
 guix/scripts/refresh.scm                           |  138 +-
 guix/scripts/size.scm                              |   22 +-
 guix/scripts/substitute.scm                        |   77 +-
 guix/scripts/system.scm                            |  182 +--
 guix/ssh.scm                                       |    8 +-
 guix/store.scm                                     |   74 +-
 guix/ui.scm                                        |  124 +-
 guix/upstream.scm                                  |    8 +-
 po/guix/Makevars                                   |    7 +-
 po/guix/POTFILES.in                                |    1 +
 po/guix/fr.po                                      | 1063 ++++++++-----
 po/packages/Makevars                               |    5 +
 tests/cran.scm                                     |    6 +
 tests/discovery.scm                                |   52 +
 tests/guix-build.sh                                |    1 -
 tests/publish.scm                                  |   32 +-
 tests/store.scm                                    |    5 +-
 tests/ui.scm                                       |    6 +-
 249 files changed, 13669 insertions(+), 4797 deletions(-)




reply via email to

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