01/02: Merge branch 'master' into core-updates

[guix-commits]

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

commit 50e6c1bf2ef2f006baa8cac80dfbb12ca2ba6d64
Merge: a8cb1e7 afc5791
Author: Marius Bakke <address@hidden>
AuthorDate: Sat May 2 17:31:28 2020 +0200

    Merge branch 'master' into core-updates

 doc/build.scm                                      |  10 +-
 doc/guix.texi                                      |  30 +-
 gnu/build/file-systems.scm                         |  61 +++-
 gnu/build/linux-boot.scm                           |  11 +-
 gnu/local.mk                                       |   5 +-
 gnu/packages/audio.scm                             |  26 ++
 gnu/packages/check.scm                             |   9 +-
 gnu/packages/compression.scm                       |   4 +-
 gnu/packages/debian.scm                            |  38 +++
 gnu/packages/disk.scm                              |  61 +++-
 gnu/packages/dns.scm                               |  21 +-
 gnu/packages/education.scm                         |  18 +-
 gnu/packages/emacs-xyz.scm                         | 176 +++++-----
 gnu/packages/emulators.scm                         |   4 +-
 gnu/packages/finance.scm                           |  25 +-
 gnu/packages/games.scm                             |   8 +-
 gnu/packages/gl.scm                                |  47 +--
 gnu/packages/gnome.scm                             |   4 +-
 gnu/packages/guile-xyz.scm                         |  29 +-
 gnu/packages/hardware.scm                          | 118 +++++++
 gnu/packages/haskell-apps.scm                      |   4 +-
 gnu/packages/jami.scm                              | 361 +++++++++++++++++++++
 gnu/packages/linux.scm                             |  31 ++
 gnu/packages/llvm.scm                              |  11 +-
 gnu/packages/lxde.scm                              |  34 +-
 gnu/packages/mail.scm                              |  10 +-
 gnu/packages/music.scm                             | 132 ++++----
 gnu/packages/networking.scm                        |  45 ++-
 .../extempore-unbundle-external-dependencies.patch | 140 ++++++++
 gnu/packages/patches/llvm-for-extempore.patch      | 118 -------
 .../patches/vlc-fix-test_libvlc_slaves.patch       |  35 --
 gnu/packages/rdf.scm                               |   4 +-
 gnu/packages/telephony.scm                         | 286 +---------------
 gnu/packages/text-editors.scm                      |   4 +-
 gnu/packages/upnp.scm                              |  18 +-
 gnu/packages/video.scm                             |  24 +-
 gnu/packages/web-browsers.scm                      |   4 +-
 gnu/services/base.scm                              |  18 +-
 gnu/services/dns.scm                               |   7 +-
 gnu/system.scm                                     |  17 +-
 gnu/system/install.scm                             |   6 -
 gnu/system/linux-initrd.scm                        |   1 +
 guix/profiles.scm                                  |   1 +
 43 files changed, 1274 insertions(+), 742 deletions(-)

diff --cc gnu/packages/linux.scm
index 0f424ca,dd945aa..8b8945f
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -4664,8 -4600,39 +4664,39 @@@ disks and SD cards.  This package provi
                 (base32
                  "0z9c0y3qq75iyqknl5k0v7v46l8c3pcifpqb0yqalrs24blkm7dk"))))
      (inputs
 -     `(("libuuid" ,util-linux)))))
 +     `(("libuuid" ,util-linux "lib")))))
  
+ (define-public f2fs-tools/static
+   (static-package
+    (package
+      (inherit f2fs-tools)
+      (name "f2fs-tools-static")
+      (arguments
+      `(#:configure-flags
+        (let ((libuuid-static (assoc-ref %build-inputs "libuuid:static"))
+              (libuuid (assoc-ref %build-inputs "libuuid")))
+          (list
+           (string-append "libuuid_CFLAGS=-I" libuuid "/include")
+           (string-append "libuuid_LIBS=-L" libuuid-static "/lib -luuid")
+           (string-append "libblkid_CFLAGS=-I" libuuid "/include")
+           (string-append "libblkid_LIBS=-L" libuuid-static "/lib -lblkid")))
+        #:disallowed-references (,util-linux)
+        #:phases
+        (modify-phases %standard-phases ; TODO: f2fs phases.
+          (add-after 'unpack 'make-static
+            (lambda _
+              (define (append-to-file name body)
+                (let ((file (open-file name "a")))
+                  (display body file)
+                  (close-port file)))
+              (append-to-file "mkfs/Makefile.am" "\nmkfs_f2fs_LDFLAGS = 
-all-static\n")
+              (append-to-file "fsck/Makefile.am" "\nfsck_f2fs_LDFLAGS = 
-all-static\n")
+              (append-to-file "tools/Makefile.am" "\nf2fscrypt_LDFLAGS = 
-all-static -luuid\n")
+              #t)))))
+      (inputs
+       `(("libuuid:static" ,util-linux "static")
 -        ("libuuid" ,util-linux)))))) ; for include files
++        ("libuuid" ,util-linux "lib")))))) ; for include files
+ 
  (define-public freefall
    (package
      (name "freefall")