[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into core-updates-frozen
|
From: |
guix-commits |
|
Subject: |
02/02: Merge branch 'master' into core-updates-frozen |
|
Date: |
Wed, 11 Aug 2021 19:02:07 -0400 (EDT) |
mbakke pushed a commit to branch core-updates-frozen
in repository guix.
commit c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7
Merge: ffa01e6 4eb0a51
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Aug 12 00:30:27 2021 +0200
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/algebra.scm
gnu/packages/games.scm
gnu/packages/golang.scm
gnu/packages/kerberos.scm
gnu/packages/mail.scm
gnu/packages/python.scm
gnu/packages/ruby.scm
gnu/packages/scheme.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
.dir-locals.el | 2 +
Makefile.am | 1 +
doc/guix.texi | 239 +-
doc/local.mk | 4 +-
etc/committer.scm.in | 60 +-
gnu/build/jami-service.scm | 587 +
gnu/build/shepherd.scm | 14 +-
gnu/local.mk | 22 +-
gnu/packages/admin.scm | 46 -
gnu/packages/algebra.scm | 33 +-
gnu/packages/backup.scm | 34 +-
gnu/packages/bioconductor.scm | 57 +-
gnu/packages/bioinformatics.scm | 80 +-
gnu/packages/bootloaders.scm | 54 +-
gnu/packages/browser-extensions.scm | 8 +-
gnu/packages/chromium.scm | 53 +-
gnu/packages/compression.scm | 13 +-
gnu/packages/cran.scm | 302 +-
gnu/packages/crates-io.scm | 221 +-
gnu/packages/crypto.scm | 2 +-
gnu/packages/databases.scm | 13 +-
gnu/packages/digest.scm | 21 +
gnu/packages/dns.scm | 4 +-
gnu/packages/education.scm | 24 +-
gnu/packages/emacs-xyz.scm | 237 +-
gnu/packages/engineering.scm | 9 +-
gnu/packages/file-systems.scm | 25 +-
gnu/packages/finance.scm | 6 +-
gnu/packages/game-development.scm | 59 +-
gnu/packages/games.scm | 127 +-
gnu/packages/gcc.scm | 4 +-
gnu/packages/gnome.scm | 5 +-
gnu/packages/gnuzilla.scm | 14 +-
gnu/packages/golang.scm | 2636 +-
gnu/packages/gps.scm | 9 +-
gnu/packages/graphics.scm | 4 +-
gnu/packages/guile-xyz.scm | 4 +-
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/ibus.scm | 161 +-
gnu/packages/julia-xyz.scm | 4 +-
gnu/packages/julia.scm | 31 +-
gnu/packages/less.scm | 6 +-
gnu/packages/libusb.scm | 6 +-
gnu/packages/linux.scm | 37 +-
gnu/packages/lisp.scm | 9 +-
gnu/packages/llvm.scm | 39 +
gnu/packages/machine-learning.scm | 438 +-
gnu/packages/mail.scm | 72 +-
gnu/packages/maths.scm | 284 +
gnu/packages/mp3.scm | 6 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/music.scm | 12 +-
gnu/packages/networking.scm | 23 +-
gnu/packages/ocaml.scm | 219 +-
gnu/packages/patches/instead-use-games-path.patch | 32 +
.../patches/llvm-roc-3.0.0-add_libraries.patch | 22 +
...llvm-roc-4.0.0-remove-isystem-usr-include.patch | 29 +
.../patches/llvm-roc-4.2.0-add_Object.patch | 13 +
.../patches/onnx-optimizer-system-library.patch | 53 +
gnu/packages/patches/pypy3-7.3.1-fix-tests.patch | 278 -
gnu/packages/patches/python-pytorch-runpath.patch | 25 +
.../patches/python-pytorch-system-libraries.patch | 131 +
gnu/packages/patches/rapidjson-gcc-compat.patch | 48 +
.../restic-0.9.6-fix-tests-for-go1.15.patch | 51 +
.../patches/rocm-comgr-3.1.0-dependencies.patch | 52 +
.../rocm-opencl-runtime-3.10.0-includes.patch | 14 +
.../patches/rocm-opencl-runtime-4.3-noclinfo.patch | 28 +
.../rocm-opencl-runtime-4.3-nocltrace.patch | 25 +
.../patches/rocm-opencl-runtime-4.3-noopencl.patch | 63 +
.../patches/samba-fix-fcntl-hint-detection.patch | 55 -
.../patches/u-boot-riscv64-fix-extlinux.patch | 4 +-
.../u-boot-sifive-prevent-reloc-initrd-fdt.patch | 16 +
gnu/packages/photo.scm | 28 +-
gnu/packages/prolog.scm | 13 +-
gnu/packages/python-check.scm | 4 +-
gnu/packages/python-crypto.scm | 9 -
gnu/packages/python-web.scm | 56 +-
gnu/packages/python-xyz.scm | 111 +-
gnu/packages/python.scm | 90 +-
gnu/packages/radio.scm | 4 +-
gnu/packages/rocm.scm | 365 +
gnu/packages/ruby.scm | 24 +-
gnu/packages/samba.scm | 22 +-
gnu/packages/scanner.scm | 64 +
gnu/packages/scheme.scm | 17 +-
gnu/packages/serialization.scm | 22 +-
gnu/packages/shells.scm | 636 +-
gnu/packages/spice.scm | 4 +-
gnu/packages/statistics.scm | 33 +
gnu/packages/suckless.scm | 73 +
gnu/packages/syndication.scm | 5 +-
gnu/packages/task-runners.scm | 64 +
gnu/packages/tls.scm | 44 +-
gnu/packages/uucp.scm | 118 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 8 +-
gnu/packages/web-browsers.scm | 8 +-
gnu/packages/web.scm | 9 +-
gnu/packages/xdisorg.scm | 51 +
gnu/packages/xfce.scm | 4 +-
gnu/services/base.scm | 42 +-
gnu/services/configuration.scm | 83 +-
gnu/services/telephony.scm | 684 +-
gnu/tests/data/jami-dummy-account.dat | 392 +
gnu/tests/telephony.scm | 366 +
guix/inferior.scm | 18 +-
guix/licenses.scm | 1 -
guix/scripts/import/cpan.scm | 9 +-
guix/scripts/import/cran.scm | 9 +-
guix/scripts/import/crate.scm | 10 +-
guix/scripts/import/egg.scm | 9 +-
guix/scripts/import/elpa.scm | 9 +-
guix/scripts/import/gem.scm | 9 +-
guix/scripts/import/gnu.scm | 9 +-
guix/scripts/import/go.scm | 9 +-
guix/scripts/import/hackage.scm | 9 +-
guix/scripts/import/json.scm | 9 +-
guix/scripts/import/opam.scm | 9 +-
guix/scripts/import/pypi.scm | 9 +-
guix/scripts/import/stackage.scm | 9 +-
guix/scripts/import/texlive.scm | 9 +-
guix/scripts/publish.scm | 6 +-
guix/scripts/time-machine.scm | 14 +-
guix/self.scm | 15 +-
guix/store.scm | 30 +-
guix/transformations.scm | 45 +-
po/doc/guix-cookbook.de.po | 1439 +-
po/doc/guix-cookbook.fa.po | 1443 +-
po/doc/guix-cookbook.fr.po | 1466 +-
po/doc/guix-cookbook.ko.po | 1447 +-
.../{guix-cookbook.fa.po => guix-cookbook.ru.po} | 1452 +-
...uix-cookbook.zh_Hans.po => guix-cookbook.sk.po} | 1529 +-
po/doc/guix-cookbook.zh_Hans.po | 1442 +-
po/doc/guix-manual.de.po | 24346 +++++++++--------
po/doc/guix-manual.es.po | 24353 +++++++++--------
po/doc/guix-manual.fa.po | 23958 +++++++++--------
po/doc/guix-manual.fr.po | 24230 +++++++++--------
po/doc/guix-manual.it.po | 23937 +++++++++--------
po/doc/guix-manual.ko.po | 24002 +++++++++--------
po/doc/guix-manual.pt_BR.po | 24104 +++++++++--------
po/doc/guix-manual.ru.po | 25951 ++++++++++---------
po/doc/guix-manual.sk.po | 23980 +++++++++--------
po/doc/guix-manual.zh_CN.po | 23994 +++++++++--------
po/doc/local.mk | 2 +
po/guix/cs.po | 1765 +-
po/guix/da.po | 1991 +-
po/guix/de.po | 1555 +-
po/guix/eo.po | 2093 +-
po/guix/es.po | 1804 +-
po/guix/fr.po | 1535 +-
po/guix/hu.po | 2050 +-
po/guix/it.po | 1504 +-
po/guix/ko.po | 1496 +-
po/guix/nl.po | 1760 +-
po/guix/oc.po | 1490 +-
po/guix/pl.po | 1622 +-
po/guix/pt_BR.po | 1613 +-
po/guix/ru.po | 1516 +-
po/guix/si.po | 1490 +-
po/guix/sk.po | 1518 +-
po/guix/sr.po | 2003 +-
po/guix/sv.po | 1807 +-
po/guix/ta.po | 1722 +-
po/guix/vi.po | 2064 +-
po/guix/zh_CN.po | 1783 +-
po/packages/da.po | 5540 ++--
po/packages/de.po | 5423 ++--
po/packages/eo.po | 5471 ++--
po/packages/es.po | 5451 ++--
po/packages/fr.po | 5413 ++--
po/packages/hu.po | 5543 ++--
po/packages/ko.po | 5397 ++--
po/packages/nl.po | 5407 ++--
po/packages/oc.po | 5391 ++--
po/packages/pl.po | 5391 ++--
po/packages/pt_BR.po | 5432 ++--
po/packages/sk.po | 5391 ++--
po/packages/sr.po | 5447 ++--
po/packages/zh_CN.po | 5402 ++--
tests/services/telephony.scm | 446 +
tests/transformations.scm | 30 +-
181 files changed, 202622 insertions(+), 174251 deletions(-)
diff --cc gnu/local.mk
index 35769c6,32ac19d..ddfeb6d
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1232,7 -1260,9 +1236,8 @@@ dist_patch_DATA =
%D%/packages/patches/imagemagick-ReadDCMImage-fix.patch \
%D%/packages/patches/imagemagick-ReadDCMPixels-fix.patch \
%D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \
- %D%/packages/patches/inetutils-hurd.patch \
%D%/packages/patches/inkscape-poppler-0.76.patch \
+ %D%/packages/patches/instead-use-games-path.patch \
%D%/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch \
%D%/packages/patches/intel-xed-fix-nondeterminism.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
@@@ -1486,10 -1518,9 +1494,11 @@@
%D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \
%D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \
%D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \
+ %D%/packages/patches/ocaml-multiple-definitions.patch \
+ %D%/packages/patches/ocaml-4.09-multiple-definitions.patch \
%D%/packages/patches/omake-fix-non-determinism.patch \
%D%/packages/patches/oneko-remove-nonfree-characters.patch \
+ %D%/packages/patches/onnx-optimizer-system-library.patch \
%D%/packages/patches/onnx-use-system-googletest.patch \
%D%/packages/patches/onnx-shared-libraries.patch \
%D%/packages/patches/onnx-skip-model-downloads.patch \
@@@ -1668,7 -1701,17 +1678,12 @@@
%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/rocm-comgr-3.1.0-dependencies.patch \
+ %D%/packages/patches/rocm-opencl-runtime-3.10.0-includes.patch \
+ %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \
+ %D%/packages/patches/rocm-opencl-runtime-4.3-nocltrace.patch \
+ %D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \
%D%/packages/patches/ruby-sanitize-system-libxml.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-ndarray-0.13-remove-blas-src.patch \
diff --cc gnu/packages/algebra.scm
index 97592fd,d794f9b..2d37e52
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@@ -3,8 -3,8 +3,8 @@@
;;; Copyright © 2013, 2015, 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou
<mail@nicolasgoaziou.fr>
;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
- ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
+ ;;; Copyright © 2016, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2019, 2021 Eric Bavier <bavier@posteo.net>
diff --cc gnu/packages/gcc.scm
index 79994cc,493ff26..4a5f8f0
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -607,11 -606,9 +607,11 @@@ It also includes runtime support librar
version "/gcc-" version ".tar.xz"))
(sha256
(base32
- "1pwxrjhsymv90xzh0x42cxfnmhjinf2lnrrf3hj5jq1rm2w6yjjc"))
+ "12zs6vd2rapp42x154m479hg3h3lsafn3xhg06hp5hsldd9xr3nh"))
(patches (search-patches "gcc-9-strmov-store-file-names.patch"
- "gcc-5.0-libvtv-runpath.patch"))))))
+ "gcc-5.0-libvtv-runpath.patch"))
+ (modules '((guix build utils)))
+ (snippet gcc-canadian-cross-objdump-snippet)))))
;; Note: When changing the default gcc version, update
;; the gcc-toolchain-* definitions.
diff --cc gnu/packages/gnuzilla.scm
index 0872ca1,e063b2f..a4d193c
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -1601,9 -1605,9 +1601,9 @@@ standards of the IceCat project."
(file-name (string-append "thunderbird-" version "-checkout"))
(sha256
(base32
- "1nnz90h5w9skpdwm8ilndcwfx9d7k9cn6gzh32y4jil95da13813")))))
+ "1dahf3y8bm3kh7amf341wnmh82a2r0ksqihc6dwiakh6x86a94cm")))))
("autoconf" ,autoconf-2.13)
- ("cargo" ,rust-1.41 "cargo")
+ ("cargo" ,rust "cargo")
("clang" ,clang)
("llvm" ,llvm)
("nasm" ,nasm)
diff --cc gnu/packages/julia.scm
index df8a74f,fe31e54..f5bbb5d
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@@ -339,8 -338,28 +338,28 @@@ libraries. It is also a bit like @code
;; call our version
(substitute* "base/Makefile"
(("\\$\\$\\(build_depsbindir\\)/libwhich")
- (string-append (assoc-ref inputs "libwhich")
"/bin/libwhich")))
+ (search-input-file inputs "/bin/libwhich")))
#t))
+ (add-after 'unpack 'change-number-of-precompile-statements
+ (lambda _
+ ;; Remove nss-certs drops the number of statements below 1200,
+ ;; causing the build to fail prematurely.
+ (substitute* "contrib/generate_precompile.jl"
+ (("1200") "1100"))
+ #t))
+ ;; For some reason libquadmath is unavailable on this architecture.
+ ;; https://github.com/JuliaLang/julia/issues/41613
+ ,@(if (target-aarch64?)
+ '((add-after 'unpack 'drop-libquadmath-on-aarch64
+ (lambda _
+ (substitute* '("contrib/fixup-libgfortran.sh"
+ "deps/csl.mk"
+ "base/Makefile")
+ ((".*libquadmath.*") ""))
+ (substitute* "Makefile"
+ (("libquadmath ") ""))
+ #t)))
+ '())
(add-before 'check 'set-home
;; Some tests require a home directory to be set.
(lambda _ (setenv "HOME" "/tmp") #t))
diff --cc gnu/packages/maths.scm
index a594278,ce9515f..a7931e6
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@@ -141,8 -142,8 +142,9 @@@
#:use-module (gnu packages ruby)
#:use-module (gnu packages tbb)
#:use-module (gnu packages scheme)
+ #:use-module (gnu packages serialization)
#:use-module (gnu packages shells)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages tcl)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages tex)
diff --cc gnu/packages/python.scm
index 9e637a0,4ff3200..28a3c77
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -821,12 -793,10 +825,11 @@@ ease from the desktop to a microcontrol
"/lib/libsqlite3.so.0'")))
(substitute* '("lib-python/3/subprocess.py")
;; Fix shell path
- (("/bin/sh") (which "sh")))
+ (("/bin/sh")
+ (search-input-file inputs "/bin/sh")))
(substitute*
'("lib-python/3/distutils/unixccompiler.py")
;; gcc-toolchain does not provide symlink cc -> gcc
- (("\"cc\"") "\"gcc\""))
- #t))
+ (("\"cc\"") "\"gcc\""))))
(add-after
'unpack 'set-source-file-times-to-1980
;; copied from python package, required by zip testcase
@@@ -845,9 -814,13 +847,10 @@@
(string-append "--make-jobs="
(number->string
(parallel-job-count)))
"-Ojit"
- "targetpypystandalone"))
+ "targetpypystandalone"
+ "--allworkingmodules"))
;; Build c modules and package everything, so tests
work.
(with-directory-excursion "pypy/tool/release"
- (unsetenv "PYTHONPATH") ; Do not use the system’s
python libs:
- ; AttributeError: module 'enum' has no
- ; attribute 'IntFlag'
(invoke "python2" "package.py"
"--archive-name" "pypy-dist"
"--builddir" (getcwd)))))
diff --cc gnu/packages/ruby.scm
index 9eddc60,8db5bd9..2a9fef5
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@@ -153,11 -153,11 +153,11 @@@ a focus on simplicity and productivity.
(define-public ruby-2.7
(package
- (inherit ruby)
+ (inherit ruby-2.6)
- (version "2.7.2")
+ (version "2.7.4")
(source
(origin
- (method url-fetch)
- (inherit (package-source ruby))
++ (inherit (package-source ruby-2.6))
(uri (string-append "https://cache.ruby-lang.org/pub/ruby/";
(version-major+minor version)
"/ruby-" version ".tar.gz"))
@@@ -210,8 -205,8 +205,8 @@@
(define-public ruby-2.5
(package
- (inherit ruby)
+ (inherit ruby-2.6)
- (version "2.5.8")
+ (version "2.5.9")
(source
(origin
(method url-fetch)
diff --cc gnu/packages/scheme.scm
index 3a87dad,c43d172..ea1adb9
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@@ -173,8 -177,10 +173,10 @@@
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
- ("texlive" ,(texlive-updmap.cfg (list texlive-tex-texinfo)))
- ("texlive" ,(texlive-union (list texlive-tex-texinfo
- texlive-epsf)))
++ ("texlive" ,(texlive-updmap.cfg (list texlive-tex-texinfo
++ texlive-epsf)))
("texinfo" ,texinfo)
+ ("ghostscript" ,ghostscript)
("m4" ,m4)))
(inputs
`(("libx11" ,libx11)
diff --cc gnu/packages/spice.scm
index b407a4b,d9daac1..b21394e
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@@ -349,10 -341,21 +349,10 @@@ resolution scaling on graphical consol
(base32
"0azj3rqr2smg0lai24xrn3zr628xmjfrzcggay877zrr64ybj1c0"))))
(build-system meson-build-system)
- (arguments
- '(#:tests? #f ; TODO Tests require gnutls built with
- ; p11-kit
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-tests
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "tests/setup-softhsm2.sh"
- (("\\/usr\\/lib64\\/pkcs11\\/libsofthsm2\\.so")
- (string-append (assoc-ref inputs "softhsm")
- "/lib/softhsm/libsofthsm2.so"))))))))
(propagated-inputs
`(("glib" ,glib) ; Requires: in the pkg-config file
- ("nss" ,nss))) ; Requires.private: in the pkg-config
- ; file
+ ("nss" ,nss) ; Requires.private: in the pkg-config
+ ("pcsc-lite" ,pcsc-lite))) ; file
(native-inputs
`(("openssl" ,openssl)
("nss" ,nss "bin")
diff --cc gnu/packages/statistics.scm
index 8b43fba,5c744f6..804e2e6
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@@ -12,8 -12,8 +12,9 @@@
;;; Copyright © 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2018 Alex Branham <alex.branham@gmail.com>
;;; Copyright © 2020 Tim Howes <timhowes@lavabit.com>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
+ ;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/tls.scm
index fccda07,7a0a9bd..4b8df04
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -4,8 -4,8 +4,8 @@@
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 David Thompson <davet@gnu.org>
- ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Leo Famulari
<leo@famulari.name>
+ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari
<leo@famulari.name>
-;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018 Nikita <nikita@n0.is>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
diff --cc gnu/packages/version-control.scm
index b6f7d5e,9517525..660a219
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -1035,8 -1035,9 +1035,8 @@@ a built-in cache to decrease server I/
(assoc-ref inputs "git") "/bin/git"
"'"))
(("/usr/sbin/sendmail")
- (string-append (assoc-ref inputs "sendmail")
- "/sbin/sendmail")))
- #t)))))
+ (search-input-file inputs
- "/usr/sbin/sendmail"))))))))
++ "/sbin/sendmail"))))))))
(inputs
`(("git" ,git)
("sendmail" ,sendmail)))