From: Marius Bakke Date: Mon, 3 Feb 2020 14:45:44 +0000 (+0100) Subject: Merge branch 'staging' into core-updates X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/commitdiff_plain/52665d2b6bd709ba46c1e364a6d6164f5f4824ff Merge branch 'staging' into core-updates --- 52665d2b6bd709ba46c1e364a6d6164f5f4824ff diff --cc gnu/local.mk index 88ce141c13,125118bc55..1040e4dafd --- 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 50afe29c77,3e7314bc2b..a86ae0efde --- 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 d9d3f14ced,0f2eba373d..af2b06ab27 --- 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 334affcd2a,de8239b7fe..107b9239b8 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@@ -4,7 -4,7 +4,8 @@@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Mathieu Othacehe + ;;; Copyright © 2020 Lars-Dominik Braun ;;; ;;; 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 6358db8b60,31aeffa161..b884b4eee1 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@@ -68,7 -68,7 +68,8 @@@ ;;; Copyright © 2019 Wiktor Żelazny ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2019 Mădălin Ionel Patrașcu +;;; Copyright © 2020 Riku Viitanen + ;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; diff --cc gnu/packages/web.scm index 00387ed899,15b5dedd16..2336555829 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@@ -35,9 -35,8 +35,10 @@@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019 Pierre-Moana Levesque ;;; Copyright © 2019 Florian Pelz + ;;; Copyright © 2020 Timotej Lazar ;;; ;;; This file is part of GNU Guix. ;;; diff --cc gnu/packages/webkit.scm index 3d367aa54f,8ceee90018..b3a87e798a --- 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