guix-commits
[Top][All Lists]
Advanced

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

01/02: Merge branch 'master' into staging


From: Marius Bakke
Subject: 01/02: Merge branch 'master' into staging
Date: Mon, 11 Jun 2018 18:11:07 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit a032b4454b3fc67e11e9fc2d8c2345288065fa29
Merge: b572423 6321ce4
Author: Marius Bakke <address@hidden>
Date:   Mon Jun 11 23:52:15 2018 +0200

    Merge branch 'master' into staging

 .dir-locals.el                                     |    3 +
 CODE-OF-CONDUCT                                    |  111 +-
 Makefile.am                                        |   31 +-
 NEWS                                               |   17 +
 build-aux/build-self.scm                           |   19 +-
 build-aux/compile-as-derivation.scm                |    5 +-
 build-aux/hydra/gnu-system.scm                     |    3 +-
 build-aux/hydra/guix-modular.scm                   |    1 +
 build-aux/test-env.in                              |    1 +
 configure.ac                                       |    5 +
 doc/contributing.fr.texi                           |  168 +-
 doc/contributing.texi                              |   10 +-
 doc/guix.fr.texi                                   | 5017 ++++++-----
 doc/guix.texi                                      |  515 +-
 etc/guix-install.sh                                |    4 +-
 gnu/bootloader/extlinux.scm                        |    1 +
 gnu/bootloader/grub.scm                            |   29 +-
 gnu/bootloader/u-boot.scm                          |   70 +-
 gnu/build/cross-toolchain.scm                      |    6 +-
 gnu/build/file-systems.scm                         |   58 +-
 gnu/build/linux-boot.scm                           |   12 +-
 gnu/build/marionette.scm                           |   27 +
 gnu/build/shepherd.scm                             |    3 +-
 gnu/build/svg.scm                                  |   11 +-
 gnu/build/vm.scm                                   |   16 +-
 gnu/local.mk                                       |   79 +-
 gnu/packages.scm                                   |    2 +-
 gnu/packages/accessibility.scm                     |    6 +-
 gnu/packages/acl.scm                               |   20 +-
 gnu/packages/admin.scm                             |  259 +-
 gnu/packages/aidc.scm                              |    6 +-
 gnu/packages/algebra.scm                           |  144 +-
 gnu/packages/android.scm                           |  616 +-
 gnu/packages/apr.scm                               |   11 +-
 gnu/packages/aspell.scm                            |    5 +-
 gnu/packages/assembly.scm                          |    2 +-
 gnu/packages/astronomy.scm                         |   29 +-
 gnu/packages/attr.scm                              |   21 +-
 gnu/packages/audio.scm                             |  117 +-
 gnu/packages/autotools.scm                         |   85 +-
 .../linux-libre/{4.16-arm.conf => 4.17-arm.conf}   |  342 +-
 .../linux-libre/{4.16-arm.conf => 4.17-arm64.conf} | 3021 +++----
 .../linux-libre/{4.16-i686.conf => 4.17-i686.conf} |  302 +-
 .../{4.16-x86_64.conf => 4.17-x86_64.conf}         |  303 +-
 gnu/packages/aux-files/run-in-namespace.c          |  313 +
 gnu/packages/avahi.scm                             |   31 +-
 gnu/packages/avr.scm                               |    2 +-
 gnu/packages/backup.scm                            |   46 +-
 gnu/packages/base.scm                              |  340 +-
 gnu/packages/bash.scm                              |   18 +-
 gnu/packages/bdw-gc.scm                            |   12 +-
 gnu/packages/bioconductor.scm                      |   88 +-
 gnu/packages/bioinformatics.scm                    |  856 +-
 gnu/packages/bittorrent.scm                        |   10 +-
 gnu/packages/boost.scm                             |   76 +-
 gnu/packages/bootloaders.scm                       |  154 +-
 gnu/packages/bootstrap.scm                         |   46 +-
 gnu/packages/build-tools.scm                       |    2 +
 gnu/packages/c.scm                                 |    4 +-
 gnu/packages/calendar.scm                          |   29 +-
 gnu/packages/cdrom.scm                             |   28 +-
 gnu/packages/certs.scm                             |   12 +-
 gnu/packages/check.scm                             |   90 +-
 gnu/packages/chez.scm                              |    6 +-
 gnu/packages/ci.scm                                |    5 -
 gnu/packages/cluster.scm                           |   87 +
 gnu/packages/cmake.scm                             |  222 +-
 gnu/packages/code.scm                              |  183 +-
 gnu/packages/commencement.scm                      |  184 +-
 gnu/packages/compression.scm                       |  311 +-
 gnu/packages/compton.scm                           |    2 +-
 gnu/packages/connman.scm                           |    6 +-
 gnu/packages/cpp.scm                               |  147 +
 gnu/packages/cran.scm                              |  443 +-
 gnu/packages/cross-base.scm                        |   86 +-
 gnu/packages/crypto.scm                            |   66 +-
 gnu/packages/cups.scm                              |   35 +-
 gnu/packages/curl.scm                              |   20 +-
 gnu/packages/databases.scm                         |  126 +-
 gnu/packages/debian.scm                            |    9 +-
 gnu/packages/debug.scm                             |    7 +-
 gnu/packages/dejagnu.scm                           |   13 +-
 gnu/packages/dictionaries.scm                      |   22 +-
 gnu/packages/disk.scm                              |   31 +-
 gnu/packages/display-managers.scm                  |    4 +-
 gnu/packages/dns.scm                               |   12 +-
 gnu/packages/docbook.scm                           |   40 +-
 gnu/packages/documentation.scm                     |   19 +-
 gnu/packages/dunst.scm                             |    5 +-
 gnu/packages/education.scm                         |   87 +-
 gnu/packages/elf.scm                               |   15 +-
 gnu/packages/emacs.scm                             | 3514 +++++++-
 gnu/packages/embedded.scm                          |    9 +-
 gnu/packages/emulators.scm                         |  291 +-
 gnu/packages/engineering.scm                       |  320 +-
 gnu/packages/enlightenment.scm                     |   17 +-
 gnu/packages/file-systems.scm                      |   10 +-
 gnu/packages/firmware.scm                          |  160 +-
 gnu/packages/flex.scm                              |    2 +-
 gnu/packages/fonts.scm                             |   17 +-
 gnu/packages/fontutils.scm                         |   42 +-
 gnu/packages/fpga.scm                              |    6 +-
 gnu/packages/freedesktop.scm                       |   51 +-
 gnu/packages/freeipmi.scm                          |    4 +-
 gnu/packages/ftp.scm                               |   14 +-
 gnu/packages/fvwm.scm                              |    4 +-
 gnu/packages/game-development.scm                  |   34 +-
 gnu/packages/games.scm                             |  629 +-
 gnu/packages/gawk.scm                              |   13 +-
 gnu/packages/gcc.scm                               |  338 +-
 gnu/packages/gdb.scm                               |    3 +-
 gnu/packages/geo.scm                               |  151 +-
 gnu/packages/gettext.scm                           |   23 +-
 gnu/packages/ghostscript.scm                       |   41 +-
 gnu/packages/gimp.scm                              |  143 +-
 gnu/packages/gl.scm                                |   37 +-
 gnu/packages/glib.scm                              |  105 +-
 gnu/packages/gnome.scm                             |  224 +-
 gnu/packages/gnu-doc.scm                           |   12 +-
 gnu/packages/gnucash.scm                           |   68 +-
 gnu/packages/gnunet.scm                            |   14 +-
 gnu/packages/gnupg.scm                             |  214 +-
 gnu/packages/gnuzilla.scm                          |  155 +-
 gnu/packages/golang.scm                            |  410 +-
 gnu/packages/graph.scm                             |    4 +-
 gnu/packages/graphics.scm                          |    3 +-
 gnu/packages/graphviz.scm                          |   17 +-
 gnu/packages/groff.scm                             |    2 +-
 gnu/packages/groovy.scm                            | 1156 +++
 gnu/packages/gstreamer.scm                         |   34 +-
 gnu/packages/gtk.scm                               |  112 +-
 gnu/packages/guile.scm                             |  466 +-
 gnu/packages/haskell-check.scm                     |   14 +
 gnu/packages/haskell.scm                           |  218 +-
 gnu/packages/hurd.scm                              |   17 +-
 gnu/packages/ibus.scm                              |   56 +-
 gnu/packages/icu4c.scm                             |    4 +-
 gnu/packages/image-processing.scm                  |  207 +-
 gnu/packages/image-viewers.scm                     |   40 +-
 gnu/packages/image.scm                             |  122 +-
 gnu/packages/imagemagick.scm                       |   20 +-
 gnu/packages/indent.scm                            |   56 -
 gnu/packages/inkscape.scm                          |    9 +-
 gnu/packages/irc.scm                               |    6 +-
 gnu/packages/java.scm                              |  377 +-
 gnu/packages/javascript.scm                        |   65 +-
 gnu/packages/kde-frameworks.scm                    |    7 +-
 gnu/packages/kerberos.scm                          |   64 +-
 gnu/packages/kodi.scm                              |    6 -
 gnu/packages/ld-wrapper.in                         |   23 +-
 gnu/packages/libbsd.scm                            |    4 +-
 gnu/packages/libevent.scm                          |    6 +-
 gnu/packages/libffi.scm                            |   39 +-
 gnu/packages/libidn.scm                            |    4 +-
 gnu/packages/libreoffice.scm                       |  152 +-
 gnu/packages/libsigsegv.scm                        |    4 +-
 gnu/packages/libunistring.scm                      |    6 +-
 gnu/packages/libusb.scm                            |    6 -
 gnu/packages/linux.scm                             |  547 +-
 gnu/packages/lisp.scm                              |   42 +-
 gnu/packages/lua.scm                               |   16 +-
 gnu/packages/lxde.scm                              |    9 +-
 gnu/packages/lxqt.scm                              |    7 +-
 gnu/packages/m4.scm                                |   26 +-
 gnu/packages/machine-learning.scm                  |  130 +-
 gnu/packages/mail.scm                              |   84 +-
 gnu/packages/make-bootstrap.scm                    |  185 +-
 gnu/packages/man.scm                               |   11 +-
 gnu/packages/markup.scm                            |    5 +-
 gnu/packages/mate.scm                              |   22 +-
 gnu/packages/maths.scm                             |  210 +-
 gnu/packages/maven.scm                             |  434 +
 gnu/packages/mes.scm                               |   36 +-
 gnu/packages/messaging.scm                         |  129 +-
 gnu/packages/microcom.scm                          |    6 -
 gnu/packages/monitoring.scm                        |    8 +-
 gnu/packages/mp3.scm                               |   12 +-
 gnu/packages/mpd.scm                               |   11 +-
 gnu/packages/mpi.scm                               |   20 +-
 gnu/packages/multiprecision.scm                    |    9 +-
 gnu/packages/music.scm                             |  160 +-
 gnu/packages/nano.scm                              |    4 +-
 gnu/packages/ncurses.scm                           |   66 +-
 gnu/packages/netpbm.scm                            |    3 +-
 gnu/packages/networking.scm                        |  241 +-
 gnu/packages/node.scm                              |    3 +-
 gnu/packages/nvi.scm                               |    3 +-
 gnu/packages/ocaml.scm                             |   91 +-
 gnu/packages/onc-rpc.scm                           |    8 +-
 gnu/packages/openldap.scm                          |    5 +-
 gnu/packages/openstack.scm                         |    4 +-
 gnu/packages/package-management.scm                |   57 +-
 gnu/packages/parallel.scm                          |    4 +-
 gnu/packages/password-utils.scm                    |   47 +-
 gnu/packages/patches/adb-add-libraries.patch       |   30 +
 .../alsa-lib-add-environment-variable.patch        |  110 +
 gnu/packages/patches/amule-crypto-6.patch          |   45 +
 gnu/packages/patches/binutils-ld-new-dtags.patch   |   16 -
 gnu/packages/patches/boost-fix-icu-build.patch     |   53 +
 .../patches/btrfs-progs-e-value-block.patch        |   37 +
 gnu/packages/patches/cmake-fix-tests.patch         |  120 -
 gnu/packages/patches/doxygen-gcc-ice.patch         |   25 +
 gnu/packages/patches/e2fsprogs-glibc-2.27.patch    |   56 +
 gnu/packages/patches/elogind-glibc-2.27.patch      |   22 +
 .../patches/emacs-fix-scheme-indent-function.patch |   14 +-
 .../patches/enlightenment-fix-setuid-path.patch    |  168 +
 .../patches/fifo-map-fix-flags-for-gcc.patch       |   39 +
 .../patches/fifo-map-remove-catch.hpp.patch        |   30 +
 .../patches/fontconfig-remove-debug-printf.patch   |   18 -
 gnu/packages/patches/gawk-shell.patch              |   30 +-
 .../patches/gcc-strmov-store-file-names.patch      |   50 +-
 gnu/packages/patches/gegl-CVE-2012-4433.patch      |  117 -
 .../patches/ghostscript-no-header-id.patch         |   13 +-
 gnu/packages/patches/gimp-CVE-2017-17784.patch     |   41 -
 gnu/packages/patches/gimp-CVE-2017-17785.patch     |  171 -
 gnu/packages/patches/gimp-CVE-2017-17786.patch     |   94 -
 gnu/packages/patches/gimp-CVE-2017-17787.patch     |   42 -
 gnu/packages/patches/gimp-CVE-2017-17789.patch     |   48 -
 gnu/packages/patches/glib-respect-datadir.patch    |   21 -
 gnu/packages/patches/glibc-2.27-git-fixes.patch    |  702 ++
 gnu/packages/patches/glibc-bootstrap-system.patch  |   14 +-
 .../patches/glibc-hidden-visibility-ldconfig.patch |   16 +
 gnu/packages/patches/glibc-locales.patch           |   12 +-
 .../glibc-reinstate-prlimit64-fallback.patch       |  127 +
 .../patches/gnupg-1.4-CVE-2018-12020.patch         |   50 +
 gnu/packages/patches/graphite2-ffloat-store.patch  |   34 -
 .../groovy-add-exceptionutilsgenerator.patch       |   98 +
 .../patches/guile-gdbm-ffi-support-gdbm-1.14.patch |   53 +
 gnu/packages/patches/heimdal-CVE-2017-11103.patch  |   45 -
 gnu/packages/patches/heimdal-CVE-2017-6594.patch   |   85 -
 .../icecat-CVE-2018-5157-and-CVE-2018-5158.patch   |  441 +
 gnu/packages/patches/lcms-CVE-2016-10165.patch     |   36 -
 .../patches/libgpg-error-aarch64-logging-fix.patch |   58 +
 gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch |   78 +
 .../patches/libmygpo-qt-missing-qt5-modules.patch  |   51 +
 .../patches/liboop-mips64-deplibs-fix.patch        |   17 -
 gnu/packages/patches/libreoffice-icu.patch         |  126 +
 gnu/packages/patches/libtasn1-CVE-2017-10790.patch |   63 -
 gnu/packages/patches/libtasn1-CVE-2018-6003.patch  |   73 -
 gnu/packages/patches/libusb-for-axoloti.patch      |   14 +-
 gnu/packages/patches/libutils-add-includes.patch   |   11 +
 .../libutils-remove-damaging-includes.patch        |   21 +
 .../patches/libvorbis-CVE-2017-14632.patch         |   63 -
 .../patches/libvorbis-CVE-2017-14633.patch         |   43 -
 .../patches/libxcb-python-3.5-compat.patch         |   64 -
 .../patches/libziparchive-add-includes.patch       |   10 +
 gnu/packages/patches/make-glibc-compat.patch       |   52 +
 .../patches/maven-generate-component-xml.patch     |  171 +
 .../maven-generate-javax-inject-named.patch        |   31 +
 gnu/packages/patches/mumble-1.2.19-abs.patch       |   31 +
 gnu/packages/patches/mupdf-CVE-2017-17858.patch    |  111 -
 gnu/packages/patches/mupdf-CVE-2018-1000051.patch  |   88 -
 gnu/packages/patches/mupdf-CVE-2018-6544.patch     |  109 -
 .../patches/mupdf-build-with-latest-openjpeg.patch |   27 -
 gnu/packages/patches/myrepos-CVE-2018-7032.patch   |   69 +
 gnu/packages/patches/opensmtpd-fix-crash.patch     |   44 +
 gnu/packages/patches/patch-hurd-path-max.patch     |   15 +-
 gnu/packages/patches/pcre2-CVE-2017-7186.patch     |   68 -
 gnu/packages/patches/pcre2-CVE-2017-8786.patch     |  155 -
 gnu/packages/patches/perf-gcc-ice.patch            |   13 +
 gnu/packages/patches/pius.patch                    |   38 +
 gnu/packages/patches/pulseaudio-glibc-2.27.patch   |   67 +
 gnu/packages/patches/pycairo-wscript.patch         |   31 -
 gnu/packages/patches/python-3-search-paths.patch   |   13 +-
 .../patches/python-statsmodels-fix-tests.patch     |   28 -
 gnu/packages/patches/qemu-glibc-2.27.patch         |   55 +
 gnu/packages/patches/quassel-qt-5.11.patch         |   72 +
 .../patches/sddm-fix-build-with-qt-5.11-1024.patch |   28 +
 gnu/packages/patches/shadow-CVE-2018-7169.patch    |  191 -
 gnu/packages/patches/strace-kernel-4.16.patch      |   92 +
 gnu/packages/patches/tar-CVE-2016-6321.patch       |   51 -
 .../patches/tar-remove-wholesparse-check.patch     |   68 +
 .../patches/util-linux-CVE-2018-7738.patch         |   49 -
 gnu/packages/patches/util-linux-tests.patch        |    8 +-
 gnu/packages/patches/xcb-proto-python3-print.patch |   75 -
 .../patches/xcb-proto-python3-whitespace.patch     |  217 -
 gnu/packages/pciutils.scm                          |    2 +-
 gnu/packages/pcre.scm                              |    7 +-
 gnu/packages/pdf.scm                               |   69 +-
 gnu/packages/perl-check.scm                        |    4 +-
 gnu/packages/perl.scm                              |   94 +-
 gnu/packages/photo.scm                             |    8 +-
 gnu/packages/php.scm                               |    3 +-
 gnu/packages/pkg-config.scm                        |    3 +-
 gnu/packages/plotutils.scm                         |   23 +-
 gnu/packages/pretty-print.scm                      |   50 +-
 gnu/packages/printers.scm                          |   69 +
 gnu/packages/profiling.scm                         |    6 +-
 gnu/packages/pulseaudio.scm                        |   23 +-
 gnu/packages/python-crypto.scm                     |  127 +-
 gnu/packages/python-web.scm                        |  144 +-
 gnu/packages/python.scm                            |  561 +-
 gnu/packages/qt.scm                                |  355 +-
 gnu/packages/ratpoison.scm                         |    8 +-
 gnu/packages/rdf.scm                               |    6 +-
 gnu/packages/robotics.scm                          |   10 +-
 gnu/packages/ruby.scm                              |   43 +-
 gnu/packages/rust.scm                              |  105 +-
 gnu/packages/samba.scm                             |   41 +-
 gnu/packages/sawfish.scm                           |   20 +-
 gnu/packages/scanner.scm                           |   11 +-
 gnu/packages/scheme.scm                            |   29 +-
 gnu/packages/screen.scm                            |    6 +-
 gnu/packages/scribus.scm                           |   31 +-
 gnu/packages/sdl.scm                               |   17 +-
 gnu/packages/search.scm                            |   54 +-
 gnu/packages/security-token.scm                    |  104 +-
 gnu/packages/selinux.scm                           |    4 +-
 gnu/packages/serialization.scm                     |   14 +-
 gnu/packages/shells.scm                            |   17 +-
 gnu/packages/skarnet.scm                           |    8 +-
 gnu/packages/slang.scm                             |    3 +-
 gnu/packages/smalltalk.scm                         |    3 +-
 gnu/packages/ssh.scm                               |   56 +-
 gnu/packages/statistics.scm                        |  224 +-
 gnu/packages/storage.scm                           |    4 +-
 gnu/packages/suckless.scm                          |   86 +-
 gnu/packages/sync.scm                              |    3 +-
 gnu/packages/syncthing.scm                         |   57 +-
 gnu/packages/tbb.scm                               |    8 +-
 gnu/packages/tcl.scm                               |   34 +-
 gnu/packages/telephony.scm                         |   70 +
 gnu/packages/terminals.scm                         |   17 +-
 gnu/packages/tex.scm                               |  225 +-
 gnu/packages/texinfo.scm                           |    4 +-
 gnu/packages/text-editors.scm                      |   12 +-
 gnu/packages/textutils.scm                         |    7 +-
 gnu/packages/time.scm                              |    8 +-
 gnu/packages/tls.scm                               |  179 +-
 gnu/packages/tor.scm                               |    4 +-
 gnu/packages/unrtf.scm                             |    2 +-
 gnu/packages/upnp.scm                              |    4 +-
 gnu/packages/version-control.scm                   |  234 +-
 gnu/packages/video.scm                             |  253 +-
 gnu/packages/vim.scm                               |   12 +-
 gnu/packages/virtualization.scm                    |   18 +-
 gnu/packages/vpn.scm                               |    3 +-
 gnu/packages/vulkan.scm                            |   96 +-
 gnu/packages/w3m.scm                               |    7 +-
 gnu/packages/web-browsers.scm                      |    9 +-
 gnu/packages/web.scm                               |  344 +-
 gnu/packages/webkit.scm                            |   54 +-
 gnu/packages/wget.scm                              |    8 +-
 gnu/packages/wine.scm                              |   16 +-
 gnu/packages/wm.scm                                |   76 +-
 gnu/packages/wxwidgets.scm                         |    3 +-
 gnu/packages/xdisorg.scm                           |  156 +-
 gnu/packages/xfce.scm                              |    3 +-
 gnu/packages/xiph.scm                              |   19 +-
 gnu/packages/xml.scm                               |   39 +-
 gnu/packages/xnee.scm                              |    5 +-
 gnu/packages/xorg.scm                              |  488 +-
 gnu/packages/zile.scm                              |    2 +-
 gnu/services/base.scm                              |   17 +-
 gnu/services/cgit.scm                              |   17 +-
 gnu/services/dbus.scm                              |    2 +-
 gnu/services/desktop.scm                           |   72 +-
 gnu/services/dns.scm                               |   81 +-
 gnu/services/games.scm                             |    2 +-
 gnu/services/messaging.scm                         |   22 +-
 gnu/services/networking.scm                        |    5 +
 gnu/services/sound.scm                             |   86 +
 gnu/services/web.scm                               |   72 +-
 gnu/system.scm                                     |   75 +-
 gnu/system/examples/bare-bones.tmpl                |    3 +-
 gnu/system/examples/beaglebone-black.tmpl          |    3 +-
 gnu/system/examples/lightweight-desktop.tmpl       |    4 +-
 gnu/system/examples/vm-image.tmpl                  |    3 +-
 gnu/system/file-systems.scm                        |  111 +-
 gnu/system/install.scm                             |   36 +-
 gnu/system/linux-initrd.scm                        |    2 +-
 gnu/system/shadow.scm                              |    3 +
 gnu/system/uuid.scm                                |   11 +-
 gnu/system/vm.scm                                  |  125 +-
 gnu/tests.scm                                      |    3 +-
 gnu/tests/dict.scm                                 |   19 +-
 gnu/tests/install.scm                              |   26 +-
 gnu/tests/ssh.scm                                  |  290 +-
 gnu/tests/web.scm                                  |   82 +-
 guix/build-system/android-ndk.scm                  |  127 +
 guix/build-system/r.scm                            |    2 +-
 guix/build/android-ndk-build-system.scm            |   88 +
 guix/build/ant-build-system.scm                    |   21 +-
 guix/build/asdf-build-system.scm                   |    2 +
 guix/build/cargo-build-system.scm                  |    1 +
 guix/build/cmake-build-system.scm                  |    5 +-
 guix/build/compile.scm                             |   45 +-
 guix/build/cvs.scm                                 |   27 +-
 guix/build/dub-build-system.scm                    |    1 +
 guix/build/emacs-build-system.scm                  |    1 +
 guix/build/emacs-utils.scm                         |    6 +-
 guix/build/font-build-system.scm                   |    1 +
 guix/build/glib-or-gtk-build-system.scm            |   21 +-
 guix/build/gnu-build-system.scm                    |  311 +-
 guix/build/gnu-dist.scm                            |   17 +-
 guix/build/go-build-system.scm                     |    1 +
 guix/build/gremlin.scm                             |    4 +-
 guix/build/haskell-build-system.scm                |    1 +
 guix/build/hg.scm                                  |   30 +-
 guix/build/minify-build-system.scm                 |    1 +
 guix/build/ocaml-build-system.scm                  |    1 +
 guix/build/perl-build-system.scm                   |   17 +-
 guix/build/profiles.scm                            |   14 +-
 guix/build/python-build-system.scm                 |   46 +-
 guix/build/r-build-system.scm                      |   28 +-
 guix/build/ruby-build-system.scm                   |    1 +
 guix/build/scons-build-system.scm                  |   25 +-
 guix/build/svn.scm                                 |   38 +-
 guix/build/texlive-build-system.scm                |   11 +-
 guix/build/union.scm                               |   65 +-
 guix/build/utils.scm                               |   47 +-
 guix/build/waf-build-system.scm                    |    1 +
 guix/config.scm.in                                 |    6 +
 guix/docker.scm                                    |    6 +-
 guix/download.scm                                  |   31 +-
 guix/gexp.scm                                      |  277 +-
 guix/http-client.scm                               |    2 +-
 guix/import/cpan.scm                               |    9 +-
 guix/import/cran.scm                               |   82 +-
 guix/import/crate.scm                              |    4 +-
 guix/import/elpa.scm                               |   61 +-
 guix/import/gem.scm                                |    2 +-
 guix/import/github.scm                             |   19 +-
 guix/import/json.scm                               |   24 +-
 guix/import/pypi.scm                               |    4 +-
 guix/import/stackage.scm                           |    2 +-
 guix/import/utils.scm                              |   77 +-
 guix/man-db.scm                                    |    6 +-
 guix/packages.scm                                  |  175 +-
 guix/profiles.scm                                  |  207 +-
 guix/records.scm                                   |   57 +-
 guix/scripts.scm                                   |    4 +-
 guix/scripts/build.scm                             |   76 +-
 guix/scripts/import/cran.scm                       |    6 +-
 guix/scripts/import/elpa.scm                       |   26 +-
 guix/scripts/lint.scm                              |   25 +-
 guix/scripts/offload.scm                           |   46 +-
 guix/scripts/pack.scm                              |  430 +-
 guix/scripts/package.scm                           |   40 -
 guix/scripts/pull.scm                              |   97 +-
 guix/scripts/system.scm                            |   41 +-
 guix/scripts/system/search.scm                     |    7 +-
 guix/scripts/weather.scm                           |    8 +-
 guix/search-paths.scm                              |   15 +-
 guix/self.scm                                      |  414 +-
 guix/store/database.scm                            |  234 +
 guix/store/deduplication.scm                       |  148 +
 guix/ui.scm                                        |   92 +-
 guix/utils.scm                                     |   24 +-
 m4/guix.m4                                         |   18 +
 nix/libstore/build.cc                              |    8 +
 nix/local.mk                                       |    2 +-
 po/doc/guix-manual.fr.po                           | 9166 ++++++++++++--------
 po/guix/da.po                                      | 1604 ++--
 po/guix/pt_BR.po                                   | 1119 ++-
 scripts/guix.in                                    |   14 +-
 tests/gexp.scm                                     |   86 +
 tests/graph.scm                                    |    4 +-
 tests/guix-build.sh                                |   21 +-
 tests/guix-pack.sh                                 |   24 +-
 tests/guix-package.sh                              |    8 +-
 tests/guix-system.sh                               |   13 +-
 tests/pack.scm                                     |   15 +-
 tests/packages.scm                                 |   92 +-
 tests/profiles.scm                                 |   63 +-
 tests/records.scm                                  |   30 +-
 tests/store-database.scm                           |   54 +
 tests/store-deduplication.scm                      |   64 +
 tests/system.scm                                   |    6 +-
 tests/union.scm                                    |   18 +
 tests/utils.scm                                    |    8 +-
 tests/uuid.scm                                     |    9 +-
 472 files changed, 38047 insertions(+), 19094 deletions(-)

