01/01: Merge branch 'staging' into core-updates

[guix-commits]

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

commit 12d8adbfc0f32a1905cfc3aaa2cfff68ee46a333
Merge: bd0f5f2 db0e9fe
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Jan 23 23:11:11 2020 +0100

    Merge branch 'staging' into core-updates

 gnu/installer/newt/user.scm                        |   4 +-
 gnu/local.mk                                       |   7 +-
 gnu/packages/backup.scm                            |   4 +-
 gnu/packages/crypto.scm                            |   7 +-
 gnu/packages/databases.scm                         |   8 +-
 gnu/packages/disk.scm                              |   5 +-
 gnu/packages/dns.scm                               |  15 ++-
 gnu/packages/emacs-xyz.scm                         |   6 +-
 gnu/packages/engineering.scm                       |   7 +-
 gnu/packages/fonts.scm                             |  98 ++++++++---------
 gnu/packages/fpga.scm                              |  21 ++--
 gnu/packages/freedesktop.scm                       |  10 +-
 gnu/packages/gimp.scm                              |  10 +-
 gnu/packages/gnome.scm                             |  14 ++-
 gnu/packages/gnunet.scm                            |  36 ++++--
 gnu/packages/golang.scm                            |   7 +-
 gnu/packages/gsasl.scm                             |  31 +++---
 gnu/packages/gtk.scm                               |  74 +++++++++++--
 gnu/packages/guile-xyz.scm                         | 100 ++++++++++-------
 gnu/packages/guile.scm                             |   8 ++
 gnu/packages/haskell-xyz.scm                       |  68 ++++++++++++
 gnu/packages/mail.scm                              |   8 +-
 gnu/packages/maths.scm                             |   6 +-
 gnu/packages/mes.scm                               |  21 ++--
 gnu/packages/ocaml.scm                             |  42 ++++++-
 gnu/packages/password-utils.scm                    |  84 +++++++-------
 .../evolution-data-server-libical-compat.patch     |  36 ++++++
 .../patches/libmemcached-build-with-gcc7.patch     |  28 +++++
 gnu/packages/patches/libvnc-CVE-2018-20750.patch   |  44 ++++++++
 gnu/packages/patches/libvnc-CVE-2019-15681.patch   |  23 ++++
 gnu/packages/patches/mes-remove-store-name.patch   | 121 ---------------------
 gnu/packages/patches/udiskie-no-appindicator.patch |  72 ++++++------
 gnu/packages/perl.scm                              |  34 +++---
 gnu/packages/pulseaudio.scm                        |  26 +++--
 gnu/packages/simulation.scm                        |  68 ++++++------
 gnu/packages/text-editors.scm                      |  43 ++++++++
 gnu/packages/virtualization.scm                    |   8 +-
 gnu/packages/{tigervnc.scm => vnc.scm}             |  67 +++++++++---
 gnu/packages/web.scm                               |   5 +-
 gnu/packages/xdisorg.scm                           |  41 +++----
 gnu/services/dns.scm                               |   1 +
 gnu/tests.scm                                      |   2 +-
 guix/build-system/ocaml.scm                        |  28 ++---
 43 files changed, 833 insertions(+), 515 deletions(-)

diff --cc gnu/packages/guile.scm
index 2231046,289158e..cb88308
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -284,8 -295,15 +284,16 @@@ without requiring the source code to b
                                    version ".tar.xz"))
                (sha256
                 (base32
 -                "0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9"))))
 +                "0x8ca6q1qdmk29lh12gj6ngvgn7kp79w42rxfgwrpxm9jmjqs4y9"))
 +              (patches (search-patches "guile-2.2-skip-oom-test.patch"))))
+     (arguments
+      (substitute-keyword-arguments (package-arguments guile-2.2)
+        ;; XXX: On ARMv7, work around <https://bugs.gnu.org/39208> by disabling
+        ;; JIT.
+        ((#:configure-flags flags '())
+         (if (target-arm32?)
+             `(cons "--disable-jit" ,flags)
+             flags))))
      (native-search-paths
       (list (search-path-specification
              (variable "GUILE_LOAD_PATH")
diff --cc gnu/packages/vnc.scm
index 903d8cc,e1cba08..2b5adb8
--- a/gnu/packages/vnc.scm
+++ b/gnu/packages/vnc.scm
@@@ -232,3 -237,37 +237,37 @@@ applications.  It also provides extensi
  and TLS encryption.  This package installs the VNC server, a program that will
  enable users with VNC clients to log into a graphical session on the machine
  where the server is installed.")))
+ 
+ (define-public libvnc
+   (package
+     (name "libvnc")
+     (version "0.9.12")
+     (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/LibVNC/libvncserver.git";)
+              (commit (string-append "LibVNCServer-" version))))
+        (file-name (git-file-name name version))
+        (sha256
+         (base32 "1226hb179l914919f5nm2mlf8rhaarqbf48aa649p4rwmghyx9vm"))
+        (patches (search-patches "libvnc-CVE-2018-20750.patch"
+                                 "libvnc-CVE-2019-15681.patch"))))
+     (build-system cmake-build-system)
+     (native-inputs
+      `(("pkg-config" ,pkg-config)))
+     (inputs
+      `(("gnutls" ,gnutls)
+        ("libgcrypt" ,libgcrypt)
 -       ("libjpeg" ,libjpeg)
++       ("libjpeg" ,libjpeg-turbo)
+        ("libpng" ,libpng)
+        ("lzo" ,lzo)
+        ("sdl2" ,sdl2)))
+     (home-page "https://libvnc.github.io/";)
+     (synopsis "Cross-platform C libraries for implementing VNC server or
+ client")
+     (description "This package provides @code{LibVNCServer} and
+ @code{LibVNCClient}.  These are cross-platform C libraries that allow you to
+ easily implement VNC server or client functionality in your program.")
+     (license ;; GPL for programs, FDL for documentation
+      (list license:gpl2+ license:fdl1.2+))))