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: Marius Bakke
Subject: 01/01: Merge branch 'master' into core-updates
Date: Tue, 24 Jul 2018 14:26:50 -0400 (EDT)

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

commit 706ae8e15c8d36b0aee7c19c54c143d3e17f5784
Merge: 3e95125 8440db4
Author: Marius Bakke <address@hidden>
Date:   Tue Jul 24 19:56:35 2018 +0200

    Merge branch 'master' into core-updates

 .mailmap                                           |    2 +
 HACKING                                            |    2 +-
 Makefile.am                                        |   12 +-
 NEWS                                               | 1066 ++-
 doc/contributing.texi                              |    7 +-
 doc/guix.texi                                      |  305 +-
 doc/htmlxref.cnf                                   |    6 +-
 etc/completion/bash/guix                           |   12 +
 etc/snippets/scheme-mode/guix-package              |    4 +-
 .../guix-commit-message-use-https-home-page        |    9 +
 gnu/build/vm.scm                                   |    8 +-
 gnu/local.mk                                       |   40 +-
 gnu/packages/admin.scm                             |    8 +-
 gnu/packages/algebra.scm                           |   19 +-
 gnu/packages/aspell.scm                            |   18 +-
 gnu/packages/astronomy.scm                         |    6 +-
 gnu/packages/audio.scm                             |    4 +-
 gnu/packages/aux-files/linux-libre/4.1-i686.conf   | 8316 --------------------
 gnu/packages/aux-files/linux-libre/4.1-x86_64.conf | 8116 -------------------
 gnu/packages/base.scm                              |   28 +-
 gnu/packages/bioconductor.scm                      |  129 +-
 gnu/packages/bioinformatics.scm                    |  103 +-
 gnu/packages/bittorrent.scm                        |    4 +-
 gnu/packages/bootloaders.scm                       |   18 +-
 gnu/packages/build-tools.scm                       |    4 +-
 gnu/packages/busybox.scm                           |   13 +-
 gnu/packages/cdrom.scm                             |   28 +-
 gnu/packages/certs.scm                             |    4 +-
 gnu/packages/chemistry.scm                         |  125 +
 gnu/packages/ci.scm                                |    7 +-
 gnu/packages/cluster.scm                           |    4 +-
 gnu/packages/commencement.scm                      |    3 +
 gnu/packages/compression.scm                       |   51 +-
 gnu/packages/cran.scm                              |  159 +-
 gnu/packages/crypto.scm                            |  117 +-
 gnu/packages/curl.scm                              |    8 +-
 gnu/packages/databases.scm                         |   13 +-
 gnu/packages/dav.scm                               |   40 +-
 gnu/packages/debian.scm                            |   15 +-
 gnu/packages/dictionaries.scm                      |    4 +-
 gnu/packages/digest.scm                            |   16 +-
 gnu/packages/disk.scm                              |    4 +-
 gnu/packages/display-managers.scm                  |    9 +-
 gnu/packages/dns.scm                               |  101 +-
 gnu/packages/dunst.scm                             |    2 +-
 gnu/packages/ebook.scm                             |    4 +-
 gnu/packages/elixir.scm                            |    6 +-
 gnu/packages/emacs.scm                             |  651 +-
 gnu/packages/embedded.scm                          |   11 +-
 gnu/packages/emulators.scm                         |   26 +-
 gnu/packages/engineering.scm                       |   18 +-
 gnu/packages/erlang.scm                            |    7 +-
 gnu/packages/finance.scm                           |  220 +-
 gnu/packages/fltk.scm                              |   26 +-
 gnu/packages/fontutils.scm                         |   31 +-
 gnu/packages/fpga.scm                              |    8 +-
 gnu/packages/freedesktop.scm                       |   11 +-
 gnu/packages/ftp.scm                               |   41 +-
 gnu/packages/game-development.scm                  |   87 +-
 gnu/packages/games.scm                             |  336 +-
 gnu/packages/gcc.scm                               |    2 +-
 gnu/packages/geo.scm                               |    2 +-
 gnu/packages/ghostscript.scm                       |   11 +
 gnu/packages/gimp.scm                              |   18 +-
 gnu/packages/gl.scm                                |   29 +-
 gnu/packages/glib.scm                              |    4 +-
 gnu/packages/gnome.scm                             |   57 +-
 gnu/packages/gnu-pw-mgr.scm                        |    4 +-
 gnu/packages/gnunet.scm                            |    4 +-
 gnu/packages/gnupg.scm                             |    4 +-
 gnu/packages/gnuzilla.scm                          |    4 +-
 gnu/packages/golang.scm                            |  565 ++
 gnu/packages/gps.scm                               |    6 +-
 gnu/packages/graphics.scm                          |   92 +-
 gnu/packages/graphviz.scm                          |    4 +-
 gnu/packages/gtk.scm                               |   21 +-
 gnu/packages/guile.scm                             |  755 +-
 gnu/packages/haskell.scm                           |   44 +
 gnu/packages/image-viewers.scm                     |    4 +-
 gnu/packages/imagemagick.scm                       |    4 +-
 gnu/packages/iso-codes.scm                         |    2 +-
 gnu/packages/java.scm                              |  501 +-
 gnu/packages/julia.scm                             |    2 +-
 gnu/packages/kodi.scm                              |    2 +-
 gnu/packages/libreoffice.scm                       |    4 +-
 gnu/packages/libusb.scm                            |    4 +-
 gnu/packages/linux.scm                             |  106 +-
 gnu/packages/lsof.scm                              |   10 +-
 gnu/packages/lua.scm                               |    4 +-
 gnu/packages/mail.scm                              |   12 +-
 gnu/packages/maths.scm                             |  103 +-
 gnu/packages/maven.scm                             |  142 +-
 gnu/packages/mes.scm                               |   10 +-
 gnu/packages/messaging.scm                         |   91 +-
 gnu/packages/monitoring.scm                        |    1 +
 gnu/packages/music.scm                             |  169 +-
 gnu/packages/networking.scm                        |   34 +-
 gnu/packages/ntp.scm                               |    2 +-
 gnu/packages/opencl.scm                            |   62 +-
 gnu/packages/package-management.scm                |   43 +-
 .../alsa-lib-add-environment-variable.patch        |  110 -
 gnu/packages/patches/bind-CVE-2018-5738.patch      |  100 -
 .../patches/emacs-browse-at-remote-cgit-gnu.patch  |   59 -
 gnu/packages/patches/file-CVE-2017-1000249.patch   |   27 -
 gnu/packages/patches/fltk-shared-lib-defines.patch |   51 -
 gnu/packages/patches/fltk-xfont-on-demand.patch    |   45 -
 .../patches/ghostscript-CVE-2018-10194.patch       |   52 +
 ...icedtea-6-hotspot-gcc-segfault-workaround.patch |   42 +
 ...icedtea-7-hotspot-gcc-segfault-workaround.patch |   45 +
 gnu/packages/patches/jamvm-arm.patch               | 1313 +++
 ...-0.25.1-mtime-0.patch => libgit2-mtime-0.patch} |    0
 .../mesa-wayland-egl-symbols-check-mips.patch      |   15 -
 gnu/packages/patches/meson-for-build-rpath.patch   |    7 +-
 .../patches/monero-use-system-miniupnpc.patch      |  111 +
 .../openbabel-fix-crash-on-nwchem-output.patch     |   34 +
 gnu/packages/patches/openblas-fix-tests-i686.patch |   35 +
 gnu/packages/patches/openscenegraph-ffmpeg3.patch  |  156 -
 .../patches/python-cairocffi-dlopen-path.patch     |   10 +
 gnu/packages/patches/qtoctave-qt-5.11-fix.patch    |   26 +
 .../patches/rust-bootstrap-stage0-test.patch       |   55 +
 gnu/packages/patches/rust-coresimd-doctest.patch   |   21 +
 .../patches/sddm-fix-build-with-qt-5.11-1024.patch |   28 -
 gnu/packages/patches/syncthing-fix-crash.patch     |   72 +
 .../patches/twinkle-include-qregexpvalidator.patch |  123 +
 gnu/packages/patches/xapian-revert-5489fb2f8.patch |   23 +
 .../patches/xf86-video-savage-xorg-compat.patch    |   33 +
 .../patches/xf86-video-sis-xorg-compat.patch       |   18 +
 gnu/packages/patches/xorg-server-rotate-fb.patch   |   35 +
 .../zathura-pdf-mupdf-link-to-jpeg-libraries.patch |   55 +
 .../zathura-plugindir-environment-variable.patch   |   11 +-
 .../patches/zstd-fix-stdin-list-test.patch         |   30 +
 .../patches/zstd-fix-stdin-list-without-tty.patch  |   67 +
 gnu/packages/pdf.scm                               |  162 +-
 gnu/packages/photo.scm                             |   22 +-
 gnu/packages/php.scm                               |   14 +-
 gnu/packages/python-crypto.scm                     |   86 +-
 gnu/packages/python.scm                            |  110 +-
 gnu/packages/re2c.scm                              |    4 +-
 gnu/packages/regex.scm                             |    4 +-
 gnu/packages/ruby.scm                              |    3 +-
 gnu/packages/rust.scm                              |  207 +-
 gnu/packages/samba.scm                             |   22 +-
 gnu/packages/sdl.scm                               |    4 +-
 gnu/packages/search.scm                            |    7 +-
 gnu/packages/statistics.scm                        |   20 +
 gnu/packages/stb.scm                               |  103 +
 gnu/packages/sync.scm                              |   51 +
 gnu/packages/syncthing.scm                         |    2 +
 gnu/packages/telephony.scm                         |    2 +
 gnu/packages/textutils.scm                         |   84 +-
 gnu/packages/tls.scm                               |    6 +-
 gnu/packages/tor.scm                               |    6 +-
 gnu/packages/upnp.scm                              |   46 +
 gnu/packages/version-control.scm                   |    6 +-
 gnu/packages/video.scm                             |   69 +-
 gnu/packages/vulkan.scm                            |   66 +-
 gnu/packages/web-browsers.scm                      |   68 +
 gnu/packages/web.scm                               |   28 +-
 gnu/packages/wget.scm                              |    5 +-
 gnu/packages/wine.scm                              |    6 +-
 gnu/packages/xdisorg.scm                           |    1 +
 gnu/packages/xfce.scm                              |    4 +-
 gnu/packages/xorg.scm                              |  124 +-
 gnu/services/base.scm                              |    9 +-
 gnu/services/cuirass.scm                           |   12 +-
 gnu/services/herd.scm                              |    3 +
 gnu/services/mcron.scm                             |   76 +-
 gnu/services/monitoring.scm                        |   38 +-
 gnu/services/shepherd.scm                          |   23 +-
 gnu/services/ssh.scm                               |    2 +-
 gnu/services/virtualization.scm                    |    1 +
 gnu/system/examples/bare-bones.tmpl                |    5 +-
 gnu/system/examples/desktop.tmpl                   |    8 +-
 gnu/system/install.scm                             |    7 +
 gnu/system/shadow.scm                              |   16 +-
 gnu/tests/base.scm                                 |   24 +
 gnu/tests/monitoring.scm                           |   97 +
 guix/build-system/guile.scm                        |  202 +
 guix/build-system/meson.scm                        |    3 +-
 guix/build/ant-build-system.scm                    |   98 +-
 guix/build/go-build-system.scm                     |   38 +-
 guix/build/guile-build-system.scm                  |  153 +
 guix/build/haskell-build-system.scm                |    5 +-
 guix/build/java-utils.scm                          |    2 +-
 guix/build/meson-build-system.scm                  |   14 +-
 guix/build/profiles.scm                            |    2 +-
 guix/build/ruby-build-system.scm                   |  108 +-
 guix/build/syscalls.scm                            |   17 +
 guix/gexp.scm                                      |  155 +-
 guix/git.scm                                       |   26 +-
 guix/gnu-maintenance.scm                           |   26 +-
 guix/hash.scm                                      |    7 +-
 guix/import/cabal.scm                              |   70 +-
 guix/import/elpa.scm                               |    4 +-
 guix/import/gem.scm                                |   48 +-
 guix/import/opam.scm                               |  193 +
 guix/import/pypi.scm                               |   10 +-
 guix/inferior.scm                                  |  197 +
 guix/packages.scm                                  |    3 +
 guix/profiles.scm                                  |   58 +-
 guix/scripts/container.scm                         |    3 +-
 guix/scripts/environment.scm                       |  210 +-
 guix/scripts/import.scm                            |    5 +-
 guix/scripts/import/gem.scm                        |   27 +-
 guix/scripts/import/{gem.scm => opam.scm}          |   18 +-
 guix/scripts/pack.scm                              |    6 +-
 guix/scripts/package.scm                           |    2 +-
 guix/scripts/pull.scm                              |  140 +-
 guix/scripts/repl.scm                              |  199 +
 guix/scripts/size.scm                              |   11 +-
 guix/scripts/substitute.scm                        |    3 +-
 guix/scripts/system.scm                            |   14 +-
 guix/scripts/weather.scm                           |    3 +-
 guix/self.scm                                      |   71 +-
 guix/serialization.scm                             |  140 +-
 guix/store.scm                                     |  125 +-
 guix/store/database.scm                            |   10 +-
 guix/store/deduplication.scm                       |   93 +-
 guix/ui.scm                                        |   31 +-
 guix/utils.scm                                     |   40 +-
 po/guix/fr.po                                      |    4 +-
 srfi/srfi-64.scm                                   |   41 -
 srfi/srfi-64.upstream.scm                          | 1040 ---
 tests/gem.scm                                      |  108 +-
 tests/gexp.scm                                     |   87 +-
 tests/guix-pack.sh                                 |    5 +
 tests/guix-package.sh                              |   12 +-
 tests/hackage.scm                                  |   71 +
 tests/hash.scm                                     |    4 +-
 tests/inferior.scm                                 |   69 +
 tests/nar.scm                                      |   62 +-
 tests/opam.scm                                     |  118 +
 tests/pypi.scm                                     |    6 +-
 tests/store-database.scm                           |    7 +-
 tests/store-deduplication.scm                      |    4 +
 tests/store.scm                                    |   46 +
 tests/syscalls.scm                                 |   13 +
 237 files changed, 11489 insertions(+), 20660 deletions(-)