diff --cc gnu/packages/gl.scm
index f38ad83,503308a..1630f46
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@@ -234,13 -236,13 +236,12 @@@ also known as DXTn or DXTC) for Mesa."
                                    version "/mesa-" version ".tar.xz")))
          (sha256
           (base32
 -          "1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg"))
 +          "0szwqjr5x2q4r6gcwb862s18wl4s0z34w4rd0vr7isiasylbp1si"))
          (patches
 -         (search-patches "mesa-wayland-egl-symbols-check-mips.patch"
 -                         "mesa-skip-disk-cache-test.patch"))))
 +         (search-patches "mesa-skip-disk-cache-test.patch"))))
      (build-system gnu-build-system)
      (propagated-inputs
-       `(("glproto" ,glproto)
-         ;; The following are in the Requires.private field of gl.pc.
+       `(;; The following are in the Requires.private field of gl.pc.
          ("libdrm" ,libdrm)
          ("libvdpau" ,libvdpau)
          ("libx11" ,libx11)
diff --cc gnu/packages/pdf.scm
index 048225a,fb7fd3d..1ae6b0d
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@@ -10,10 -10,10 +10,10 @@@
  ;;; Copyright © 2016, 2017 Ludovic Courtès <address@hidden>
  ;;; Copyright © 2016 Julien Lepiller <address@hidden>
  ;;; Copyright © 2016 Arun Isaac <address@hidden>
- ;;; Copyright © 2017 Leo Famulari <address@hidden>
+ ;;; Copyright © 2017, 2018 Leo Famulari <address@hidden>
  ;;; Copyright © 2017 Alex Vong <address@hidden>
  ;;; Copyright © 2017 Rene Saavedra <address@hidden>
 -;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
 +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/xdisorg.scm
index c94d57f,57200d8..8ea44f5
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@@ -22,7 -22,7 +22,8 @@@
  ;;; Copyright © 2017 Marek Benc <address@hidden>
  ;;; Copyright © 2017 Mike Gerwitz <address@hidden>
  ;;; Copyright © 2018 Thomas Sigurdsen <address@hidden>
 +;;; Copyright © 2018 Rutger Helling <address@hidden>
+ ;;; Copyright © 2018 Pierre Neidhardt <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/xorg.scm
index bb0ca6f,5400118..278d396
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -1009,13 -1034,12 +1034,12 @@@ of new capabilities and controls for te
                 ".tar.bz2"))
          (sha256
            (base32
 -            "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9"))))
 +            "0hvjfhrcym770cr0zpqajdy3cda30aiwbjzv16iafkqkbl090gr5"))))
      (build-system gnu-build-system)
      (inputs
-       `(("xextproto" ,xextproto)
+       `(("xorgproto" ,xorgproto)
          ("libxext" ,libxext)
-         ("libx11" ,libx11)
-         ("dmxproto" ,dmxproto)))
+         ("libx11" ,libx11)))
      (native-inputs
        `(("pkg-config" ,pkg-config)))
      (home-page "https://www.x.org/wiki/";)
@@@ -3717,10 -3731,10 +3731,10 @@@ alternative implementations like XRand
                 ".tar.bz2"))
          (sha256
           (base32
 -          "0djp7bb0ch2ddwmc1bkg4fddxdvamiiz375x0r0ni5dcb37w93bl"))))
 +          "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d"))))
      (build-system gnu-build-system)
      (inputs
-       `(("xproto" ,xproto)
+       `(("xorgproto" ,xorgproto)
          ("libxkbfile" ,libxkbfile)
          ("libx11" ,libx11)))
      (native-inputs



reply via email to

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