cbaines pushed a commit to branch core-updates
in repository guix.
commit a8448da0f4a090818104e64dd79f90b0e50d5e77
Merge: 4f4b749 a714af3
Author: Christopher Baines <m...@cbaines.net>
AuthorDate: Fri Mar 5 22:56:40 2021 +0000
Merge branch 'master' into core-updates
.guix-authorizations | 2 +
Makefile.am | 6 +
doc/contributing.texi | 10 +-
doc/guix.texi | 1281 ++-
etc/completion/fish/guix.fish | 7 +-
etc/completion/zsh/_guix | 2 +-
etc/news.scm | 80 +-
gnu/build/file-systems.scm | 45 +-
gnu/image.scm | 1 +
gnu/local.mk | 26 +-
gnu/machine/ssh.scm | 6 +-
gnu/packages/admin.scm | 180 +-
gnu/packages/algebra.scm | 28 +-
gnu/packages/animation.scm | 6 +-
gnu/packages/assembly.scm | 33 +-
gnu/packages/astronomy.scm | 314 +-
gnu/packages/audio.scm | 117 +-
gnu/packages/authentication.scm | 4 +-
gnu/packages/autotools.scm | 4 +-
.../aux-files/chromium/master-preferences.json | 8 +-
gnu/packages/aux-files/linux-libre/5.11-arm.conf | 9944 +++++++++++++++++
gnu/packages/aux-files/linux-libre/5.11-arm64.conf | 10140 +++++++++++++++++
gnu/packages/aux-files/linux-libre/5.11-i686.conf | 10792 ++++++++++++++++++
.../aux-files/linux-libre/5.11-x86_64.conf | 10828 +++++++++++++++++++
gnu/packages/batik.scm | 4 +-
gnu/packages/benchmark.scm | 28 +-
gnu/packages/bioconductor.scm | 347 +-
gnu/packages/bioinformatics.scm | 354 +-
gnu/packages/build-tools.scm | 50 +
gnu/packages/calendar.scm | 6 +-
gnu/packages/cdrom.scm | 8 +-
gnu/packages/check.scm | 2 +-
gnu/packages/chromium.scm | 8 +-
gnu/packages/ci.scm | 32 +-
gnu/packages/cmake.scm | 56 +-
gnu/packages/compression.scm | 29 +-
gnu/packages/compton.scm | 2 +-
gnu/packages/cpp.scm | 114 +-
gnu/packages/cran.scm | 324 +-
gnu/packages/crates-graphics.scm | 344 +-
gnu/packages/crates-gtk.scm | 40 +-
gnu/packages/crates-io.scm | 6813 ++++++++++--
gnu/packages/crypto.scm | 43 +-
gnu/packages/cybersecurity.scm | 6 +-
gnu/packages/databases.scm | 62 +-
gnu/packages/datastructures.scm | 10 +-
gnu/packages/dictionaries.scm | 6 +-
gnu/packages/diffoscope.scm | 5 +-
gnu/packages/disk.scm | 19 +-
gnu/packages/display-managers.scm | 31 +
gnu/packages/distributed.scm | 2 +-
gnu/packages/dns.scm | 28 +-
gnu/packages/documentation.scm | 2 +-
gnu/packages/education.scm | 6 +-
gnu/packages/electronics.scm | 52 +
gnu/packages/emacs-xyz.scm | 1424 ++-
gnu/packages/embedded.scm | 39 +-
gnu/packages/emulators.scm | 71 +-
gnu/packages/engineering.scm | 170 +-
gnu/packages/file-systems.scm | 72 +-
gnu/packages/fonts.scm | 30 +-
gnu/packages/fontutils.scm | 26 +-
gnu/packages/freedesktop.scm | 21 +-
gnu/packages/freeipmi.scm | 6 +-
gnu/packages/game-development.scm | 4 +-
gnu/packages/games.scm | 164 +-
gnu/packages/geo.scm | 14 +-
gnu/packages/gimp.scm | 2 +-
gnu/packages/gl.scm | 4 +-
gnu/packages/gnome.scm | 91 +-
gnu/packages/gnuzilla.scm | 14 +-
gnu/packages/golang.scm | 79 +
gnu/packages/gps.scm | 5 +-
gnu/packages/graph.scm | 31 +-
gnu/packages/graphics.scm | 42 +-
gnu/packages/gstreamer.scm | 2 +-
gnu/packages/gtk.scm | 25 +
gnu/packages/guile-xyz.scm | 89 +-
gnu/packages/haskell-apps.scm | 72 +-
gnu/packages/haskell-xyz.scm | 44 +-
gnu/packages/heads.scm | 2 +-
gnu/packages/i2p.scm | 34 +-
gnu/packages/image-viewers.scm | 5 +-
gnu/packages/image.scm | 98 +-
gnu/packages/installers.scm | 29 +-
gnu/packages/ipfs.scm | 6 +-
gnu/packages/java-compression.scm | 5 +
gnu/packages/java.scm | 299 +-
gnu/packages/javascript.scm | 4 +-
gnu/packages/kde-frameworks.scm | 32 +
gnu/packages/kde.scm | 38 +
gnu/packages/language.scm | 2 +-
gnu/packages/libreoffice.scm | 13 +-
gnu/packages/license.scm | 2 +-
gnu/packages/linux.scm | 123 +-
gnu/packages/lisp-xyz.scm | 960 +-
gnu/packages/llvm.scm | 47 +
gnu/packages/lua.scm | 102 +-
gnu/packages/lxde.scm | 12 +-
gnu/packages/machine-learning.scm | 25 +-
gnu/packages/mail.scm | 22 +-
gnu/packages/man.scm | 6 +-
gnu/packages/maths.scm | 35 +-
gnu/packages/messaging.scm | 66 +-
gnu/packages/monitoring.scm | 53 +-
gnu/packages/mpd.scm | 10 +-
gnu/packages/music.scm | 150 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 64 +-
gnu/packages/node.scm | 4 +-
gnu/packages/ocaml.scm | 257 +-
gnu/packages/ocr.scm | 164 +-
gnu/packages/openldap.scm | 28 +-
gnu/packages/package-management.scm | 70 +-
gnu/packages/parallel.scm | 10 +-
gnu/packages/password-utils.scm | 47 +
.../patches/exiv2-CVE-2017-14859-14862-14864.patch | 66 -
gnu/packages/patches/exiv2-CVE-2017-14860.patch | 48 -
.../patches/http-parser-CVE-2020-8287.patch | 75 +
.../http-parser-fix-assertion-on-armhf.patch | 39 -
gnu/packages/patches/lrzip-CVE-2017-8842.patch | 23 -
gnu/packages/patches/mupdf-CVE-2021-3407.patch | 51 +
.../patches/openscad-parser-boost-1.72.patch | 26 -
gnu/packages/patches/openssh-fix-ssh-copy-id.patch | 38 -
.../patches/python-2.7-CVE-2021-3177.patch | 157 +
.../patches/python-3.8-CVE-2021-3177.patch | 194 +
.../python-matplotlib-run-under-wayland-gtk3.patch | 31 +
gnu/packages/patches/qemu-CVE-2021-20203.patch | 172 +
.../patches/retroarch-LIBRETRO_DIRECTORY.patch | 32 +
.../patches/retroarch-disable-online-updater.patch | 41 -
.../patches/ruby-rack-ignore-failing-test.patch | 13 -
.../ruby-rubocop-break-dependency-cycle.patch | 101 -
.../ruby-tzinfo-data-ignore-broken-test.patch | 13 -
gnu/packages/patches/screen-CVE-2021-26937.patch | 66 +
.../patches/wpa-supplicant-CVE-2021-27803.patch | 50 +
gnu/packages/patchutils.scm | 10 +-
gnu/packages/pdf.scm | 3 +-
gnu/packages/perl-maths.scm | 67 +
gnu/packages/perl-web.scm | 2 +-
gnu/packages/perl.scm | 73 +-
gnu/packages/photo.scm | 12 +-
gnu/packages/php.scm | 17 +-
gnu/packages/plotutils.scm | 6 +-
gnu/packages/pretty-print.scm | 4 +-
gnu/packages/protobuf.scm | 3 +-
gnu/packages/python-check.scm | 60 +
gnu/packages/python-crypto.scm | 40 +-
gnu/packages/python-web.scm | 25 +-
gnu/packages/python-xyz.scm | 374 +-
gnu/packages/python.scm | 12 +-
gnu/packages/qt.scm | 72 +-
gnu/packages/radio.scm | 78 +-
gnu/packages/rails.scm | 131 +-
gnu/packages/rpc.scm | 5 +-
gnu/packages/ruby.scm | 634 +-
gnu/packages/rust-apps.scm | 90 +-
gnu/packages/rust.scm | 6 +-
gnu/packages/scanner.scm | 77 +-
gnu/packages/scheme.scm | 98 +-
gnu/packages/screen.scm | 5 +-
gnu/packages/shells.scm | 1282 ++-
gnu/packages/speech.scm | 37 +-
gnu/packages/ssh.scm | 7 +-
gnu/packages/statistics.scm | 45 +-
gnu/packages/sync.scm | 47 +-
gnu/packages/syndication.scm | 58 +
gnu/packages/task-management.scm | 49 +
gnu/packages/task-runners.scm | 49 +
gnu/packages/telegram.scm | 49 +-
gnu/packages/telephony.scm | 16 +-
gnu/packages/terminals.scm | 47 +-
gnu/packages/tex.scm | 33 +-
gnu/packages/text-editors.scm | 7 +-
gnu/packages/time.scm | 11 +-
gnu/packages/tls.scm | 16 +-
gnu/packages/tor.scm | 8 +-
gnu/packages/version-control.scm | 40 +-
gnu/packages/video.scm | 69 +-
gnu/packages/virtualization.scm | 5 +-
gnu/packages/vpn.scm | 73 +-
gnu/packages/vulkan.scm | 4 +-
gnu/packages/web-browsers.scm | 78 +
gnu/packages/web.scm | 174 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wm.scm | 52 +-
gnu/packages/xdisorg.scm | 123 +-
gnu/packages/xfce.scm | 48 +-
gnu/packages/xml.scm | 4 +-
gnu/packages/xorg.scm | 4 +-
gnu/services/cuirass.scm | 128 +-
gnu/services/databases.scm | 25 +-
gnu/services/file-sharing.scm | 804 ++
gnu/services/guix.scm | 88 +-
gnu/services/networking.scm | 13 +-
gnu/services/shepherd.scm | 10 +-
gnu/services/vpn.scm | 138 +-
gnu/services/web.scm | 112 +-
gnu/system/hurd.scm | 2 +-
gnu/system/images/hurd.scm | 3 +
gnu/system/images/novena.scm | 3 +
gnu/system/images/pine64.scm | 3 +
gnu/system/images/pinebook-pro.scm | 3 +
gnu/system/images/{pine64.scm => rock64.scm} | 44 +-
gnu/system/vm.scm | 67 +-
gnu/tests.scm | 1 +
gnu/tests/cuirass.scm | 288 +-
gnu/tests/docker.scm | 4 +-
guix/build/profiles.scm | 4 +-
guix/build/renpy-build-system.scm | 7 +-
guix/build/syscalls.scm | 116 +-
guix/describe.scm | 70 +-
guix/download.scm | 8 +-
guix/ftp-client.scm | 15 +-
guix/gexp.scm | 211 +-
guix/grafts.scm | 12 +-
guix/http-client.scm | 123 +-
guix/import/cran.scm | 2 +-
guix/import/crate.scm | 15 +-
guix/import/hackage.scm | 4 +-
guix/narinfo.scm | 1 -
guix/openpgp.scm | 11 -
guix/packages.scm | 53 +-
guix/profiles.scm | 9 +-
guix/scripts.scm | 9 +-
guix/scripts/challenge.scm | 2 +-
guix/scripts/environment.scm | 13 +-
guix/scripts/pack.scm | 31 +-
guix/scripts/package.scm | 6 +-
guix/scripts/pull.scm | 11 +-
guix/scripts/substitute.scm | 540 +-
guix/scripts/system.scm | 140 +-
guix/scripts/weather.scm | 2 +-
guix/serialization.scm | 56 +-
guix/store.scm | 18 +-
guix/substitutes.scm | 366 +
guix/tests.scm | 4 +-
guix/ui.scm | 6 +-
po/packages/POTFILES.in | 1 +
tests/gexp.scm | 147 +-
tests/guix-lint.sh | 5 +
tests/guix-package.sh | 15 +
tests/guix-system.sh | 9 +-
tests/services/file-sharing.scm | 59 +
tests/syscalls.scm | 16 +-
tests/transformations.scm | 10 +
245 files changed, 62875 insertions(+), 4633 deletions(-)
diff --cc gnu/local.mk
index 202677f,25afb99..6c6d1ba
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1516,7 -1523,11 +1517,11 @@@ dist_patch_DATA =
%D%/packages/patches/python-3-deterministic-build-info.patch \
%D%/packages/patches/python-3-search-paths.patch \
%D%/packages/patches/python-3-fix-tests.patch \
- %D%/packages/patches/python-3.8-fix-tests.patch \
+ %D%/packages/patches/python-3-hurd-configure.patch \
+ %D%/packages/patches/python-3.8-CVE-2021-3177.patch \
+ %D%/packages/patches/python-3.9-fix-tests.patch \
+ %D%/packages/patches/python-CVE-2018-14647.patch \
+ %D%/packages/patches/python-CVE-2020-26116.patch \
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
%D%/packages/patches/python-axolotl-AES-fix.patch \
@@@ -1527,10 -1538,9 +1532,11 @@@
%D%/packages/patches/python-keras-integration-test.patch \
%D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
%D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
+ %D%/packages/patches/python-pyflakes-fix-tests.patch \
%D%/packages/patches/python-flint-includes.patch \
+ %D%/packages/patches/python-libxml2-python39-compat.patch \
%D%/packages/patches/python-libxml2-utf8.patch \
+ %D%/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch \
%D%/packages/patches/python-mediafile-wavpack.patch \
%D%/packages/patches/python-memcached-syntax-warnings.patch \
%D%/packages/patches/python-mox3-python3.6-compat.patch \
@@@ -1588,11 -1598,13 +1595,8 @@@
%D%/packages/patches/rnp-add-version.cmake.patch \
%D%/packages/patches/rnp-disable-ruby-rnp-tests.patch \
%D%/packages/patches/rnp-unbundle-googletest.patch \
- %D%/packages/patches/ruby-rack-ignore-failing-test.patch \
- %D%/packages/patches/ruby-rubocop-break-dependency-cycle.patch\
%D%/packages/patches/ruby-sanitize-system-libxml.patch \
- %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
%D%/packages/patches/runc-CVE-2019-5736.patch \
- %D%/packages/patches/rust-1.19-mrustc.patch \
- %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
- %D%/packages/patches/rust-1.45-linker-locale.patch \
- %D%/packages/patches/rust-1.48-linker-locale.patch \
- %D%/packages/patches/rust-bootstrap-stage0-test.patch \
%D%/packages/patches/rust-coresimd-doctest.patch \
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
%D%/packages/patches/rust-nettle-disable-vendor.patch \
diff --cc gnu/packages/admin.scm
index f19289e,b0fee13..00436e9
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@@ -32,10 -32,13 +32,14 @@@
;;; Copyright © 2019, 2020 Mathieu Othacehe <m.othac...@gmail.com>
;;; Copyright © 2020 Oleg Pykhalov <go.wig...@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <jann...@gnu.org>
- ;;; Copyright © 2020 Michael Rohleder <m...@rohleder.de>
+ ;;; Copyright © 2020, 2021 Michael Rohleder <m...@rohleder.de>
;;; Copyright © 2020 Vincent Legoll <vincent.leg...@gmail.com>
;;; Copyright © 2020 Morgan Smith <morgan.j.sm...@outlook.com>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.courno...@gmail.com>
+ ;;; Copyright © 2021 Zheng Junjie <873216...@qq.com>
+ ;;; Copyright © 2021 Stefan Reichör <ste...@xsteve.at>
+ ;;; Copyright © 2021 qblade <qbl...@protonmail.com>
+ ;;; Copyright © 2021 Hyunseok Kim <lasne...@lagunposprasihopre.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -3840,10 -3972,18 +3977,17 @@@ cache of unix and unix-like systems."
(modify-phases %standard-phases
(add-before 'build 'setenv-PATH
(lambda _
- (setenv "PYTHONPATH" (string-append "lib:" (getenv
"PYTHONPATH")))
- #t)))))
+ (setenv "PYTHONPATH" "lib"))))))
(propagated-inputs
`(("python-pygobject" ,python-pygobject)
- ("python-pyudev" ,python-pyudev)))
+ ("python-pyudev" ,python-pyudev)
+
+ ;; For GUI.
+ ("python-pyyaml" ,python-pyyaml)
+ ("python-psutil" ,python-psutil)
+ ("python-xlib" ,python-xlib)
+ ("gtk+" ,gtk+)
+ ("python-pygobject" ,python-pygobject)))
(home-page "https://smxi.org/docs/inxi.htm";)
(synopsis "Linux devices manager for the Logitech Unifying Receiver")
(description "This package provides tools to manage clients of the
diff --cc gnu/packages/algebra.scm
index 546b058,6f36f26..61cd481
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@@ -242,10 -242,10 +242,10 @@@ the real span of the lattice."
version ".tar.gz"))
(sha256
(base32
- "14xs90wrw8mbdx08hxlbhiahp6kgjq6yh27zjw7fvhfjx5nr84f8"))))
+ "1cgwdpw8b797883z9y92ixxjkv72kiy65zsw2qqf5and1kbzgv41"))))
(build-system gnu-build-system)
(native-inputs
- `(("texlive" ,(texlive-union
+ `(("texlive" ,(texlive-updmap.cfg
(list texlive-amsfonts)))))
(inputs `(("gmp" ,gmp)
("libx11" ,libx11)
diff --cc gnu/packages/bioinformatics.scm
index bc182fb,6d21e14..d37d930
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@@ -14045,15 -14346,19 +14264,19 @@@ choosing which reads pass the filter."
#t)))
(add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys)
- (for-each (lambda (file)
- (wrap-program file `("GUIX_PYTHONPATH" ":" prefix
(,path))))
- (find-files "/share/nanopolish/scripts" "\\.py"))
- (for-each (lambda (file)
- (wrap-program file `("PERL5LIB" ":" prefix
(,path))))
- (find-files "/share/nanopolish/scripts" "\\.pl"))
- #t)))))
- (let ((pythonpath (getenv "PYTHONPATH"))
++ (let ((pythonpath (getenv "GUIX_PYTHONPATH"))
+ (perl5lib (getenv "PERL5LIB"))
+ (scripts (string-append (assoc-ref outputs "out")
+ "/share/nanopolish/scripts")))
+ (for-each (lambda (file)
- (wrap-program file `("PYTHONPATH" ":" prefix
(,pythonpath))))
++ (wrap-program file `("GUIX_PYTHONPATH" ":"
prefix (,pythonpath))))
+ (find-files scripts "\\.py"))
+ (for-each (lambda (file)
+ (wrap-script file `("PERL5LIB" ":" prefix
(,perl5lib))))
+ (find-files scripts "\\.pl"))))))))
(inputs
- `(("eigen" ,eigen)
+ `(("guile" ,guile-3.0) ; for wrappers
+ ("eigen" ,eigen)
("hdf5" ,hdf5)
("htslib" ,htslib)
("perl" ,perl)
diff --cc gnu/packages/crates-io.scm
index 9cf0c8b,dc427ba..92df4a5
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@@ -12,9 -12,9 +12,10 @@@
;;; Copyright © 2020 André Batista <nan...@riseup.net>
;;; Copyright © 2020 Arun Isaac <arunis...@systemreboot.net>
;;; Copyright © 2020 Antoine Côté <antoine.c...@posteo.net>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.courno...@gmail.com>
;;; Copyright © 2021 aecepoglu <aecepo...@fastmail.fm>
;;; Copyright @ 2021 Zheng Junjie <873216...@qq.com>
+ ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121...@posteo.ro>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -19290,19 -21801,42 +21802,42 @@@ explosion."
("rust-serde-derive" ,rust-serde-derive-1)
("rust-serde-json" ,rust-serde-json-1))))))
+ (define-public rust-loop9-0.1
+ (package
+ (name "rust-loop9")
+ (version "0.1.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "loop9" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0h4rys8001cdq4l2f30k66wmvscm4lb2laxgpia794p5652800x7"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-imgref" ,rust-imgref-1))))
+ (home-page "https://lib.rs/loop9";)
+ (synopsis "Helper function to visit every pixel and its neighbors")
+ (description
+ "This package provides a tiny helper function to visit every pixel in the
+ image together with its neighboring pixels.")
+ (license license:expat)))
+
-(define-public rust-lopdf-0.25
+(define-public rust-lopdf-0.26
(package
(name "rust-lopdf")
- (version "0.25.0")
+ (version "0.26.0")
(source
- (origin
- (method url-fetch)
- (uri (crate-uri "lopdf" version))
- (file-name
- (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1yb4yj1a8a88w78hz9msg65xbkyx5n4d9gm1xb2c67zaj1xvyw1i"))))
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "lopdf" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1wqnmibs8qzi6pr3ig4h3sg6bfkkgyv4ngdng81x069725r056ml"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
diff --cc gnu/packages/engineering.scm
index 7bbf732,66331d7..af7bca0
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@@ -2894,60 -2953,45 +2947,43 @@@ GUI."
(license license:gpl3+)))
(define-public poke
- ;; Upstream has yet to tag any releases.
- (let ((commit "d33317a46e3b7c48130a471a48cbfea1abab70d8")
- (revision "0"))
- (package
- (name "poke")
- (version (git-version "0.0.0" revision commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "git://git.savannah.gnu.org/poke.git")
- (commit commit)
- (recursive? #t)))
- (sha256
- (base32 "1dd0r1x123bqi78lrsk58rvg9c9wka0kywdyzn7g3i4hkh54xb7d"))
- (file-name (git-file-name name version))))
- (build-system gnu-build-system)
- ;; The GUI, which we elide, requires tcl and tk.
- (native-inputs `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("bison" ,bison)
- ("clisp" ,clisp)
- ("dejagnu" ,dejagnu)
- ("flex" ,flex)
- ("gettext" ,gettext-minimal)
- ("help2man" ,help2man)
- ("libtool" ,libtool)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python-2" ,python-2)
- ("python-3" ,python-3)
- ("texinfo" ,texinfo)))
- ;; FIXME: Enable NBD support by adding `libnbd' (currently unpackaged).
- ;; FIXME: A "hyperlinks-capable" `libtexststyle' needed for the hserver.
- (inputs `(("json-c" ,json-c)
- ("libgc" ,libgc)
- ("readline" ,readline)))
- (arguments
- ;; To build the GUI, add the `--enable-gui' configure flag.
- ;; To enable the "hyperlink server", add the `--enable-hserver' flag.
- `(#:configure-flags '("--enable-mi")
- #:phases (modify-phases %standard-phases
- ;; This is a non-trivial bootstrap that needs many of the
- ;; native-inputs and thus must run after `patch-shebangs'.
- (delete 'bootstrap)
- (add-after 'patch-source-shebangs 'bootstrap
- (lambda _
- (invoke "./bootstrap" "--no-git"
- "--no-bootstrap-sync"
- "--gnulib-srcdir=gnulib")
- #t)))))
- (home-page "http://jemarch.net/poke.html";)
- (synopsis "Interactive, extensible editor for binary data")
- (description "GNU poke is an interactive, extensible editor for binary
+ (package
+ (name "poke")
+ (version "1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/poke/poke-" version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "02jvla69xd0nnlg2bil2vxxxglqgylswml6h5hy2nxy0023hp4yy"))))
+
+ ;; XXX: Version 1.0 only supports 64-bit systems.
+ (supported-systems '("x86_64-linux" "aarch64-linux"))
+
+ (build-system gnu-build-system)
+ ;; The GUI, which we elide, requires tcl and tk.
- (native-inputs `(;; Requires bison 3.6+ but we currently only have 3.5.
- ;; Bison 3.6 will be available in the next core update.
- ("bison-3.6" ,bison-3.6)
++ (native-inputs `(("bison" ,bison)
+ ("clisp" ,clisp)
+ ("dejagnu" ,dejagnu)
+ ("flex" ,flex)
+ ("libtool" ,libtool)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python-2" ,python-2)
+ ("python-3" ,python-3)))
+ ;; FIXME: Enable NBD support by adding `libnbd' (currently unpackaged).
+ (inputs `(("json-c" ,json-c)
+ ("libgc" ,libgc)
+ ("readline" ,readline)
+ ("libtextstyle" ,libtextstyle)))
+ (arguments
+ ;; To build the GUI, add the `--enable-gui' configure flag.
+ ;; To enable the "hyperlink server", add the `--enable-hserver' flag.
+ `(#:configure-flags '("--enable-mi")))
+ (home-page "http://jemarch.net/poke.html";)
+ (synopsis "Interactive, extensible editor for binary data")
+ (description "GNU poke is an interactive, extensible editor for binary
data. Not limited to editing basic entities such as bits and bytes, it
provides a full-fledged procedural, interactive programming language
designed
to describe data structures and to operate on them.")
diff --cc gnu/packages/fontutils.scm
index 120367a,a4c92f5..d67c5dc
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@@ -11,8 -11,7 +11,9 @@@
;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <l...@gnu.org>
;;; Copyright © 2019, 2020 Marius Bakke <mba...@fastmail.com>
;;; Copyright © 2020 Roel Janssen <r...@gnu.org>
+;;; Copyright © 2020 Nicolas Goaziou <m...@nicolasgoaziou.fr>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.courno...@gmail.com>
+ ;;; Copyright © 2020, 2021 Nicolas Goaziou <m...@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -901,13 -868,17 +901,17 @@@ generated list of fallback fonts are ch
("gettext" ,gettext-minimal)
("glib" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
- ("desktop-file-utils" ,desktop-file-utils)))
+ ("pkg-config" ,pkg-config)
- ("vala" ,vala-0.50)
++ ("vala" ,vala)
+ ("yelp-tools" ,yelp-tools)))
(inputs
- `(("json-glib" ,json-glib)
- ("sqlite" ,sqlite)
- ("fonconfig" ,fontconfig)
+ `(("fonconfig" ,fontconfig)
("freetype" ,freetype)
- ("gtk+" ,gtk+)))
+ ("gtk+" ,gtk+)
+ ("json-glib" ,json-glib)
+ ("libsoup" ,libsoup)
+ ("sqlite" ,sqlite)
+ ("webkitgtk" ,webkitgtk)))
(home-page "https://fontmanager.github.io/";)
(synopsis "Simple font management for GTK+ desktop environments")
(description "Font Manager is intended to provide a way for users to
diff --cc gnu/packages/gnuzilla.scm
index 8370963,425ed81..3ff9689
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -1598,9 -1598,9 +1598,9 @@@ standards of the IceCat project."
(file-name (string-append "thunderbird-" version "-checkout"))
(sha256
(base32
- "0kpn6jvymryf2gpj0dl5lpgln8mc3kxi3makms0wb84aajn842jv")))))
+ "19h1s9qcxzcvbd1m07xajk5lhpikj53k5fp3nwvl38xj7a3s0gxw")))))
("autoconf" ,autoconf-2.13)
- ("cargo" ,rust-1.41 "cargo")
+ ("cargo" ,rust "cargo")
("clang" ,clang)
("llvm" ,llvm)
("nasm" ,nasm)
diff --cc gnu/packages/gtk.scm
index f458366,34876dd..30ffb10
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -24,7 -24,8 +24,8 @@@
;;; Copyright © 2019 Giacomo Leidi <goodoldp...@autistici.org>
;;; Copyright © 2020 Brendan Tildesley <m...@brendan.scot>
;;; Copyright © 2020 Guillaume Le Vaillant <g...@posteo.net>
-;;; Copyright © 2020 Maxim Cournoyer <maxim.courno...@gmail.com>
+;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.courno...@gmail.com>
+ ;;; Copyright © 2021 Leo Famulari <l...@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/image.scm
index 6dff48b,a48b1e1..ce8f08c
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@@ -26,9 -26,9 +26,10 @@@
;;; Copyright © 2020 Giacomo Leidi <goodoldp...@autistici.org>
;;; Copyright © 2020 R Veera Kumar <v...@vkten.in>
;;; Copyright © 2020 Maxim Cournoyer <maxim.courno...@gmail.com>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <jann...@gnu.org>
;;; Copyright © 2020 Zhu Zihao <all_but_l...@163.com>
- ;;; Copyright © 2020 Vinicius Monego <mon...@posteo.net>
+ ;;; Copyright © 2020, 2021 Vinicius Monego <mon...@posteo.net>
+ ;;; Copyright © 2021 Sharlatan Hellseher <sharlata...@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/machine-learning.scm
index f8a0d11,ddd600d..aa86bdf
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@@ -15,8 -15,8 +15,8 @@@
;;; Copyright © 2019 Brett Gilio <bre...@gnu.org>
;;; Copyright © 2020 Konrad Hinsen <konrad.hin...@fastmail.net>
;;; Copyright © 2020 Edouard Klein <e...@beaver-labs.com>
- ;;; Copyright © 2020 Vinicius Monego <mon...@posteo.net>
+ ;;; Copyright © 2020, 2021 Vinicius Monego <mon...@posteo.net>
-;;; Copyright © 2020 Maxim Cournoyer <maxim.courno...@gmail.com>
+;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.courno...@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/python-xyz.scm
index f8afa13,fbc9ad6..25f5fb3
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -12747,10 -12941,16 +12885,9 @@@ graphviz."
(call-with-output-file "skipped_tests.txt"
(lambda (port)
(format port "~a~%"
- (string-join disabled-tests "\n"))))
- #t)))
+ (string-join disabled-tests "\n")))))))
(replace 'check
(lambda _
- ;; Make sure the build directory is on PYTHONPATH.
- (setenv "PYTHONPATH"
- (string-append
- (getenv "PYTHONPATH") ":"
- (getcwd) "/build/"
- (car (scandir "build" (cut string-prefix?
"lib." <>)))))
-
;; Use the build daemons configured number of workers.
(setenv "NWORKERS" (number->string
(parallel-job-count)))
diff --cc gnu/packages/python.scm
index 8e8f464,e05c91b..49d43ab
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -59,7 -59,7 +59,7 @@@
;;; Copyright © 2018 Vagrant Cascadian <vagr...@debian.org>
;;; Copyright © 2019 Tanguy Le Carrour <tan...@bioneland.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <jann...@gnu.org>
- ;;; Copyright © 2020 Greg Hogan <c...@greghogan.com>
-;;; Copyright © 2021 Greg Hogan <c...@greghogan.com>
++;;; Copyright © 2020, 2021 Greg Hogan <c...@greghogan.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/rust.scm
index 70d19e0,98a6bff..9efe19e
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@@ -706,20 -1348,44 +706,20 @@@ safety and thread safety guarantees."
(lambda* (#:key outputs #:allow-other-keys)
(invoke "./x.py" "install")
(substitute* "config.toml"
- ;; replace prefix to specific output
+ ;; Adjust the prefix to the 'cargo' output.
(("prefix = \"[^\"]*\"")
- (string-append "prefix = \"" (assoc-ref outputs "cargo")
"\"")))
+ (format #f "prefix = ~s" (assoc-ref outputs "cargo"))))
(invoke "./x.py" "install" "cargo")
(substitute* "config.toml"
- ;; replace prefix to specific output
+ ;; Adjust the prefix to the 'rustfmt' output.
(("prefix = \"[^\"]*\"")
- (string-append "prefix = \"" (assoc-ref outputs
"rustfmt") "\"")))
- (invoke "./x.py" "install" "rustfmt")))
- (replace 'delete-install-logs
- (lambda* (#:key outputs #:allow-other-keys)
- (define (delete-manifest-file out-path file)
- (delete-file (string-append out-path "/lib/rustlib/"
file)))
-
- (let ((out (assoc-ref outputs "out"))
- (cargo-out (assoc-ref outputs "cargo"))
- (rustfmt-out (assoc-ref outputs "rustfmt")))
- (for-each
- (lambda (file) (delete-manifest-file out file))
- '("install.log"
- "manifest-rust-docs"
- ,(string-append "manifest-rust-std-"
- (nix-system->gnu-triplet-for-rust))
- "manifest-rustc"))
- (for-each
- (lambda (file) (delete-manifest-file cargo-out file))
- '("install.log"
- "manifest-cargo"))
- (for-each
- (lambda (file) (delete-manifest-file rustfmt-out file))
- '("install.log"
- "manifest-rustfmt-preview"))
- #t))))))))))
+ (format #f "prefix = ~s" (assoc-ref outputs "rustfmt"))))
+ (invoke "./x.py" "install" "rustfmt"))))))))))
- (define rust-1.47
+ (define-public rust-1.47
- (let ((base-rust
- (rust-bootstrapped-package rust-1.46 "1.47.0"
- "07fqd2vp7cf1ka3hr207dnnz93ymxml4935vp74g4is79h3dz19i")))
+ (let ((base-rust (rust-bootstrapped-package
+ rust-1.46 "1.47.0"
+ "07fqd2vp7cf1ka3hr207dnnz93ymxml4935vp74g4is79h3dz19i")))
(package
(inherit base-rust)
(inputs
@@@ -808,41 -1440,20 +808,45 @@@
(lambda* (#:key inputs #:allow-other-keys)
(let ((bash (assoc-ref inputs "bash")))
(substitute* "library/std/src/process/tests.rs"
- (("\"/bin/sh\"") (string-append "\"" bash "/bin/sh\"")))
+ (("\"/bin/sh\"")
+ (string-append "\"" bash "/bin/sh\"")))
(substitute*
"library/std/src/sys/unix/process/process_common/tests.rs"
- (("fn test_process_mask") "#[allow(unused_attributes)]
+ (("fn test_process_mask")
+ "#[allow(unused_attributes)]
#[ignore]
- fn test_process_mask"))
- #t))))))))))
-
-(define-public rust-1.49
- (rust-bootstrapped-package rust-1.48 "1.49.0"
- "0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm"))
+ fn test_process_mask")))))
+ (add-after 'unpack 'disable-interrupt-tests
+ (lambda _
+ ;; This test hangs in the build container; disable it.
+ (substitute* (match (find-files "." "^freshness.rs$")
+ ((file) file))
+ (("fn linking_interrupted")
+ "#[ignore]\nfn linking_interrupted"))
+ ;; Likewise for the ctrl_c_kills_everyone test.
+ (substitute* (match (find-files "." "^death.rs$")
+ ((file) file))
+ (("fn ctrl_c_kills_everyone")
+ "#[ignore]\nfn ctrl_c_kills_everyone"))))
+ (add-after 'configure 'enable-docs
+ (lambda _
+ (substitute* "config.toml"
+ (("docs = false")
+ "docs = true"))))
+ (add-after 'configure 'add-gdb-to-config
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((gdb (assoc-ref inputs "gdb")))
+ (substitute* "config.toml"
+ (("^python =.*" all)
+ (string-append all
+ "gdb = \"" gdb "/bin/gdb\"\n"))))))))))
+ ;; Add test inputs.
+ (native-inputs (cons*
+ ;; The tests fail when using GDB 10 (see:
+ ;; https://github.com/rust-lang/rust/issues/79009).
+ `("gdb" ,gdb-9.2)
+ `("procps" ,procps)
+ (package-native-inputs base-rust))))))
+
+ (define-public rust-1.50
- (rust-bootstrapped-package rust-1.49 "1.50.0"
++ (rust-bootstrapped-package rust "1.50.0"
+ "0pjs7j62maiyvkmhp9zrxl528g2n0fphp4rq6ap7aqdv0a6qz5wm"))
-
-;; TODO(staging): Bump this variable to the latest packaged rust.
-(define-public rust rust-1.45)
diff --cc gnu/packages/shells.scm
index 0b62822,bb49833..da3d443
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@@ -16,7 -16,7 +16,8 @@@
;;; Copyright © 2020 Brice Waegeneire <br...@waegenei.re>
;;; Copyright © 2020 Ryan Prior <rpr...@protonmail.com>
;;; Copyright © 2020 Efraim Flashner <efr...@flashner.co.il>
+;;; Copyright © 2020 Marius Bakke <mar...@gnu.org>
+ ;;; Copyright © 2021 Nicolas Goaziou <m...@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/web.scm
index ed3bd65,9892dde..b5cbec9
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@@ -47,7 -47,7 +47,8 @@@
;;; Copyright © 2020 Michael Rohleder <m...@rohleder.de>
;;; Copyright © 2020, 2021 Ryan Prior <rpr...@protonmail.com>
;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121...@posteo.ro>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.courno...@gmail.com>
+ ;;; Copyright © 2021 Stefan Reichör <ste...@xsteve.at>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/xdisorg.scm
index 6038c0e,9d139db..88275d8
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@@ -42,8 -42,9 +42,10 @@@
;;; Copyright © 2020 Gabriel Arazas <foo.dogsqua...@gmail.com>
;;; Copyright © 2020 James Smith <jsubunt...@disroot.org>
;;; Copyright © 2020 B. Wilson <elaexuo...@wilsonb.com>
- ;;; Copyright © 2020 Zheng Junjie <873216...@qq.com>
+ ;;; Copyright © 2020, 2021 Zheng Junjie <873216...@qq.com>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.courno...@gmail.com>
+ ;;; Copyright © 2021 Nicolas Goaziou <m...@nicolasgoaziou.fr>
+ ;;; Copyright © 2021 Xinglu Chen <pub...@yoctocell.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
