guix-commits
[Top][All Lists]
Advanced

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

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


From: guix-commits
Subject: 01/02: Merge branch 'staging' into core-updates
Date: Mon, 3 Feb 2020 10:06:54 -0500 (EST)

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

commit 52665d2b6bd709ba46c1e364a6d6164f5f4824ff
Merge: 584d08c 0a83339
Author: Marius Bakke <address@hidden>
AuthorDate: Mon Feb 3 15:45:44 2020 +0100

    Merge branch 'staging' into core-updates

 Makefile.am                                        |    1 +
 build-aux/git-authenticate.scm                     |    6 +-
 doc/guix.texi                                      |  122 ++-
 etc/guix-install.sh                                |   10 +-
 etc/news.scm                                       |   25 +-
 gnu/bootloader/grub.scm                            |   19 +-
 gnu/bootloader/u-boot.scm                          |    7 +
 gnu/ci.scm                                         |    3 +-
 gnu/local.mk                                       |   21 +-
 gnu/packages/admin.scm                             |    4 +-
 gnu/packages/aspell.scm                            |    9 +
 gnu/packages/audio.scm                             |   67 +-
 gnu/packages/bdw-gc.scm                            |   14 +-
 gnu/packages/bioconductor.scm                      |   46 +-
 gnu/packages/bioinformatics.scm                    |   38 +-
 gnu/packages/bootloaders.scm                       |   15 +
 gnu/packages/calendar.scm                          |   21 +-
 gnu/packages/check.scm                             |    8 +-
 gnu/packages/ci.scm                                |    6 +-
 gnu/packages/commencement.scm                      |    4 -
 gnu/packages/cran.scm                              |  182 ++--
 gnu/packages/crates-io.scm                         |  124 +--
 gnu/packages/diffoscope.scm                        |    4 +-
 gnu/packages/disk.scm                              |   31 +
 gnu/packages/education.scm                         |  234 +++-
 gnu/packages/emacs-xyz.scm                         |  508 +++++++--
 gnu/packages/embedded.scm                          |   51 +-
 gnu/packages/emulators.scm                         |   65 +-
 gnu/packages/enchant.scm                           |   35 +
 gnu/packages/engineering.scm                       |    1 +
 gnu/packages/file-systems.scm                      |   61 +-
 gnu/packages/finance.scm                           |  126 ++-
 gnu/packages/firmware.scm                          |   63 ++
 gnu/packages/game-development.scm                  |   85 +-
 gnu/packages/games.scm                             |    4 +-
 gnu/packages/gdb.scm                               |   22 +-
 gnu/packages/gimp.scm                              |    1 +
 gnu/packages/gl.scm                                |    4 +-
 gnu/packages/gnome.scm                             |    8 +-
 gnu/packages/golang.scm                            |    4 +-
 gnu/packages/guile-xyz.scm                         |   32 +-
 gnu/packages/haskell-web.scm                       |   63 ++
 gnu/packages/haskell-xyz.scm                       |    2 +-
 gnu/packages/hexedit.scm                           |   42 +-
 gnu/packages/hurd.scm                              |  113 +-
 gnu/packages/imagemagick.scm                       |    5 +-
 gnu/packages/javascript.scm                        |   39 +-
 gnu/packages/kde-frameworks.scm                    |  158 +--
 gnu/packages/kde-internet.scm                      |  493 +++++++++
 gnu/packages/kde-pim.scm                           | 1117 +++++++++++++++++++
 gnu/packages/kde-plasma.scm                        |   27 +-
 gnu/packages/kde-systemtools.scm                   |  312 ++++++
 gnu/packages/kde-utils.scm                         |   16 -
 gnu/packages/kde.scm                               |   58 +-
 gnu/packages/linux.scm                             |  199 ++--
 gnu/packages/lisp-xyz.scm                          |  334 ++++++
 gnu/packages/lxqt.scm                              |    2 +-
 gnu/packages/machine-learning.scm                  |    2 +
 gnu/packages/mail.scm                              |  127 +--
 gnu/packages/maths.scm                             |   15 +-
 gnu/packages/messaging.scm                         |    8 +-
 gnu/packages/monitoring.scm                        |   40 +-
 gnu/packages/music.scm                             |  187 +++-
 gnu/packages/networking.scm                        |   10 +-
 gnu/packages/nutrition.scm                         |   18 +-
 gnu/packages/ocaml.scm                             | 1134 ++++++++++++--------
 gnu/packages/openldap.scm                          |   30 +-
 gnu/packages/password-utils.scm                    |   33 +-
 ...ert-Make-installation-properly-relocatabl.patch |   49 +
 gnu/packages/patches/akonadi-paths.patch           |   49 +
 gnu/packages/patches/akonadi-timestamps.patch      |   14 +
 .../choqok-Fix-building-under-Qt-5.13.patch        |   89 ++
 .../konversation-Fix-build-with-Qt-5.11.patch      |   24 +
 gnu/packages/patches/opensmtpd-fix-crash.patch     |   44 -
 gnu/packages/patches/qemu-CVE-2020-7039.patch      |  173 +++
 gnu/packages/patches/qemu-CVE-2020-7211.patch      |   49 +
 .../qemu-fix-documentation-build-failure.patch     |   43 +
 gnu/packages/patches/sdl-pango-api_additions.patch |  128 +++
 gnu/packages/patches/sdl-pango-blit_overflow.patch |   32 +
 .../patches/sdl-pango-fillrect_crash.patch         |   15 +
 ...x-explicit-SDLPango_CopyFTBitmapToSurface.patch |   20 +
 .../patches/sdl-pango-matrix_declarations.patch    |  131 +++
 gnu/packages/patches/sdl-pango-sans-serif.patch    |   13 +
 .../superlu-dist-fix-mpi-deprecations.patch        |   57 -
 gnu/packages/patches/t4k-common-libpng16.patch     |   26 +
 .../patches/u-boot-riscv64-fix-extlinux.patch      |   54 +
 gnu/packages/plotutils.scm                         |   14 +-
 gnu/packages/prolog.scm                            |    4 +-
 gnu/packages/python-check.scm                      |   46 +
 gnu/packages/python-compression.scm                |   14 +-
 gnu/packages/python-web.scm                        |   69 +-
 gnu/packages/python-xyz.scm                        |  169 ++-
 gnu/packages/qt.scm                                |  127 +--
 gnu/packages/rsync.scm                             |    6 +-
 gnu/packages/ruby.scm                              |   50 +-
 gnu/packages/rust-apps.scm                         |   16 +-
 gnu/packages/samba.scm                             |    4 +-
 gnu/packages/scanner.scm                           |    6 +-
 gnu/packages/scheme.scm                            |    7 +-
 gnu/packages/sdl.scm                               |   52 +-
 gnu/packages/skarnet.scm                           |   12 +-
 gnu/packages/statistics.scm                        |   65 +-
 gnu/packages/sync.scm                              |  101 +-
 gnu/packages/tbb.scm                               |    4 +-
 gnu/packages/terminals.scm                         |    7 +
 gnu/packages/texinfo.scm                           |    2 +-
 gnu/packages/text-editors.scm                      |  131 ++-
 gnu/packages/tls.scm                               |   13 +-
 gnu/packages/video.scm                             |  109 +-
 gnu/packages/vim.scm                               |   40 +-
 gnu/packages/virtualization.scm                    |   12 +-
 gnu/packages/web.scm                               |   87 +-
 gnu/packages/webkit.scm                            |    4 +-
 gnu/packages/wine.scm                              |   52 +-
 gnu/packages/xdisorg.scm                           |  104 ++
 gnu/packages/xml.scm                               |   18 +-
 gnu/services/getmail.scm                           |    2 +-
 gnu/services/linux.scm                             |  125 +++
 gnu/services/mail.scm                              |   10 +-
 gnu/services/pm.scm                                |    2 +-
 gnu/services/spice.scm                             |    2 +-
 gnu/services/virtualization.scm                    |   12 +-
 gnu/services/xorg.scm                              |    7 +-
 gnu/tests/mail.scm                                 |    5 +-
 guix/build-system/ocaml.scm                        |   20 +-
 guix/build/cargo-build-system.scm                  |    6 +-
 guix/build/compile.scm                             |    6 +-
 guix/build/qt-build-system.scm                     |   14 +-
 guix/derivations.scm                               |    7 +
 guix/licenses.scm                                  |    2 +-
 guix/scripts/archive.scm                           |   65 +-
 guix/scripts/build.scm                             |  131 +--
 guix/scripts/graph.scm                             |   27 +-
 guix/self.scm                                      |   25 +-
 guix/serialization.scm                             |   19 +-
 guix/ui.scm                                        |   11 +
 tests/services/linux.scm                           |   57 +
 137 files changed, 7553 insertions(+), 2032 deletions(-)