diff --cc gnu/local.mk
index 45a7f06,ea906b8..651aafb
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -584,7 -586,7 +586,6 @@@ dist_patch_DATA =                                  
        
    %D%/packages/patches/bash-completion-directories.patch      \
    %D%/packages/patches/bazaar-CVE-2017-14176.patch            \
    %D%/packages/patches/beignet-correct-file-names.patch               \
-   %D%/packages/patches/bind-CVE-2018-5738.patch                       \
 -  %D%/packages/patches/binutils-aarch64-symbol-relocation.patch       \
    %D%/packages/patches/binutils-loongson-workaround.patch     \
    %D%/packages/patches/blast+-fix-makefile.patch              \
    %D%/packages/patches/boost-fix-icu-build.patch              \
diff --cc guix/build/meson-build-system.scm
index 6dac007,e4aae82..9724764
--- a/guix/build/meson-build-system.scm
+++ b/guix/build/meson-build-system.scm
@@@ -79,12 -75,12 +76,11 @@@
                "1"))
    (if tests?
        (invoke "ninja" test-target)
 -      (begin
 -        (format #t "test suite not run~%")
 -        #t)))
 +      (format #t "test suite not run~%"))
 +  #t)
  
  (define* (install #:rest args)
-   (invoke "ninja" "install")
-   #t)
+   (invoke "ninja" "install"))
  
  (define* (fix-runpath #:key (elf-directories '("lib" "lib64" "libexec"
                                                 "bin" "sbin"))



reply via email to

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