mbakke pushed a commit to branch core-updates in repository guix. commit b7bf02a418e946b610ef68e8c5131f2350835956 Merge: 233c1be 13efb24 Author: Marius Bakke <mba...@fastmail.com> AuthorDate: Sat Jan 11 22:38:24 2020 +0100
Merge branch 'master' into core-updates HACKING | 56 +- build-aux/git-authenticate.scm | 4 +- doc/contributing.texi | 178 +- doc/guix.texi | 170 +- gnu/bootloader/extlinux.scm | 4 +- gnu/bootloader/grub.scm | 10 +- gnu/build/activation.scm | 26 +- gnu/build/file-systems.scm | 62 +- gnu/installer.scm | 6 +- gnu/installer/newt/partition.scm | 3 +- gnu/installer/parted.scm | 17 +- gnu/local.mk | 31 +- gnu/packages.scm | 6 +- gnu/packages/abiword.scm | 8 +- gnu/packages/admin.scm | 64 +- gnu/packages/algebra.scm | 4 +- gnu/packages/assembly.scm | 105 +- gnu/packages/astronomy.scm | 6 +- gnu/packages/audio.scm | 41 +- gnu/packages/bioinformatics.scm | 326 +- gnu/packages/bittorrent.scm | 6 +- gnu/packages/bootloaders.scm | 62 +- gnu/packages/cdrom.scm | 18 +- gnu/packages/check.scm | 34 +- gnu/packages/chromium.scm | 57 +- gnu/packages/clojure.scm | 25 + gnu/packages/cluster.scm | 4 +- gnu/packages/code.scm | 6 +- gnu/packages/commencement.scm | 4 +- gnu/packages/compression.scm | 6 +- gnu/packages/coq.scm | 170 +- gnu/packages/cran.scm | 255 +- gnu/packages/crates-io.scm | 8494 ++++++++++++++++++-- gnu/packages/crypto.scm | 10 + gnu/packages/cups.scm | 11 +- gnu/packages/databases.scm | 52 +- gnu/packages/disk.scm | 6 +- gnu/packages/electronics.scm | 14 +- gnu/packages/emacs-xyz.scm | 420 +- gnu/packages/emulators.scm | 47 + gnu/packages/engineering.scm | 41 +- gnu/packages/file-systems.scm | 76 + gnu/packages/finance.scm | 114 +- gnu/packages/firmware.scm | 10 +- gnu/packages/fonts.scm | 42 +- gnu/packages/freedesktop.scm | 4 +- gnu/packages/game-development.scm | 145 +- gnu/packages/games.scm | 49 +- gnu/packages/geo.scm | 9 +- gnu/packages/gl.scm | 50 +- gnu/packages/glib.scm | 1 + gnu/packages/gnome.scm | 270 +- gnu/packages/gnucash.scm | 27 +- gnu/packages/gnuzilla.scm | 14 +- gnu/packages/golang.scm | 90 +- gnu/packages/gprolog.scm | 68 - gnu/packages/gstreamer.scm | 38 +- gnu/packages/gtk.scm | 16 +- gnu/packages/guile-xyz.scm | 68 +- gnu/packages/guile.scm | 4 +- gnu/packages/ham-radio.scm | 13 +- gnu/packages/hardware.scm | 6 +- gnu/packages/haskell-apps.scm | 5 +- gnu/packages/haskell-xyz.scm | 103 + gnu/packages/ibus.scm | 78 +- gnu/packages/image.scm | 3 +- gnu/packages/imagemagick.scm | 4 +- gnu/packages/irc.scm | 10 +- gnu/packages/javascript.scm | 48 - gnu/packages/kde.scm | 7 +- gnu/packages/language.scm | 25 + gnu/packages/lean.scm | 65 + gnu/packages/license.scm | 13 +- gnu/packages/linux.scm | 68 +- gnu/packages/lisp-xyz.scm | 1957 ++++- gnu/packages/lisp.scm | 225 +- gnu/packages/lua.scm | 60 +- gnu/packages/lxqt.scm | 17 +- gnu/packages/mail.scm | 53 +- gnu/packages/mate.scm | 9 +- gnu/packages/maths.scm | 22 +- gnu/packages/messaging.scm | 29 +- gnu/packages/mp3.scm | 6 +- gnu/packages/music.scm | 34 +- gnu/packages/musl.scm | 6 +- gnu/packages/networking.scm | 23 +- gnu/packages/nfs.scm | 46 +- gnu/packages/nss.scm | 13 +- gnu/packages/ocaml.scm | 147 +- gnu/packages/opencog.scm | 295 + gnu/packages/package-management.scm | 67 +- .../abiword-black-drawing-with-gtk322.patch | 49 - .../patches/abiword-explictly-cast-bools.patch | 18 - gnu/packages/patches/appstream-glib-2020.patch | 31 + ...-trusted-firmware-optional-bin-generation.patch | 86 - ...-trusted-firmware-rockchip-disable-binary.patch | 73 - gnu/packages/patches/ceph-boost-compat.patch | 81 + gnu/packages/patches/ceph-detect-rocksdb.patch | 24 - .../patches/ceph-skip-collect-sys-info-test.patch | 24 - .../patches/ceph-skip-unittest_blockdev.patch | 24 - gnu/packages/patches/hexchat-crash-exit.patch | 31 - gnu/packages/patches/icecat-makeicecat.patch | 4 +- gnu/packages/patches/jfsutils-add-sysmacros.patch | 26 + .../patches/jfsutils-include-systypes.patch | 25 + gnu/packages/patches/libtgvoip-disable-sse2.patch | 51 + .../patches/libtgvoip-disable-webrtc.patch | 47 + .../patches/mesa-timespec-test-32bit.patch | 17 - gnu/packages/patches/ncompress-fix-softlinks.patch | 7 +- .../patches/nfs-utils-missing-headers.patch | 19 - gnu/packages/patches/nss-CVE-2019-11745.patch | 24 - gnu/packages/patches/orc-typedef-enum.patch | 17 - .../patches/pcre2-fix-jit_match-crash.patch | 25 - .../u-boot-fix-mkimage-header-verification.patch | 57 - gnu/packages/pcre.scm | 8 +- gnu/packages/pdf.scm | 10 +- gnu/packages/perl.scm | 32 +- gnu/packages/profiling.scm | 7 +- gnu/packages/prolog.scm | 152 + gnu/packages/protobuf.scm | 6 +- gnu/packages/python-compression.scm | 21 + gnu/packages/python-crypto.scm | 14 +- gnu/packages/python-xyz.scm | 138 +- gnu/packages/qt.scm | 332 +- gnu/packages/rrdtool.scm | 6 +- gnu/packages/{rust-cbindgen.scm => rust-apps.scm} | 79 +- gnu/packages/scheme.scm | 12 +- gnu/packages/sdl.scm | 121 +- gnu/packages/security-token.scm | 19 +- gnu/packages/serialization.scm | 2 +- gnu/packages/skarnet.scm | 39 +- gnu/packages/ssh.scm | 6 +- gnu/packages/statistics.scm | 19 +- gnu/packages/storage.scm | 197 +- gnu/packages/telephony.scm | 33 + gnu/packages/terminals.scm | 6 +- gnu/packages/tex.scm | 2 +- gnu/packages/text-editors.scm | 16 +- gnu/packages/tigervnc.scm | 7 +- gnu/packages/version-control.scm | 38 +- gnu/packages/video.scm | 12 +- gnu/packages/vim.scm | 47 +- gnu/packages/virtualization.scm | 13 +- gnu/packages/web-browsers.scm | 40 +- gnu/packages/web.scm | 8 +- gnu/packages/wm.scm | 6 +- gnu/packages/xdisorg.scm | 139 +- gnu/packages/xfce.scm | 6 +- gnu/packages/xiph.scm | 18 +- gnu/packages/xml.scm | 7 +- gnu/packages/xorg.scm | 27 + gnu/services/base.scm | 8 +- gnu/services/cuirass.scm | 6 +- gnu/services/desktop.scm | 1 + gnu/services/mcron.scm | 4 +- gnu/services/nfs.scm | 422 +- gnu/services/sound.scm | 101 +- gnu/system.scm | 2 +- gnu/system/install.scm | 4 +- gnu/system/linux-container.scm | 9 +- gnu/system/linux-initrd.scm | 6 + gnu/system/uuid.scm | 7 +- gnu/tests/install.scm | 78 +- gnu/tests/nfs.scm | 157 +- guix/build-system/clojure.scm | 14 +- guix/build-system/guile.scm | 10 +- guix/build-system/minify.scm | 4 +- guix/build/asdf-build-system.scm | 2 +- guix/build/download.scm | 80 +- guix/channels.scm | 8 +- guix/gexp.scm | 35 +- guix/git.scm | 21 +- guix/http-client.scm | 13 +- guix/import/cran.scm | 12 +- guix/import/crate.scm | 9 +- guix/lint.scm | 33 +- guix/scripts/build.scm | 8 +- guix/scripts/gc.scm | 6 +- guix/scripts/import/crate.scm | 2 +- guix/scripts/pack.scm | 6 +- guix/scripts/publish.scm | 6 +- guix/scripts/pull.scm | 6 +- guix/scripts/substitute.scm | 7 +- guix/ui.scm | 4 +- guix/utils.scm | 7 +- tests/gexp.scm | 31 +- 185 files changed, 16082 insertions(+), 2873 deletions(-) diff --cc gnu/local.mk index 62561c7,33cf439..09f46b0 --- a/gnu/local.mk +++ b/gnu/local.mk @@@ -706,11 -708,11 +708,10 @@@ dist_patch_DATA = %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ + %D%/packages/patches/appstream-glib-2020.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/arm-trusted-firmware-disable-hdcp.patch \ - %D%/packages/patches/arm-trusted-firmware-optional-bin-generation.patch \ - %D%/packages/patches/arm-trusted-firmware-rockchip-disable-binary.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ - %D%/packages/patches/aspell-gcc-compat.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ @@@ -1242,10 -1242,8 +1240,9 @@@ %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/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ - %D%/packages/patches/pcre2-fix-jit_match-crash.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-deterministic-ordering.patch \ %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \ diff --cc gnu/packages/admin.scm index 81f9f3b,371fcc7..0790925 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@@ -29,7 -29,8 +29,8 @@@ ;;; Copyright © 2019 Hartmut Goebel <h.goe...@crazy-compilers.com> ;;; Copyright © 2019 Alex Griffin <a...@ajgrf.com> ;;; Copyright © 2019 Guillaume Le Vaillant <g...@posteo.net> -;;; Copyright © 2019 Mathieu Othacehe <m.othac...@gmail.com> +;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othac...@gmail.com> + ;;; Copyright © 2020 Oleg Pykhalov <go.wig...@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; diff --cc gnu/packages/gtk.scm index 0ab5c36,db88c84..37dc923 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@@ -763,9 -730,10 +763,9 @@@ application suites." name "-" version ".tar.xz")) (sha256 (base32 - "10xyyhlfb0yk4hglngxh2zsv9xrxkqv343df8h01dvagc6jyp10k")) + "1a9hi7k59q0kqx0n3xhsk1ly23w9g9ncllnay1756g0yrww5qxsc")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) - (outputs '("out" "bin" "doc")) (propagated-inputs `(("at-spi2-atk" ,at-spi2-atk) ("atk" ,atk) diff --cc gnu/packages/perl.scm index 89254de,c94afbc..a805962 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@@ -22,7 -22,7 +22,8 @@@ ;;; Copyright © 2018, 2019 Pierre Neidhardt <m...@ambrevar.xyz> ;;; Copyright © 2018 Kei Kebreau <kkebr...@posteo.net> ;;; Copyright © 2019 Alex Griffin <a...@ajgrf.com> +;;; Copyright © 2019 Mathieu Othacehe <m.othac...@gmail.com> + ;;; Copyright © 2019 Stephen J. Scheck <ssch...@cpan.org> ;;; ;;; This file is part of GNU Guix. ;;; diff --cc gnu/packages/python-crypto.scm index b9e3210,43a0d95..44a4eab --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@@ -1,8 -1,8 +1,8 @@@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Eric Dvorsak <e...@dvorsak.fr> - ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efr...@flashner.co.il> + ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efr...@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari <l...@famulari.name> -;;; Copyright © 2016, 2017 Marius Bakke <mba...@fastmail.com> +;;; Copyright © 2016, 2017, 2020 Marius Bakke <mba...@fastmail.com> ;;; Copyright © 2017 Ben Sturmfels <b...@sturm.com.au> ;;; Copyright © 2016 Sou Bunnbu <iyzs...@gmail.com> ;;; Copyright © 2015 Cyril Roelandt <tipec...@gmail.com> diff --cc gnu/packages/storage.scm index 5c702e3,73d88f7..a561477 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@@ -298,35 -200,9 +200,9 @@@ ("pkg-config" ,pkg-config) ("python-cython" ,python-cython) ("python-sphinx" ,python-sphinx) - ("yasm" ,yasm) - - ;; For tests. - ("inetutils" ,inetutils) - ("jq" ,jq) - ("perl" ,perl) - ("xmlstarlet" ,xmlstarlet) - ("python2-cram" ,python2-cram) - ("python2-virtualenv" ,python2-virtualenv) - - ;; These dependencies are taken from test-requirements.txt - ;; of ceph-disk and ceph-detect-init. The latter can also - ;; test against python3, but let's try to get python2 tests - ;; working first since that is the default. - ("python2-configobj" ,python2-configobj) - ("python2-coverage" ,python2-coverage) - ("python2-discover" ,python2-discover) - ("python2-fixtures" ,python2-fixtures) - ("python2-flake8" ,python2-flake8) - ("python2-mock" ,python2-mock) - ("python2-nose" ,python2-nose) - ("python2-pip" ,python2-pip) - ("python2-pytest" ,python2-pytest) - ("python2-subunit" ,python2-subunit) - ("python2-testrepository" ,python2-testrepository) - ("python2-testtools" ,python2-testtools) - ("python2-tox" ,python2-tox))) + ("yasm" ,yasm))) (inputs - `(("boost" ,boost-with-python3) + `(("boost" ,boost) ("curl" ,curl) ("cryptsetup" ,cryptsetup) ("expat" ,expat) diff --cc gnu/packages/xorg.scm index a7ec585,022cb49..9127d38 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@@ -20,7 -20,7 +20,8 @@@ ;;; Copyright © 2018 Benjamin Slade <sl...@jnanam.net> ;;; Copyright © 2019 nee <n...@cock.li> ;;; Copyright © 2019 Yoshinori Arai <kumagus...@gmail.com> +;;; Copyright © 2019 Mathieu Othacehe <m.othac...@gmail.com> + ;;; Copyright © 2020 Leo Prikler <leo.prik...@student.tugraz.at> ;;; ;;; This file is part of GNU Guix. ;;;