diff --cc gnu/local.mk
index 88ce141,125118b..1040e4d
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1248,7 -1256,12 +1255,13 @@@ dist_patch_DATA =                             
                
    %D%/packages/patches/p7zip-CVE-2017-17969.patch             \
    %D%/packages/patches/p7zip-remove-unused-code.patch         \
    %D%/packages/patches/pam-mount-luks2-support.patch          \
 +  %D%/packages/patches/pango-skip-libthai-test.patch          \
+   %D%/packages/patches/sdl-pango-api_additions.patch          \
+   %D%/packages/patches/sdl-pango-blit_overflow.patch          \
+   %D%/packages/patches/sdl-pango-fillrect_crash.patch         \
+   
%D%/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapToSurface.patch
    \
+   %D%/packages/patches/sdl-pango-matrix_declarations.patch    \
+   %D%/packages/patches/sdl-pango-sans-serif.patch             \
    %D%/packages/patches/patchutils-test-perms.patch            \
    %D%/packages/patches/patch-hurd-path-max.patch              \
    %D%/packages/patches/perl-autosplit-default-time.patch      \
@@@ -1391,9 -1408,9 +1407,8 @@@
    %D%/packages/patches/spice-fix-test-armhf.patch             \
    %D%/packages/patches/steghide-fixes.patch                   \
    %D%/packages/patches/superlu-dist-awpm-grid.patch           \
