[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge remote-tracking branch 'origin/master' into core-updates-fr
|
From: |
guix-commits |
|
Subject: |
01/02: Merge remote-tracking branch 'origin/master' into core-updates-frozen |
|
Date: |
Sun, 31 Oct 2021 09:05:06 -0400 (EDT) |
efraim pushed a commit to branch core-updates-frozen
in repository guix.
commit bc5155b952ae8bdbc56aded4d8d39768b4e2a7d4
Merge: dac8d01 4e50001
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Oct 31 12:47:14 2021 +0200
Merge remote-tracking branch 'origin/master' into core-updates-frozen
Makefile.am | 3 +
doc/build.scm | 8 +-
doc/contributing.texi | 8 +-
doc/guix.texi | 541 +++++++++++-
doc/local.mk | 6 +-
etc/completion/bash/guix | 18 +-
etc/completion/zsh/_guix | 1 +
etc/news.scm | 91 ++-
gnu/installer/newt/partition.scm | 6 +-
gnu/local.mk | 16 +-
gnu/packages/algebra.scm | 36 +-
gnu/packages/animation.scm | 2 +-
gnu/packages/audio.scm | 6 +-
gnu/packages/backup.scm | 10 +-
gnu/packages/bioconductor.scm | 31 +
gnu/packages/bioinformatics.scm | 369 ++++++++-
gnu/packages/bootloaders.scm | 21 +-
gnu/packages/browser-extensions.scm | 4 +-
gnu/packages/c.scm | 4 +-
gnu/packages/cdrom.scm | 8 +-
gnu/packages/chromium.scm | 22 +-
gnu/packages/cran.scm | 180 +++-
gnu/packages/crates-io.scm | 2 +-
gnu/packages/crypto.scm | 49 +-
gnu/packages/debug.scm | 61 +-
gnu/packages/diffoscope.scm | 12 +-
gnu/packages/display-managers.scm | 19 +-
gnu/packages/djvu.scm | 11 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/docbook.scm | 3 +-
gnu/packages/emacs-xyz.scm | 153 ++--
gnu/packages/emacs.scm | 16 +-
gnu/packages/emulators.scm | 4 +-
gnu/packages/engineering.scm | 2 +-
gnu/packages/file-systems.scm | 28 +-
gnu/packages/finance.scm | 16 +-
gnu/packages/firmware.scm | 4 +-
gnu/packages/flashing-tools.scm | 60 +-
gnu/packages/fonts.scm | 64 +-
gnu/packages/fontutils.scm | 32 +-
gnu/packages/freedesktop.scm | 68 +-
gnu/packages/game-development.scm | 17 +-
gnu/packages/games.scm | 11 +-
gnu/packages/genimage.scm | 121 +--
gnu/packages/gimp.scm | 4 +-
gnu/packages/gnome.scm | 7 +-
gnu/packages/gnuzilla.scm | 798 ++++++++++++------
gnu/packages/graphics.scm | 146 +++-
gnu/packages/gstreamer.scm | 2 +-
gnu/packages/hardware.scm | 28 +
gnu/packages/image-processing.scm | 33 +-
gnu/packages/image-viewers.scm | 2 +-
gnu/packages/image.scm | 42 +-
gnu/packages/javascript.scm | 4 +-
gnu/packages/julia-jll.scm | 50 ++
gnu/packages/julia-xyz.scm | 242 +++++-
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/kde.scm | 2 +-
gnu/packages/linux.scm | 116 ++-
gnu/packages/lisp-check.scm | 794 +++++++++++++++++-
gnu/packages/lisp-xyz.scm | 907 ++++-----------------
gnu/packages/mail.scm | 17 +-
gnu/packages/maths.scm | 220 ++++-
gnu/packages/messaging.scm | 21 +-
gnu/packages/multiprecision.scm | 24 +
gnu/packages/music.scm | 48 +-
gnu/packages/networking.scm | 8 +-
gnu/packages/ocaml.scm | 4 +-
gnu/packages/package-management.scm | 22 +-
gnu/packages/parallel.scm | 10 +-
...itcode.patch => diffoscope-fix-llvm-test.patch} | 0
.../patches/disarchive-cross-compilation.patch | 77 --
gnu/packages/patches/flatpak-fix-path.patch | 29 +
...makeicecat.patch => icecat-78-makeicecat.patch} | 0
gnu/packages/patches/icecat-makeicecat.patch | 133 +--
gnu/packages/patches/mupdf-CVE-2021-3407.patch | 51 --
gnu/packages/patches/mupdf-fix-linkage.patch | 27 -
.../patches/python-peachpy-determinism.patch | 25 +
gnu/packages/patches/qemu-fix-agent-paths.patch | 66 ++
.../patches/u-boot-allow-disabling-openssl.patch | 164 ++++
gnu/packages/patches/udiskie-no-appindicator.patch | 155 ----
.../patches/zig-disable-libc-note-test.patch | 31 +
gnu/packages/patches/zig-use-system-paths.patch | 143 ++++
gnu/packages/pdf.scm | 9 +-
gnu/packages/photo.scm | 6 +-
gnu/packages/php.scm | 7 +-
gnu/packages/python-check.scm | 2 +-
gnu/packages/python-web.scm | 9 +-
gnu/packages/python-xyz.scm | 56 +-
gnu/packages/radio.scm | 16 +-
gnu/packages/ruby.scm | 2 +
gnu/packages/scheme.scm | 14 +-
gnu/packages/search.scm | 107 ++-
gnu/packages/security-token.scm | 24 +-
gnu/packages/shellutils.scm | 89 +-
gnu/packages/skarnet.scm | 42 +-
gnu/packages/suckless.scm | 32 +
gnu/packages/task-management.scm | 7 +-
gnu/packages/terminals.scm | 13 +-
gnu/packages/text-editors.scm | 4 +-
gnu/packages/time.scm | 4 +-
gnu/packages/tls.scm | 21 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/version-control.scm | 9 +-
gnu/packages/video.scm | 70 ++
gnu/packages/vim.scm | 58 ++
gnu/packages/virtualization.scm | 74 +-
gnu/packages/vnc.scm | 7 +-
gnu/packages/web-browsers.scm | 1 +
gnu/packages/web.scm | 30 +-
gnu/packages/wm.scm | 5 +-
gnu/packages/xdisorg.scm | 48 +-
gnu/packages/xfce.scm | 25 +
gnu/packages/zig.scm | 104 +++
gnu/services/rsync.scm | 5 +-
guix/build/syscalls.scm | 49 +-
guix/cache.scm | 10 +-
guix/import/cran.scm | 23 +-
guix/lint.scm | 19 +
guix/packages.scm | 101 ++-
guix/profiles.scm | 19 +
guix/scripts/environment.scm | 432 +++++++---
guix/scripts/home.scm | 24 +-
guix/scripts/home/import.scm | 301 +++----
guix/scripts/package.scm | 47 +-
guix/scripts/shell.scm | 394 +++++++++
guix/store.scm | 18 +-
guix/ui.scm | 30 +-
po/guix/POTFILES.in | 1 +
tests/guix-environment-container.sh | 8 +
tests/guix-environment.sh | 7 +
tests/guix-shell.sh | 102 +++
tests/home-import.scm | 187 +++++
tests/lint.scm | 14 +
tests/packages.scm | 14 +
tests/profiles.scm | 7 +
tests/store.scm | 28 +
tests/syscalls.scm | 35 +
138 files changed, 6776 insertions(+), 2600 deletions(-)
diff --cc doc/guix.texi
index 656dc35,ea1973f..85d834a
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@@ -6874,30 -7224,47 +7250,71 @@@ cross-compiling
It is an error to refer to @code{this-package} outside a package definition.
@end deffn
+The following helper procedures are provided to help deal with package
+inputs.
+
+@deffn {Scheme Procedure} lookup-package-input @var{package} @var{name}
+@deffnx {Scheme Procedure} lookup-package-native-input @var{package}
@var{name}
+@deffnx {Scheme Procedure} lookup-package-propagated-input @var{package}
@var{name}
+@deffnx {Scheme Procedure} lookup-package-direct-input @var{package}
@var{name}
+Look up @var{name} among @var{package}'s inputs (or native, propagated,
+or direct inputs). Return it if found, @code{#f} otherwise.
+
+@var{name} is the name of a package depended on. Here's how you might
+use it:
+
+@lisp
+(use-modules (guix packages) (gnu packages base))
+
+(lookup-package-direct-input coreutils "gmp")
+@result{} #<package gmp@@6.2.1 @dots{}>
+@end lisp
+
+In this example we obtain the @code{gmp} package that is among the
+direct inputs of @code{coreutils}.
+@end deffn
+
+ @cindex development inputs, of a package
+ @cindex implicit inputs, of a package
+ Sometimes you will want to obtain the list of inputs needed to
+ @emph{develop} a package---all the inputs that are visible when the
+ package is compiled. This is what the @code{package-development-inputs}
+ procedure returns.
+
+ @deffn {Scheme Procedure} package-development-inputs @var{package} @
+ [@var{system}] [#:target #f]
+ Return the list of inputs required by @var{package} for development
+ purposes on @var{system}. When @var{target} is true, return the inputs
+ needed to cross-compile @var{package} from @var{system} to
+ @var{triplet}, where @var{triplet} is a triplet such as
+ @code{"aarch64-linux-gnu"}.
+
+ Note that the result includes both explicit inputs and implicit
+ inputs---inputs automatically added by the build system (@pxref{Build
+ Systems}). Let us take the @code{hello} package to illustrate that:
+
+ @lisp
+ (use-modules (gnu packages base) (guix packages))
+
+ hello
+ @result{} #<package hello@@2.10 gnu/packages/base.scm:79 7f585d4f6790>
+
+ (package-direct-inputs hello)
+ @result{} ()
+
+ (package-development-inputs hello)
+ @result{} (("source" @dots{}) ("tar" #<package tar@@1.32 @dots{}>) @dots{})
+ @end lisp
+
+ In this example, @code{package-direct-inputs} returns the empty list,
+ because @code{hello} has zero explicit dependencies. Conversely,
+ @code{package-development-inputs} includes inputs implicitly added by
+ @code{gnu-build-system} that are required to build @code{hello}: tar,
+ gzip, GCC, libc, Bash, and more. To visualize it, @command{guix graph
+ hello} would show you explicit inputs, whereas @command{guix graph -t
+ bag hello} would include implicit inputs (@pxref{Invoking guix graph}).
+ @end deffn
+
Because packages are regular Scheme objects that capture a complete
dependency graph and associated build procedures, it is often useful to
write procedures that take a package and return a modified version
diff --cc gnu/local.mk
index 3155338,bbc54ef..3c90bb2
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1000,12 -997,10 +1001,11 @@@ dist_patch_DATA =
%D%/packages/patches/desmume-gcc6-fixes.patch \
%D%/packages/patches/desmume-gcc7-fixes.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
- %D%/packages/patches/diffoscope-fix-test_item3_deflate_llvm_bitcode.patch
\
+ %D%/packages/patches/diffoscope-fix-llvm-test.patch \
%D%/packages/patches/diffutils-gets-undeclared.patch \
- %D%/packages/patches/disarchive-cross-compilation.patch \
%D%/packages/patches/dkimproxy-add-ipv6-support.patch \
%D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \
+ %D%/packages/patches/docbook-xsl-support-old-url.patch \
%D%/packages/patches/doc++-include-directives.patch \
%D%/packages/patches/doc++-segfault-fix.patch \
%D%/packages/patches/docker-fix-tests.patch \
@@@ -1067,8 -1062,9 +1067,9 @@@
%D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \
%D%/packages/patches/fifo-map-remove-catch.hpp.patch \
%D%/packages/patches/findutils-localstatedir.patch \
- %D%/packages/patches/findutils-test-rwlock-threads.patch \
%D%/packages/patches/flann-cmake-3.11.patch \
+ %D%/packages/patches/flatpak-fix-path.patch \
+ %D%/packages/patches/fontconfig-cache-ignore-mtime.patch \
%D%/packages/patches/foobillard++-pkg-config.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \
%D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \
@@@ -1670,11 -1673,10 +1670,12 @@@
%D%/packages/patches/python-cross-compile.patch \
%D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
%D%/packages/patches/python-configobj-setuptools.patch \
+ %D%/packages/patches/python-docopt-pytest6-compat.patch \
%D%/packages/patches/python-execnet-read-only-fix.patch \
+ %D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \
%D%/packages/patches/python-flask-restful-werkzeug-compat.patch \
%D%/packages/patches/python-keras-integration-test.patch \
- %D%/packages/patches/python-peachpy-determinism.patch \
++ %D%/packages/patches/python-peachpy-determinism.patch \
%D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
%D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
%D%/packages/patches/python-flint-includes.patch \
@@@ -1939,7 -1943,11 +1941,9 @@@
%D%/packages/patches/ytfzf-programs.patch \
%D%/packages/patches/ytfzf-updates.patch \
%D%/packages/patches/ytnef-CVE-2021-3403.patch \
- %D%/packages/patches/ytnef-CVE-2021-3404.patch
+ %D%/packages/patches/ytnef-CVE-2021-3404.patch \
+ %D%/packages/patches/zig-disable-libc-note-test.patch \
- %D%/packages/patches/zig-use-system-paths.patch \
- %D%/packages/patches/zstd-CVE-2021-24031_CVE-2021-24032.patch \
- %D%/packages/patches/zziplib-CVE-2018-16548.patch
++ %D%/packages/patches/zig-use-system-paths.patch
MISC_DISTRO_FILES = \
%D%/packages/ld-wrapper.in
diff --cc gnu/packages/cran.scm
index 5ef8813,5384dbc..0280a51
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@@ -31,10 -31,9 +31,10 @@@
;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Magali Lemes <magalilemes00@gmail.com>
- ;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
+ ;;; Copyright © 2020, 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2020 Aniket Patil <aniket112.patil@gmail.com>
;;; Copyright © 2021 Marcel Schilling <marcel.schilling@uni-luebeck.de>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/debug.scm
index fa3a449,c95cd03..ffcbbe9
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@@ -5,9 -5,8 +5,9 @@@
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
- ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
+ ;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/display-managers.scm
index a3095f8,ef5d143..1bfd85b
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@@ -38,9 -37,9 +38,10 @@@
#:use-module (guix build-system trivial)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (guix gexp)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gl)
diff --cc gnu/packages/fontutils.scm
index 053dc18,2b98c64..2644506
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@@ -854,8 -808,10 +854,8 @@@ maintain the Noto Fonts project."
(file-name (git-file-name name version))
(sha256
(base32
- "0z4bqap88pydkgcxrsvm3fmcyhi9x7z8knliarvdcvqlk7qnyzfh"))))
+ "0jh05wzrif7z1xf9jzs8bgf49lpj5zs55agj414bmmwdddk7my7j"))))
(build-system meson-build-system)
- (arguments
- `(#:meson ,meson-0.55))
(native-inputs
`(("check" ,check)
("gcc" ,gcc-10) ;TODO: Remove when the default compiler is > GCC 7.
diff --cc gnu/packages/freedesktop.scm
index 4e1fa2e,bf4bce5..3c61e0b
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -23,9 -23,8 +23,10 @@@
;;; Copyright © 2020 Anders Thuné <asse.97@gmail.com>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+ ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/gnuzilla.scm
index ce53695,3aa39bc..db1c9b0
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -909,8 -908,8 +928,8 @@@ in C/C++."
("libxt" ,libxt)
("libffi" ,libffi)
("ffmpeg" ,ffmpeg)
- ;; UNBUNDLE-ME! ("libvpx" ,libvpx)
- ("icu4c" ,icu4c-67)
+ ("libvpx" ,libvpx)
- ("icu4c" ,icu4c-69)
++ ("icu4c" ,icu4c)
("pixman" ,pixman)
("pulseaudio" ,pulseaudio)
("mesa" ,mesa)
diff --cc gnu/packages/image-processing.scm
index 16dfebb,00b4a3c..bfa2fb4
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@@ -17,7 -17,7 +17,8 @@@
;;; Copyright © 2021 Andy Tai <atai@atai.org>
;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2021 Paul Garlick <pgarlick@tourbillion-technology.com>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+ ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/image.scm
index fce2212,fc021dd..21fba15
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@@ -1179,85 -1169,79 +1179,85 @@@ graphics image formats like PNG, BMP, J
(home-page "http://freeimage.sourceforge.net";)))
(define-public vigra
- (package
- (name "vigra")
- (version "1.11.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
"https://github.com/ukoethe/vigra/releases/download/";
- "Version-" (string-join (string-split version #\.)
"-")
- "/vigra-" version "-src.tar.gz"))
- (patches (search-patches "vigra-python-compat.patch"))
- (sha256 (base32
- "1bqs8vx5i1bzamvv563i24gx2xxdidqyxh9iaj46mbznhc84wmm5"))))
- (build-system cmake-build-system)
- (inputs
- `(("boost" ,boost)
- ("fftw" ,fftw)
- ("fftwf" ,fftwf)
- ("hdf5" ,hdf5)
- ("ilmbase" ,ilmbase) ; propagated by openexr, but needed explicitly
- ; to create a configure-flag
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("libtiff" ,libtiff)
- ("openexr" ,openexr-2)
- ("python" ,python-wrapper)
- ("python-numpy" ,python-numpy)
- ("zlib" ,zlib)))
- (native-inputs
- `(("doxygen" ,doxygen)
- ("python-nose" ,python-nose)
- ("sphinx" ,python-sphinx)))
- (arguments
- `(#:test-target "check"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-broken-tests
- (lambda _
- ;; See https://github.com/ukoethe/vigra/issues/432
- (substitute* "test/fourier/CMakeLists.txt"
- (("VIGRA_ADD_TEST.*") ""))
- ;; This test fails with Numpy 1.15:
- ;; <https://github.com/ukoethe/vigra/issues/436>.
- (substitute* "vigranumpy/test/CMakeLists.txt"
- (("test1\\.py") ""))
- #t)))
- #:configure-flags
- (list "-Wno-dev" ; suppress developer mode with lots of warnings
- (string-append "-DVIGRANUMPY_INSTALL_DIR="
- (assoc-ref %outputs "out")
- "/lib/python"
- ,(version-major+minor (package-version python))
- "/site-packages")
- ;; OpenEXR is not enabled by default.
- "-DWITH_OPENEXR=1"
- ;; Fix rounding error on 32-bit machines
- "-DCMAKE_C_FLAGS=-ffloat-store"
- ;; The header files of ilmbase are not found when included
- ;; by the header files of openexr, and an explicit flag
- ;; needs to be set.
- (string-append "-DCMAKE_CXX_FLAGS=-I"
- (assoc-ref %build-inputs "ilmbase")
- "/include/OpenEXR"
- " -ffloat-store"))))
- (synopsis "Computer vision library")
- (description
- "VIGRA stands for Vision with Generic Algorithms. It is an image
-processing and analysis library that puts its main emphasis on customizable
-algorithms and data structures. It is particularly strong for
-multi-dimensional image processing.")
- (license license:expat)
- (home-page "https://ukoethe.github.io/vigra/";)
- (properties '((max-silent-time . 7200))))) ;2 hours, to avoid timing out
-
+ (let ((commit "9b514fa00a136f5fd81bb57ee9f6293c333ffc1f")
+ (revision "0"))
+ (package
+ (name "vigra")
+ (version (git-version "1.11.1" revision commit))
+ (source
+ (origin
+ ;; The last release is 1.11.1, from 2017. It's becoming more and more
+ ;; difficult to build this old release, and the upstream developers
+ ;; suggest on their home page to build from the Git repo, saying "It
is
+ ;; generally safe to use the 'master' branch of the development
snapshot,
+ ;; as we avoid uploading untested or incompatible changes to this
branch."
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ukoethe/vigra";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256 (base32
+ "1vzlypviala109imwxkp46lqhhxszf79ypfb8wxg6z7g02j7mm73"))))
+ (build-system cmake-build-system)
+ (inputs
+ `(("boost" ,boost)
+ ("fftw" ,fftw)
+ ("fftwf" ,fftwf)
+ ("hdf5" ,hdf5)
+ ("ilmbase" ,ilmbase) ; propagated by openexr, but needed explicitly
+ ; to create a configure-flag
+ ("libjpeg" ,libjpeg-turbo)
+ ("libpng" ,libpng)
+ ("libtiff" ,libtiff)
- ("openexr" ,openexr)
++ ("openexr" ,openexr-2)
+ ("python" ,python-wrapper)
+ ("python-numpy" ,python-numpy)
+ ("zlib" ,zlib)))
+ (native-inputs
+ `(("doxygen" ,doxygen)
+ ("python-nose" ,python-nose)
+ ("sphinx" ,python-sphinx)))
+ (arguments
+ `(#:test-target "check"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-broken-tests
+ (lambda _
+ ;; See https://github.com/ukoethe/vigra/issues/432
+ (substitute* "test/fourier/CMakeLists.txt"
+ (("VIGRA_ADD_TEST.*") ""))
+ ;; This test fails with Numpy 1.15:
+ ;; <https://github.com/ukoethe/vigra/issues/436>.
+ (substitute* "vigranumpy/test/CMakeLists.txt"
+ (("test1\\.py") ""))
+ #t)))
+ #:configure-flags
+ (list "-Wno-dev" ; suppress developer mode with lots of warnings
+ (string-append "-DVIGRANUMPY_INSTALL_DIR="
+ (assoc-ref %outputs "out")
+ "/lib/python"
+ ,(version-major+minor (package-version python))
+ "/site-packages")
+ ;; OpenEXR is not enabled by default.
+ "-DWITH_OPENEXR=1"
+ ;; Fix rounding error on 32-bit machines
+ "-DCMAKE_C_FLAGS=-ffloat-store"
+ ;; The header files of ilmbase are not found when included
+ ;; by the header files of openexr, and an explicit flag
+ ;; needs to be set.
+ (string-append "-DCMAKE_CXX_FLAGS=-I"
+ (assoc-ref %build-inputs "ilmbase")
+ "/include/OpenEXR"
+ " -ffloat-store"))))
+ (synopsis "Computer vision library")
+ (description
+ "VIGRA stands for Vision with Generic Algorithms. It is an image
+ processing and analysis library that puts its main emphasis on customizable
+ algorithms and data structures. It is particularly strong for
+ multi-dimensional image processing.")
+ (license license:expat)
+ (home-page "https://ukoethe.github.io/vigra/";)
+ (properties '((max-silent-time . 7200)))))) ;2 hours, to avoid timing out
(define-public vigra-c
(let* ((commit "66ff4fa5a7d4a77415caa676a45c2c6ea16562e7")
@@@ -2394,11 -2387,18 +2401,18 @@@ Wacom-style graphics tablets."
(let ((out (assoc-ref outputs "out")))
(mkdir (string-append out "/bin"))
(symlink (string-append out "/share/phockup/phockup.py")
- (string-append out "/bin/phockup")))
- #t)))))
+ (string-append out "/bin/phockup")))))
+ (add-after 'install-bin 'wrap-program
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/phockup")
- `("PYTHONPATH" prefix
++ `("GUIX_PYTHONPATH" prefix
+ ,(search-path-as-string->list
- (getenv "PYTHONPATH"))))))))))
++ (getenv "GUIX_PYTHONPATH"))))))))))
(inputs
`(("perl-image-exiftool" ,perl-image-exiftool)
- ("python" ,python)))
+ ("python" ,python)
+ ("python-tqdm" ,python-tqdm)))
(native-inputs
`(("python-pytest" ,python-pytest)
("python-pytest-mock" ,python-pytest-mock)))
diff --cc gnu/packages/linux.scm
index 83761e5,f4c1867..fb7c6f2
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -52,11 -52,7 +52,12 @@@
;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
;;; Copyright © 2021 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
+;;; Copyright © 2021 Josselin Poiret <josselin.poiret@protonmail.ch>
+ ;;; Copyright © 2021 Olivier Dion <olivier.dion@polymtl.ca>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/python-web.scm
index 8783c75,62de043..164886c
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@@ -4577,10 -4587,9 +4577,10 @@@ Python."
(method url-fetch)
(uri (pypi-uri "python-slugify" version))
(sha256
- (base32 "0w22fapghmzk3xdasc4dn7h8sl58l08d1h5zbf72dh80drv1g9b9"))))
+ (base32 "1aww2ncglyii4jkbfjxqhinivawf9zmwifcj32d69gpwp6h86czi"))))
(propagated-inputs
- `(("python-unidecode" ,python-unidecode)))
+ `(("python-unidecode" ,python-unidecode)
+ ("python-text-unidecode" ,python-text-unidecode)))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --cc gnu/packages/tls.scm
index b7f3ddd,f3fce5f..908858f
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -15,11 -15,10 +15,12 @@@
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
+ ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/video.scm
index ebee15e,245007f..3a711f9
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@@ -52,8 -52,8 +52,9 @@@
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
+;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
+ ;;; Copyright © 2021 Robin Templeton <robin@terpri.org>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/virtualization.scm
index 9d005ee,7da6345..51dcea2
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@@ -1535,22 -1563,15 +1538,17 @@@ domains, their live performance and res
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "LIBDIR=" (assoc-ref %outputs "out")
"/lib")
- (string-append "ASCIIDOC=" (assoc-ref %build-inputs "asciidoc")
- "/bin/asciidoc")
+ (string-append "ASCIIDOC="
+ (search-input-file %build-inputs
+ "/bin/asciidoc"))
+ (string-append "PYTHON=python3")
- (string-append "XMLTO=" (assoc-ref %build-inputs "xmlto")
- "/bin/xmlto"))
+ (string-append "XMLTO="
+ (search-input-file %build-input
+ "/bin/xmlto")))
#:phases
(modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key inputs #:allow-other-keys)
- ;; The includes for libnl are located in a sub-directory.
- (setenv "C_INCLUDE_PATH"
- (string-append
- (search-input-directory inputs "/include/libnl3")
- ":" (or (getenv "C_INCLUDE_PATH") "")))))
- (add-after 'configure 'fix-documentation
+ (delete 'configure) ; no configure script
+ (add-after 'unpack 'fix-documentation
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "Documentation/Makefile"
(("-m custom.xsl")
@@@ -1585,15 -1599,14 +1577,14 @@@
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'crit' runs with the correct PYTHONPATH.
- (let* ((out (assoc-ref outputs "out"))
- (path (string-append out
- "/lib/python"
- (string-take (string-take-right
- (assoc-ref inputs
"python") 5) 3)
- "/site-packages:"
- (or (getenv "GUIX_PYTHONPATH") ""))))
+ (let* ((out (assoc-ref outputs "out"))
+ (site (string-append out "/lib/python"
+ ,(version-major+minor
+ (package-version python))
+ "/site-packages"))
- (path (getenv "PYTHONPATH")))
++ (path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/crit")
- `("GUIX_PYTHONPATH" ":" prefix (,path))))))
- `("PYTHONPATH" ":" prefix (,site ,path))))))
++ `("GUIX_PYTHONPATH" ":" prefix (,site ,path))))))
(add-after 'install 'delete-static-libraries
;; Not building/installing these at all doesn't seem to be
supported.
(lambda* (#:key outputs #:allow-other-keys)
diff --cc po/guix/POTFILES.in
index d517d1e,ee0adbc..a8ce6c3
--- a/po/guix/POTFILES.in
+++ b/po/guix/POTFILES.in
@@@ -140,6 -140,6 +140,7 @@@ guix/scripts/offload.sc
guix/scripts/perform-download.scm
guix/scripts/refresh.scm
guix/scripts/repl.scm
+ guix/scripts/shell.scm
+guix/scripts/style.scm
guix/scripts/system/reconfigure.scm
nix/nix-daemon/guix-daemon.cc