[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/94: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/94: Merge branch 'master' into core-updates |
|
Date: |
Thu, 5 Dec 2019 12:15:25 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 9d5aa009062a49bd035ae33e37f6562526e7d38c
Merge: 60bd56c 2c2fc24
Author: Marius Bakke <address@hidden>
Date: Thu Dec 5 17:57:35 2019 +0100
Merge branch 'master' into core-updates
.dir-locals.el | 2 +
Makefile.am | 2 +
build-aux/hydra/gnu-system.scm | 36 +-
config-daemon.ac | 3 +-
doc/build.scm | 1 +
doc/guix-cookbook.texi | 203 +-
doc/guix.texi | 221 +-
etc/completion/fish/guix.fish | 28 +-
etc/completion/zsh/_guix | 8 +-
etc/guix-install.sh | 1 +
etc/news.scm | 4 +-
gnu/build/file-systems.scm | 6 +-
gnu/build/linux-boot.scm | 165 +-
gnu/build/vm.scm | 7 +-
gnu/ci.scm | 22 +-
gnu/local.mk | 47 +-
gnu/machine/ssh.scm | 9 +-
gnu/packages/admin.scm | 259 +-
gnu/packages/agda.scm | 9 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/android.scm | 11 +-
gnu/packages/assembly.scm | 2 +-
gnu/packages/astronomy.scm | 8 +-
gnu/packages/audio.scm | 144 +-
gnu/packages/aux-files/emacs/guix-emacs.el | 97 +-
gnu/packages/backup.scm | 4 +-
gnu/packages/base.scm | 26 +-
gnu/packages/benchmark.scm | 1 +
gnu/packages/bioconductor.scm | 221 +-
gnu/packages/bioinformatics.scm | 82 +-
gnu/packages/boost.scm | 17 +
gnu/packages/build-tools.scm | 4 +-
gnu/packages/busybox.scm | 4 +-
gnu/packages/c.scm | 134 +-
gnu/packages/calcurse.scm | 4 +-
gnu/packages/calendar.scm | 4 +-
gnu/packages/cdrom.scm | 14 +-
gnu/packages/cedille.scm | 2 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/check.scm | 10 +-
gnu/packages/chemistry.scm | 11 +-
gnu/packages/chromium.scm | 16 +-
gnu/packages/cinnamon.scm | 13 +-
gnu/packages/code.scm | 32 +-
gnu/packages/compression.scm | 58 +-
gnu/packages/coq.scm | 11 +-
gnu/packages/cpp.scm | 43 +-
gnu/packages/cran.scm | 383 +-
gnu/packages/crypto.scm | 7 +-
gnu/packages/cups.scm | 13 +-
gnu/packages/databases.scm | 148 +-
gnu/packages/datastructures.scm | 68 +-
gnu/packages/dc.scm | 6 +-
gnu/packages/debug.scm | 2 +-
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/diffoscope.scm | 4 +-
gnu/packages/disk.scm | 6 +-
gnu/packages/display-managers.scm | 20 +-
gnu/packages/django.scm | 29 +-
gnu/packages/dns.scm | 13 +-
gnu/packages/education.scm | 31 +-
gnu/packages/efi.scm | 10 +-
gnu/packages/elixir.scm | 20 +-
gnu/packages/elm.scm | 18 +-
gnu/packages/emacs-xyz.scm | 425 +-
gnu/packages/emacs.scm | 7 +-
gnu/packages/embedded.scm | 32 +-
gnu/packages/emulators.scm | 36 +-
gnu/packages/engineering.scm | 6 +-
gnu/packages/erlang.scm | 2 +-
gnu/packages/fabric-management.scm | 3 +-
gnu/packages/finance.scm | 17 +-
gnu/packages/flashing-tools.scm | 50 +-
gnu/packages/fonts.scm | 41 +
gnu/packages/freedesktop.scm | 18 +-
gnu/packages/games.scm | 244 +-
gnu/packages/gdb.scm | 30 +-
gnu/packages/gl.scm | 13 +-
gnu/packages/glib.scm | 29 +
gnu/packages/gnome.scm | 337 +-
gnu/packages/gnucash.scm | 11 +-
gnu/packages/gnunet.scm | 95 +-
gnu/packages/gnupg.scm | 14 +-
gnu/packages/gnuzilla.scm | 38 +-
gnu/packages/graph.scm | 5 +-
gnu/packages/graphics.scm | 14 +-
gnu/packages/gstreamer.scm | 41 +-
gnu/packages/gtk.scm | 47 +-
gnu/packages/guile-xyz.scm | 96 +-
gnu/packages/guile.scm | 46 +-
gnu/packages/haskell-apps.scm | 55 +-
gnu/packages/haskell-check.scm | 195 +-
gnu/packages/haskell-crypto.scm | 36 +-
gnu/packages/haskell-web.scm | 128 +-
gnu/packages/haskell-xyz.scm | 2642 +++++--
gnu/packages/haskell.scm | 2 +-
gnu/packages/idris.scm | 9 +-
gnu/packages/image-processing.scm | 6 +-
gnu/packages/image-viewers.scm | 5 +-
gnu/packages/image.scm | 98 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/java.scm | 97 +-
gnu/packages/javascript.scm | 48 +
gnu/packages/jupyter.scm | 3 +-
gnu/packages/kde-frameworks.scm | 557 +-
gnu/packages/kde-plasma.scm | 18 +-
gnu/packages/kde.scm | 110 +-
gnu/packages/kodi.scm | 3 +-
gnu/packages/less.scm | 16 +-
gnu/packages/libreoffice.scm | 2 +-
gnu/packages/libusb.scm | 40 +-
gnu/packages/linux.scm | 72 +-
gnu/packages/{lisp.scm => lisp-xyz.scm} | 944 +--
gnu/packages/lisp.scm | 7384 +-------------------
gnu/packages/llvm.scm | 90 +
gnu/packages/lsof.scm | 9 +-
gnu/packages/machine-learning.scm | 3 +-
gnu/packages/mail.scm | 35 +-
gnu/packages/man.scm | 4 +-
gnu/packages/markup.scm | 26 +-
gnu/packages/mastodon.scm | 18 +-
gnu/packages/maths.scm | 176 +-
gnu/packages/maven.scm | 5 +-
gnu/packages/mes.scm | 4 +-
gnu/packages/messaging.scm | 89 +-
gnu/packages/microcom.scm | 12 +-
gnu/packages/mpd.scm | 34 +-
gnu/packages/mpi.scm | 23 +-
gnu/packages/music.scm | 115 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/ncdu.scm | 4 +-
gnu/packages/networking.scm | 165 +-
gnu/packages/nss.scm | 10 +-
gnu/packages/ocaml.scm | 304 +-
gnu/packages/parallel.scm | 12 +-
gnu/packages/password-utils.scm | 39 +-
.../patches/elm-compiler-relax-glsl-bound.patch | 19 -
gnu/packages/patches/fcgi-2.4.0-gcc44-fixes.patch | 14 -
gnu/packages/patches/fcgi-2.4.0-poll.patch | 89 -
.../patches/ghc-diff-swap-cover-args.patch | 20 +
.../patches/ghc-haddock-api-fix-haddock.patch | 54 +
.../patches/ghc-haddock-library-unbundle.patch | 86 -
gnu/packages/patches/ghc-hpack-fix-tests.patch | 193 +
.../patches/ghc-microlens-aeson-fix-tests.patch | 27 +
gnu/packages/patches/ghc-monad-par-fix-tests.patch | 45 +
.../patches/ghc-pandoc-fix-html-tests.patch | 92 +
.../patches/ghc-pandoc-fix-latex-test.patch | 31 +
.../patches/gstreamer-buffer-reset-offset.patch | 59 -
gnu/packages/patches/handbrake-opt-in-nvenc.patch | 14 -
gnu/packages/patches/hexchat-crash-exit.patch | 31 +
gnu/packages/patches/icecat-gnuzilla-fixes.patch | 546 --
gnu/packages/patches/icecat-makeicecat.patch | 10 +-
.../patches/kinit-kdeinit-extra_libs.patch | 4 +-
gnu/packages/patches/kpmcore-fix-tests.patch | 30 +
.../patches/kpmcore-remove-broken-test.patch | 139 +
.../patches/libjpeg-turbo-CVE-2019-2201.patch | 31 +
gnu/packages/patches/libseccomp-open-aarch64.patch | 27 +
.../patches/mesa-timespec-test-32bit.patch | 17 +
.../patches/minisat-friend-declaration.patch | 25 +
gnu/packages/patches/minisat-install.patch | 19 +
.../patches/ocaml-piqilib-Update-base64.patch | 46 -
...priority.patch => openmpi-mtl-priorities.patch} | 14 +
gnu/packages/patches/orc-typedef-enum.patch | 17 +
gnu/packages/patches/pam-mount-luks2-support.patch | 51 +
.../patches/psm-disable-memory-stats.patch | 62 +
gnu/packages/patches/psm-repro.patch | 42 +-
.../patches/pugixml-versioned-libdir.patch | 61 -
gnu/packages/patches/pyqt-unbundled-qt.patch | 19 +
gnu/packages/patches/python-3.8-fix-tests.patch | 42 +
gnu/packages/patches/python-3.8-search-paths.patch | 17 +
gnu/packages/patches/qtbase-old-kernel.patch | 25 -
.../patches/retroarch-disable-online-updater.patch | 41 +
gnu/packages/patches/sdl2-mesa-compat.patch | 21 +
.../patches/thermald-make-int-max32-visible.patch | 24 -
gnu/packages/patches/ucx-tcp-iface-ioctl.patch | 109 +
gnu/packages/patches/xinetd-CVE-2013-4342.patch | 36 -
gnu/packages/patches/xinetd-fix-fd-leak.patch | 26 -
gnu/packages/patches/xsane-fix-memory-leak.patch | 34 +
gnu/packages/patches/xsane-fix-pdf-floats.patch | 85 +
.../patches/xsane-fix-snprintf-buffer-length.patch | 72 +
gnu/packages/patches/xsane-support-ipv6.patch | 153 +
.../patches/xsane-tighten-default-umask.patch | 36 +
gnu/packages/pdf.scm | 16 +-
gnu/packages/perl-check.scm | 4 +-
gnu/packages/perl-compression.scm | 17 +-
gnu/packages/perl.scm | 53 +-
gnu/packages/php.scm | 93 +-
gnu/packages/plotutils.scm | 4 +-
gnu/packages/printers.scm | 84 +-
gnu/packages/protobuf.scm | 2 +-
gnu/packages/pulseaudio.scm | 19 +-
gnu/packages/python-crypto.scm | 47 +-
gnu/packages/python-science.scm | 287 +
gnu/packages/python-xyz.scm | 435 +-
gnu/packages/python.scm | 26 +
gnu/packages/qt.scm | 179 +-
gnu/packages/ruby.scm | 60 +-
gnu/packages/rust.scm | 33 +-
gnu/packages/scanner.scm | 89 +
gnu/packages/sdl.scm | 2 +
gnu/packages/search.scm | 9 +-
gnu/packages/security-token.scm | 4 +-
gnu/packages/serialization.scm | 40 +-
gnu/packages/shellutils.scm | 23 +
gnu/packages/sml.scm | 7 +-
gnu/packages/sphinx.scm | 4 +-
gnu/packages/spice.scm | 4 +-
gnu/packages/ssh.scm | 42 +-
gnu/packages/statistics.scm | 153 +-
gnu/packages/sync.scm | 5 +-
gnu/packages/telephony.scm | 85 +-
gnu/packages/time.scm | 4 +-
gnu/packages/tls.scm | 61 +-
gnu/packages/tmux.scm | 4 +-
gnu/packages/version-control.scm | 4 +-
gnu/packages/video.scm | 83 +-
gnu/packages/vim.scm | 2 +-
gnu/packages/virtualization.scm | 45 +-
gnu/packages/vpn.scm | 4 +-
gnu/packages/vulkan.scm | 30 +-
gnu/packages/web-browsers.scm | 1 +
gnu/packages/web.scm | 140 +-
gnu/packages/wm.scm | 155 +-
gnu/packages/xdisorg.scm | 55 +-
gnu/packages/xfce.scm | 4 +-
gnu/packages/xiph.scm | 4 +-
gnu/packages/xml.scm | 12 +-
gnu/packages/xorg.scm | 42 +-
gnu/services/desktop.scm | 77 +
gnu/services/pam-mount.scm | 111 +
gnu/services/ssh.scm | 6 +-
gnu/services/sysctl.scm | 3 +-
gnu/services/web.scm | 4 +-
gnu/system/install.scm | 11 +-
gnu/system/vm.scm | 2 +-
gnu/tests/install.scm | 2 +-
guix/build-system/minify.scm | 4 +-
guix/build-system/qt.scm | 295 +
guix/build/ant-build-system.scm | 15 +-
guix/build/cargo-build-system.scm | 15 -
guix/build/cargo-utils.scm | 16 +-
guix/build/compile.scm | 49 +-
guix/build/download.scm | 13 +-
guix/build/emacs-build-system.scm | 81 +-
guix/build/qt-build-system.scm | 109 +
guix/build/qt-utils.scm | 4 +-
guix/build/syscalls.scm | 4 +-
guix/gexp.scm | 7 +
guix/import/hackage.scm | 6 +-
guix/import/opam.scm | 16 +-
guix/import/texlive.scm | 8 +-
guix/lint.scm | 6 +-
guix/profiles.scm | 5 +
guix/scripts/archive.scm | 2 +-
guix/scripts/build.scm | 36 +-
guix/scripts/copy.scm | 2 +-
guix/scripts/deploy.scm | 6 +-
guix/scripts/environment.scm | 2 +-
guix/scripts/offload.scm | 32 +-
guix/scripts/pack.scm | 40 +-
guix/scripts/package.scm | 58 +-
guix/scripts/pull.scm | 84 +-
guix/scripts/substitute.scm | 206 +-
guix/scripts/system.scm | 2 +-
guix/scripts/time-machine.scm | 2 +-
guix/ssh.scm | 69 +-
guix/store.scm | 11 +-
guix/ui.scm | 74 +-
guix/utils.scm | 12 +-
nix/boost/format/exceptions.hpp | 4 +-
nix/libstore/gc.cc | 22 +-
nix/libutil/util.cc | 19 +
nix/nix-daemon/guix-daemon.cc | 7 +-
tests/build-utils.scm | 25 +-
tests/gexp.scm | 8 +
tests/guix-build.sh | 13 +
tests/guix-environment.sh | 23 +
tests/guix-pack.sh | 15 +
tests/guix-package.sh | 17 +-
tests/lzlib.scm | 2 +-
tests/profiles.scm | 5 +
tests/publish.scm | 1 +
tests/substitute.scm | 6 +-
284 files changed, 10983 insertions(+), 13974 deletions(-)
diff --cc gnu/local.mk
index e97a508,06eb76c..fef7fd1
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -828,11 -827,9 +830,9 @@@ dist_patch_DATA =
%D%/packages/patches/fasthenry-spSolve.patch \
%D%/packages/patches/fasthenry-spFactor.patch \
%D%/packages/patches/fbreader-curl-7.62.patch \
- %D%/packages/patches/fcgi-2.4.0-gcc44-fixes.patch \
- %D%/packages/patches/fcgi-2.4.0-poll.patch \
%D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \
%D%/packages/patches/fifo-map-remove-catch.hpp.patch \
- %D%/packages/patches/file-CVE-2018-10360.patch \
+ %D%/packages/patches/file-CVE-2019-18218.patch \
%D%/packages/patches/findutils-gnulib-libio.patch \
%D%/packages/patches/findutils-localstatedir.patch \
%D%/packages/patches/findutils-makedev.patch \
@@@ -949,8 -953,6 +955,7 @@@
%D%/packages/patches/guile-relocatable.patch \
%D%/packages/patches/guile-rsvg-pkgconfig.patch \
%D%/packages/patches/guile-emacs-fix-configure.patch \
+ %D%/packages/patches/guile-sqlite3-fix-cross-compilation.patch \
- %D%/packages/patches/gstreamer-buffer-reset-offset.patch \
%D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
%D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
%D%/packages/patches/gtk2-theme-paths.patch \
diff --cc gnu/packages/guile.scm
index b552f33,6526ad2..f0317de
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -542,8 -542,14 +542,16 @@@ Guile's foreign function interface."
(base32
"1nv8j7wk6b5n4p22szyi8lv8fs31rrzxhzz16gyj8r38c1fyp9qp"))
(file-name (string-append name "-" version "-checkout"))
+ (patches
- (search-patches "guile-sqlite3-fix-cross-compilation.patch"))))
++ (search-patches "guile-sqlite3-fix-cross-compilation.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Allow builds with Guile 3.0.
+ (substitute* "configure.ac"
+ (("^GUILE_PKG.*")
+ "GUILE_PKG([3.0 2.2 2.0])\n"))
+ #t))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
diff --cc gnu/packages/linux.scm
index 3552c2e,9b80ba6..eb9aa45
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -2908,36 -2864,29 +2913,35 @@@ interface."
"/lib/crda/regulatory.bin\"")))
#t))))
#:test-target "verify"
- #:make-flags (let ((out (assoc-ref %outputs "out"))
- (regdb (assoc-ref %build-inputs "wireless-regdb")))
- (list "CC=gcc" "V=1"
-
- ;; Disable signature-checking on 'regulatory.bin'.
- ;; The reason is that this simplifies maintenance
- ;; on our side (no need to manage a distro key
- ;; pair), and we can guarantee integrity of
- ;; 'regulatory.bin' by other means anyway, such as
- ;; 'guix gc --verify'. See
- ;;
<https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb>
- ;; for a discssion.
- "USE_OPENSSL=0"
-
- (string-append "PREFIX=" out)
- (string-append "SBINDIR=" out "/sbin/")
- (string-append "UDEV_RULE_DIR="
- out "/lib/udev/rules.d")
- (string-append "LDFLAGS=-Wl,-rpath="
- out "/lib -L.")
- (string-append "REG_BIN=" regdb
- "/lib/crda/regulatory.bin")))))
+ #:make-flags (let ((out (assoc-ref %outputs "out"))
+ (regdb (assoc-ref %build-inputs "wireless-regdb"))
+ (target ,(%current-target-system)))
+ (list
+ (string-append
+ "CC=" (if target
+ (string-append target "-gcc") "gcc"))
+ "V=1"
+
+ ;; Disable signature-checking on 'regulatory.bin'.
+ ;; The reason is that this simplifies maintenance
+ ;; on our side (no need to manage a distro key
+ ;; pair), and we can guarantee integrity of
+ ;; 'regulatory.bin' by other means anyway, such as
+ ;; 'guix gc --verify'. See
+ ;;
<https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb>
+ ;; for a discssion.
+ "USE_OPENSSL=0"
+
+ (string-append "PREFIX=" out)
+ (string-append "SBINDIR=" out "/sbin/")
+ (string-append "UDEV_RULE_DIR="
+ out "/lib/udev/rules.d")
+ (string-append "LDFLAGS=-Wl,-rpath="
+ out "/lib -L.")
+ (string-append "REG_BIN=" regdb
+ "/lib/crda/regulatory.bin")
+ "all_noverify"))))
(native-inputs `(("pkg-config" ,pkg-config)
- ("python" ,python-2)
("wireless-regdb" ,wireless-regdb)))
(inputs `(("libnl" ,libnl)))
(home-page
diff --cc gnu/packages/telephony.scm
index 21f00f5,5b6c578..519677d
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@@ -873,8 -907,15 +894,8 @@@ This package provides a library common
(add-after 'unpack 'change-directory
(lambda _
(chdir "client-gnome")
- #t))
- (add-after 'install 'wrap
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (path (string-append (assoc-ref inputs "sqlite") "/lib")))
- (wrap-program (string-append out "/bin/jami-gnome")
- `("LD_LIBRARY_PATH" ":" prefix (,path))))
#t)))))
- (synopsis "Distributed multimedia communications platform")
+ (synopsis "Distributed, privacy-respecting communication program")
(description "Jami (formerly GNU Ring) is a secure and distributed voice,
video and chat communication platform that requires no centralized server and
leaves the power of privacy in the hands of the user. It supports the SIP and
- 16/94: gnu: libbsd: Update to 0.10.0., (continued)
- 16/94: gnu: libbsd: Update to 0.10.0., guix-commits, 2019/12/05
- 21/94: gnu: perl: Update to 5.30.1., guix-commits, 2019/12/05
- 29/94: gnu: GnuTLS: Update to 3.6.11.1., guix-commits, 2019/12/05
- 48/94: gnu: libfontenc: Do not build static libraries., guix-commits, 2019/12/05
- 43/94: gexp: Unconditionally include (system base target) in 'compiled-modules'., guix-commits, 2019/12/05
- 67/94: gnu: libxvmc: Do not build static libraries., guix-commits, 2019/12/05
- 68/94: gnu: libxxf86vm: Do not build static libraries., guix-commits, 2019/12/05
- 77/94: gnu: xcb-util-keysyms: Do not build static libraries., guix-commits, 2019/12/05
- 83/94: gnu: dbus: Do not build static libraries., guix-commits, 2019/12/05
- 33/94: gnu: swig: Update to 4.0.1., guix-commits, 2019/12/05
- 01/94: Merge branch 'master' into core-updates,
guix-commits <=
- 17/94: gnu: jemalloc: Update to 5.2.1., guix-commits, 2019/12/05
- 23/94: gnu: readline: Update to 8.0.1., guix-commits, 2019/12/05
- 27/94: gnu: findutils: Update to 4.7.0., guix-commits, 2019/12/05
- 40/94: gnu: python2-fonttools: Update to 3.44.0., guix-commits, 2019/12/05
- 65/94: gnu: libxfont: Do not build static libraries., guix-commits, 2019/12/05
- 59/94: gnu: libxrender: Do not build static libraries., guix-commits, 2019/12/05
- 60/94: gnu: libxtst: Do not build static libraries., guix-commits, 2019/12/05
- 92/94: gnu: SELinux: Update to 3.0., guix-commits, 2019/12/05
- 94/94: gnu: graphviz: Update to 2.42.3., guix-commits, 2019/12/05
- 91/94: gnu: sqlite: Move static library to separate output., guix-commits, 2019/12/05