-   %D%/packages/patches/superlu-dist-fix-mpi-deprecations.patch        \
    %D%/packages/patches/superlu-dist-scotchmetis.patch         \
    %D%/packages/patches/supertux-unbundle-squirrel.patch               \
 -  %D%/packages/patches/swig-guile-gc.patch                    \
    %D%/packages/patches/swish-e-search.patch                   \
    %D%/packages/patches/swish-e-format-security.patch          \
    %D%/packages/patches/symmetrica-bruch.patch                 \
diff --cc gnu/packages/file-systems.scm
index 50afe29,3e7314b..a86ae0e
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@@ -52,8 -53,66 +53,66 @@@
    #:use-module (gnu packages readline)
    #:use-module (gnu packages sqlite)
    #:use-module (gnu packages tls)
+   #:use-module (gnu packages valgrind)
    #:use-module (gnu packages xml))
  
+ (define-public bcachefs-tools
+   (let ((commit "ab2f1ec24f5307b0cf1e3c4ad19bf350d9f54d9f")
+         (revision "0"))
+     (package
+       (name "bcachefs-tools")
+       (version (git-version "0.1" revision commit))
+       (source
+        (origin
+          (method git-fetch)
+          (uri (git-reference
+                (url "https://evilpiepirate.org/git/bcachefs-tools.git";)
+                (commit commit)))
+          (file-name (git-file-name name version))
+          (sha256
+           (base32 "10pafvaxg1lvwnqjv3a4rsi96bghbpcsgh3vhqilndi334k3b0hd"))))
+       (build-system gnu-build-system)
+       (arguments
+        `(#:make-flags
+          (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+                "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools"
+                "CC=gcc"
+                "PYTEST=pytest")
+          #:phases
+          (modify-phases %standard-phases
+            (delete 'configure))         ; no configure script
+          #:tests? #f))                  ; XXX 6 valgrind tests fail
+       (native-inputs
+        `(("pkg-config" ,pkg-config)
+ 
+          ;; For tests.
+          ("python-pytest" ,python-pytest)
+          ("valgrind" ,valgrind)))
+       (inputs
+        `(("keyutils" ,keyutils)
+          ("libaio" ,libaio)
+          ("libscrypt" ,libscrypt)
+          ("libsodium" ,libsodium)
+          ("liburcu" ,liburcu)
 -         ("util-linux" ,util-linux)     ; lib{blkid,uuid}
++         ("util-linux" ,util-linux "lib") ; lib{blkid,uuid}
+          ("lz4" ,lz4)
+          ("zlib" ,zlib)
+          ("zstd:lib" ,zstd "lib")))
+       (home-page "https://bcachefs.org/";)
+       (synopsis "Tools to create and manage bcachefs file systems")
+       (description
+        "The bcachefs-tools are command-line utilities for creating, checking,
+ and otherwise managing bcachefs file systems.
+ 
+ Bcachefs is a @acronym{CoW, copy-on-write} file system supporting native
+ encryption, compression, snapshots, and (meta)data checksums.  It can use
+ multiple block devices for replication and/or performance, similar to RAID.
+ 
+ In addition, bcachefs provides all the functionality of bcache, a block-layer
+ caching system, and lets you assign different roles to each device based on 
its
+ performance and other characteristics.")
+       (license license:gpl2+))))
+ 
  (define-public httpfs2
    (package
      (name "httpfs2")
diff --cc gnu/packages/gimp.scm
index d9d3f14,0f2eba3..af2b06a
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@@ -174,7 -174,8 +174,8 @@@ buffers."
         ("glib" ,glib)
         ("glib-networking" ,glib-networking)
         ("libtiff" ,libtiff)
+        ("libwebp" ,libwebp)
 -       ("libjpeg" ,libjpeg)
 +       ("libjpeg" ,libjpeg-turbo)
         ("atk" ,atk)
         ("gexiv2" ,gexiv2)
         ("gtk+" ,gtk+-2)
diff --cc gnu/packages/openldap.scm
index 334affc,de8239b..107b923
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@@ -4,7 -4,7 +4,8 @@@
  ;;; Copyright © 2016 Leo Famulari <address@hidden>
  ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <address@hidden>
  ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
 +;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
+ ;;; Copyright © 2020 Lars-Dominik Braun <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
@@@ -49,9 -49,8 +50,9 @@@
    #:use-module (gnu packages tls)
    #:use-module (gnu packages web)
    #:use-module (gnu packages)
-   #:use-module ((guix licenses) #:select (openldap2.8 lgpl2.1+ gpl3+ psfl))
+   #:use-module ((guix licenses) #:select (openldap2.8 lgpl2.1+ gpl3+ psfl 
expat))
    #:use-module (guix packages)
 +  #:use-module (guix utils)
    #:use-module (guix download)
    #:use-module (guix build-system gnu)
    #:use-module (guix build-system python))
diff --cc gnu/packages/python-xyz.scm
index 6358db8,31aeffa..b884b4e
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -68,7 -68,7 +68,8 @@@
  ;;; Copyright © 2019 Wiktor Żelazny <address@hidden>
  ;;; Copyright © 2019 Tanguy Le Carrour <address@hidden>
  ;;; Copyright © 2019 Mădălin Ionel Patrașcu <address@hidden>
 +;;; Copyright © 2020 Riku Viitanen <address@hidden>
+ ;;; Copyright © 2020 Jakub Kądziołka <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/web.scm
index 00387ed,15b5ded..2336555
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@@ -35,9 -35,8 +35,10 @@@
  ;;; Copyright © 2019 Alex Griffin <address@hidden>
  ;;; Copyright © 2019 Hartmut Goebel <address@hidden>
  ;;; Copyright © 2019 Jakob L. Kreuze <address@hidden>
 +;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
 +;;; Copyright © 2019 Pierre-Moana Levesque <address@hidden>
  ;;; Copyright © 2019 Florian Pelz <address@hidden>
+ ;;; Copyright © 2020 Timotej Lazar <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/webkit.scm
index 3d367aa,8ceee90..b3a87e7
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@@ -126,10 -126,9 +126,10 @@@ engine that uses Wayland for graphics o
                (method url-fetch)
                (uri (string-append "https://www.webkitgtk.org/releases/";
                                    "webkitgtk-" version ".tar.xz"))
 +              (patches (search-patches "webkitgtk-icu-65.patch"))
                (sha256
                 (base32
-                 "04k5h0sid9azsqz9pyq436v1rx4lnfrhvmcgmicqb0c0g9iz103b"))))
+                 "04g6y0sv04d20bw401myq3k828ikysjhx383ly81vh9wji9i3mdd"))))
      (build-system cmake-build-system)
      (outputs '("out" "doc"))
      (arguments



reply via email to

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