[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/03: Merge branch 'staging' into core-updates |
|
Date: |
Thu, 21 Jul 2022 19:59:27 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 9044b086ddca64a62966a83cbf1b82d32dece89e
Merge: 5dfc6ab1ab abea091dbe
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Jul 22 01:09:14 2022 +0200
Merge branch 'staging' into core-updates
.dir-locals.el | 28 +-
.gitignore | 1 +
Makefile.am | 9 +-
configure.ac | 1 +
doc/contributing.texi | 63 +-
doc/guix-cookbook.texi | 53 +-
doc/guix.texi | 375 +-
etc/guix-install.sh | 16 +-
etc/news.scm | 10 +
etc/system-tests.scm | 15 -
etc/teams.scm.in | 310 +
etc/time-travel-manifest.scm | 84 +
gnu/build/chromium-extension.scm | 18 +-
gnu/build/file-systems.scm | 24 +
gnu/home/services.scm | 55 +-
gnu/home/services/guix.scm | 44 +
gnu/home/services/shells.scm | 23 +-
gnu/image.scm | 30 +-
gnu/local.mk | 23 +-
gnu/packages/admin.scm | 41 +-
gnu/packages/aidc.scm | 11 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/astronomy.scm | 45 +
gnu/packages/audio.scm | 180 +-
gnu/packages/autotools.scm | 12 -
gnu/packages/aux-files/linux-libre/5.10-arm64.conf | 2 +-
.../aux-files/linux-libre/5.10-x86_64.conf | 2 +-
gnu/packages/aux-files/linux-libre/5.15-arm64.conf | 2 +-
.../aux-files/linux-libre/5.15-x86_64.conf | 2 +-
.../linux-libre/{5.17-arm.conf => 5.18-arm.conf} | 969 +-
.../{5.17-arm64.conf => 5.18-arm64.conf} | 1043 +-
.../linux-libre/{5.17-i686.conf => 5.18-i686.conf} | 923 +-
.../{5.17-x86_64.conf => 5.18-x86_64.conf} | 959 +-
gnu/packages/aux-files/linux-libre/5.4-arm64.conf | 2 +-
gnu/packages/aux-files/linux-libre/5.4-x86_64.conf | 2 +-
gnu/packages/backup.scm | 2 +-
gnu/packages/bdw-gc.scm | 1 +
gnu/packages/benchmark.scm | 5 +-
gnu/packages/bioconductor.scm | 354 +-
gnu/packages/bioinformatics.scm | 174 +-
gnu/packages/c.scm | 198 +-
gnu/packages/calendar.scm | 19 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/chicken.scm | 51 +
gnu/packages/chromium.scm | 6 +-
gnu/packages/clojure.scm | 1 +
gnu/packages/code.scm | 4 +-
gnu/packages/commencement.scm | 9 +-
gnu/packages/compression.scm | 28 +-
gnu/packages/connman.scm | 38 +-
gnu/packages/cran.scm | 637 +-
gnu/packages/crates-io.scm | 235 +
gnu/packages/curl.scm | 37 +-
gnu/packages/databases.scm | 72 +-
gnu/packages/dav.scm | 6 +-
gnu/packages/dezyne.scm | 4 +-
gnu/packages/diffoscope.scm | 17 +-
gnu/packages/django.scm | 8 +-
gnu/packages/docbook.scm | 48 +-
gnu/packages/docker.scm | 6 +-
gnu/packages/electronics.scm | 2 +-
gnu/packages/emacs-xyz.scm | 1159 +-
gnu/packages/embedded.scm | 2 +-
gnu/packages/emulators.scm | 8 +-
gnu/packages/engineering.scm | 107 +-
gnu/packages/enlightenment.scm | 2 +-
gnu/packages/file-systems.scm | 26 +-
gnu/packages/finance.scm | 122 +
gnu/packages/firmware.scm | 4 +-
gnu/packages/fonts.scm | 25 +-
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/fribidi.scm | 4 +-
gnu/packages/game-development.scm | 47 +-
gnu/packages/games.scm | 144 +-
gnu/packages/gawk.scm | 130 +-
gnu/packages/geo.scm | 108 +-
gnu/packages/gl.scm | 69 +-
gnu/packages/glib.scm | 2 +-
gnu/packages/gnome-xyz.scm | 2 +-
gnu/packages/gnome.scm | 518 +-
gnu/packages/gnuzilla.scm | 27 +-
gnu/packages/golang.scm | 52 +-
gnu/packages/gps.scm | 4 +-
gnu/packages/graph.scm | 4 +-
gnu/packages/gstreamer.scm | 8 +-
gnu/packages/gtk.scm | 191 +-
gnu/packages/guile-xyz.scm | 19 +-
gnu/packages/hardware.scm | 33 +-
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/ibus.scm | 41 +-
gnu/packages/icu4c.scm | 18 +-
gnu/packages/image-processing.scm | 10 +-
gnu/packages/image-viewers.scm | 21 +-
gnu/packages/image.scm | 35 +-
gnu/packages/inkscape.scm | 388 +-
gnu/packages/irc.scm | 13 +-
gnu/packages/iso-codes.scm | 13 +-
gnu/packages/jami.scm | 2 +-
gnu/packages/java.scm | 8 +-
gnu/packages/julia-xyz.scm | 103 +-
gnu/packages/jupyter.scm | 40 +-
gnu/packages/kde-multimedia.scm | 17 +-
gnu/packages/kde-plasma.scm | 29 +-
gnu/packages/kde-utils.scm | 7 +-
gnu/packages/libffi.scm | 16 +-
gnu/packages/libunwind.scm | 14 +-
gnu/packages/linux.scm | 292 +-
gnu/packages/lisp-check.scm | 30 +-
gnu/packages/lisp-xyz.scm | 1397 +-
gnu/packages/lisp.scm | 119 +-
gnu/packages/llvm.scm | 146 +-
gnu/packages/machine-learning.scm | 314 +-
gnu/packages/mail.scm | 10 +-
gnu/packages/maths.scm | 251 +-
gnu/packages/messaging.scm | 188 +-
gnu/packages/monitoring.scm | 61 +
gnu/packages/mpi.scm | 16 +-
gnu/packages/music.scm | 158 +-
gnu/packages/networking.scm | 58 +-
gnu/packages/nim.scm | 4 +-
gnu/packages/node-xyz.scm | 243 +
gnu/packages/nss.scm | 202 +-
gnu/packages/ocaml.scm | 210 +-
gnu/packages/package-management.scm | 18 +-
gnu/packages/parallel.scm | 16 +-
gnu/packages/patches/abcl-fix-build-xml.patch | 12 +-
.../clang-runtime-3.7-fix-build-with-python3.patch | 16 +
.../patches/containerd-create-pid-file.patch | 31 +
gnu/packages/patches/curl-easy-lock.patch | 31 +
.../patches/emacs-hyperbole-toggle-messaging.patch | 86 -
gnu/packages/patches/freeglut-gcc-compat.patch | 53 -
...libgeotiff-adapt-test-script-for-proj-6.2.patch | 63 -
.../patches/llvm-3.x.1-fix-build-with-gcc.patch | 15 +
.../patches/llvm-8-fix-build-with-gcc-10.patch | 34 +
gnu/packages/patches/mcrl2-fix-1687.patch | 337 +
.../patches/mcrl2-fix-counterexample.patch | 32 +
gnu/packages/patches/mia-vtk9.patch | 64 +
gnu/packages/patches/mrustc-riscv64-support.patch | 48 +
.../patches/pitivi-fix-build-with-meson-0.60.patch | 46 -
gnu/packages/patches/pokerth-boost.patch | 38 +
.../patches/postgresql-riscv-spinlocks.patch | 41 -
gnu/packages/patches/python-pytorch-runpath.patch | 25 +-
.../patches/python-pytorch-system-libraries.patch | 32 +-
gnu/packages/patches/rustc-1.39.0-src.patch | 99 -
gnu/packages/patches/rustc-1.54.0-src.patch | 117 +
gnu/packages/patches/tbb-other-arches.patch | 41 +
.../xf86-video-mach64-bool-to-boolean.patch | 79 -
.../patches/xf86-video-mach64-glibc-2.20.patch | 17 -
.../patches/xnnpack-system-libraries.patch | 906 +-
gnu/packages/perl.scm | 23 +-
gnu/packages/photo.scm | 4 +-
gnu/packages/plotutils.scm | 4 +-
gnu/packages/polkit.scm | 10 +-
gnu/packages/pretty-print.scm | 14 +
gnu/packages/protobuf.scm | 8 +-
gnu/packages/python-check.scm | 20 +
gnu/packages/python-crypto.scm | 4 +-
gnu/packages/python-science.scm | 72 +-
gnu/packages/python-web.scm | 166 +-
gnu/packages/python-xyz.scm | 277 +-
gnu/packages/python.scm | 2 +-
gnu/packages/qt.scm | 429 +-
gnu/packages/radio.scm | 129 +-
gnu/packages/rocm.scm | 45 -
gnu/packages/ruby.scm | 221 +
gnu/packages/rust.scm | 262 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/search.scm | 36 +-
gnu/packages/shells.scm | 46 +-
gnu/packages/slang.scm | 92 +-
gnu/packages/solidity.scm | 98 +-
gnu/packages/sphinx.scm | 6 +-
gnu/packages/sqlite.scm | 12 +
gnu/packages/sssd.scm | 4 +-
gnu/packages/statistics.scm | 81 +-
gnu/packages/suckless.scm | 53 +
gnu/packages/syncthing.scm | 4 +-
gnu/packages/tbb.scm | 10 +-
gnu/packages/tex.scm | 218 +-
gnu/packages/text-editors.scm | 105 +-
gnu/packages/textutils.scm | 49 +
gnu/packages/tls.scm | 24 +-
gnu/packages/tor.scm | 182 +-
gnu/packages/toys.scm | 41 +
gnu/packages/tryton.scm | 67 +
gnu/packages/version-control.scm | 43 +-
gnu/packages/video.scm | 404 +-
gnu/packages/vim.scm | 4 +-
gnu/packages/vpn.scm | 122 +-
gnu/packages/web.scm | 24 +-
gnu/packages/webkit.scm | 6 +-
gnu/packages/wm.scm | 57 +
gnu/packages/xfce.scm | 28 +-
gnu/packages/xml.scm | 9 +-
gnu/packages/xorg.scm | 218 +-
gnu/services/base.scm | 59 +-
gnu/services/docker.scm | 5 +-
gnu/services/guix.scm | 14 +-
gnu/services/networking.scm | 47 +-
gnu/services/ssh.scm | 20 +-
gnu/services/web.scm | 124 +-
gnu/system.scm | 1 +
gnu/system/image.scm | 16 +-
gnu/tests/base.scm | 144 +-
gnu/tests/guix.scm | 21 +-
guix.scm | 3 +-
guix/build/profiles.scm | 34 +-
guix/channels.scm | 15 +-
guix/import/egg.scm | 9 +-
guix/import/github.scm | 5 +-
guix/import/pypi.scm | 8 +-
guix/import/texlive.scm | 20 +-
guix/import/utils.scm | 2 +
guix/inferior.scm | 12 +-
guix/monad-repl.scm | 64 +-
guix/monads.scm | 18 +-
guix/profiles.scm | 236 +-
guix/scripts/challenge.scm | 5 +-
guix/scripts/home.scm | 64 +-
guix/scripts/import/texlive.scm | 25 +-
guix/scripts/package.scm | 33 +-
guix/scripts/shell.scm | 5 +
guix/scripts/style.scm | 36 +-
guix/scripts/system.scm | 67 +-
guix/upstream.scm | 25 +-
guix/utils.scm | 6 +-
po/doc/guix-cookbook.de.po | 1306 +-
po/doc/guix-cookbook.fr.po | 1305 +-
po/doc/guix-cookbook.ko.po | 1282 +-
po/doc/guix-cookbook.sk.po | 1298 +-
po/doc/guix-manual.de.po | 28327 ++++---
po/doc/guix-manual.es.po | 27589 ++++---
po/doc/guix-manual.fr.po | 82064 +++++++++++++------
po/doc/guix-manual.pt_BR.po | 27360 ++++---
po/doc/guix-manual.ru.po | 27446 ++++---
po/doc/guix-manual.zh_CN.po | 27337 +++---
po/guix/LINGUAS | 1 +
po/guix/cs.po | 691 +-
po/guix/da.po | 712 +-
po/guix/de.po | 818 +-
po/guix/eo.po | 710 +-
po/guix/es.po | 724 +-
po/guix/fa.po | 690 +-
po/guix/fi.po | 694 +-
po/guix/fr.po | 713 +-
po/guix/hu.po | 708 +-
po/guix/it.po | 847 +-
po/guix/ja.po | 690 +-
po/guix/ko.po | 713 +-
po/guix/nl.po | 769 +-
po/guix/oc.po | 690 +-
po/guix/pl.po | 691 +-
po/guix/pt_BR.po | 1359 +-
po/guix/ru.po | 694 +-
po/guix/si.po | 690 +-
po/guix/sk.po | 831 +-
po/guix/sr.po | 697 +-
po/guix/sv.po | 711 +-
po/guix/ta.po | 719 +-
po/guix/{oc.po => tr.po} | 938 +-
po/guix/uk.po | 690 +-
po/guix/vi.po | 709 +-
po/packages/da.po | 4407 +-
po/packages/de.po | 4409 +-
po/packages/eo.po | 4405 +-
po/packages/es.po | 4415 +-
po/packages/fa.po | 4403 +-
po/packages/fi.po | 4407 +-
po/packages/fr.po | 4405 +-
po/packages/hu.po | 4407 +-
po/packages/it.po | 4409 +-
po/packages/ko.po | 4405 +-
po/packages/nl.po | 4407 +-
po/packages/oc.po | 4409 +-
po/packages/pl.po | 4403 +-
po/packages/pt_BR.po | 4403 +-
po/packages/sk.po | 4409 +-
po/packages/sr.po | 4403 +-
po/packages/tr.po | 4472 +-
po/packages/zh_CN.po | 4409 +-
tests/build-emacs-utils.scm | 7 +-
tests/graph.scm | 24 +-
tests/guix-home.sh | 8 +
tests/inferior.scm | 39 +-
tests/monads.scm | 15 +-
tests/profiles.scm | 80 +-
tests/records.scm | 12 +-
tests/services/telephony.scm | 391 -
tests/style.scm | 19 +
289 files changed, 201587 insertions(+), 144431 deletions(-)
diff --cc gnu/local.mk
index 65d23fd120,2bcf966101..882712fd5e
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1578,9 -1593,11 +1585,9 @@@ dist_patch_DATA =
%D%/packages/patches/pam-krb5-CVE-2020-10595.patch \
%D%/packages/patches/pango-skip-libthai-test.patch \
%D%/packages/patches/password-store-tree-compat.patch \
- %D%/packages/patches/pitivi-fix-build-with-meson-0.60.patch \
- %D%/packages/patches/pciutils-hurd-configure.patch \
- %D%/packages/patches/pciutils-hurd-fix.patch \
%D%/packages/patches/pjproject-install-libpjsua2.patch \
%D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
+ %D%/packages/patches/pokerth-boost.patch \
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
%D%/packages/patches/pthreadpool-system-libraries.patch \
%D%/packages/patches/python-chai-drop-python2.patch \
diff --cc gnu/packages/bdw-gc.scm
index 66ed119b87,c812248e86..cfa037dec0
--- a/gnu/packages/bdw-gc.scm
+++ b/gnu/packages/bdw-gc.scm
@@@ -3,7 -3,8 +3,8 @@@
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
-;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
+ ;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/curl.scm
index dd4e9f76a5,d82d94abff..4f3a803d67
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -62,10 -63,11 +63,11 @@@
(define-public curl
(package
(name "curl")
- (version "7.79.1")
+ (version "7.82.0")
+ (replacement curl-7.84.0)
(source (origin
(method url-fetch)
- (uri (string-append "https://curl.haxx.se/download/curl-";
+ (uri (string-append "https://curl.se/download/curl-";
version ".tar.xz"))
(sha256
(base32
diff --cc gnu/packages/diffoscope.scm
index 0c4acdee0b,2dc3cfad0f..f7190a32a0
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@@ -171,9 -173,19 +172,15 @@@
docx2txt
dtc
e2fsprogs
-- ffmpeg
- fpc
- gettext-minimal
-
- ;; XXX: Must be the same version as python-magic uses;
- ;; remove when 'file' is updated.
- file-next)
++ ffmpeg)
+
+ (match (%current-system)
+ ;; fpc is only available on x86 currently.
+ ((or "x86_64-linux" "i686-linux")
+ (list fpc))
+ (_ '()))
+
+ (list gettext-minimal
ghostscript
`(,giflib "bin")
gnumeric
diff --cc gnu/packages/docbook.scm
index 91a5e55887,ae0ea07dbf..149144c145
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@@ -486,33 -476,37 +486,33 @@@ the in DocBook SGML DTDs."
;; TODO: Add xfig/transfig for fig2dev utility
(inputs
`(("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
- texlive-latex-anysize
- texlive-latex-appendix
- texlive-latex-bookmark
- texlive-latex-changebar
- texlive-latex-colortbl
- texlive-latex-fancybox
- texlive-fancyhdr
- texlive-fancyvrb
- texlive-latex-float
- texlive-latex-footmisc
- texlive-hyperref
- texlive-latex-jknapltx
- texlive-listings
- texlive-latex-multirow
- texlive-latex-overpic
- texlive-pdfpages
- texlive-refcount
- texlive-subfigure
- texlive-titlesec
- texlive-wasysym
+ texlive-latex-anysize
+ texlive-latex-appendix
+ texlive-latex-bookmark
+ texlive-latex-changebar
+ texlive-latex-colortbl
+ texlive-latex-fancybox
- texlive-latex-fancyhdr
- texlive-latex-fancyvrb
++ texlive-fancyhdr
++ texlive-fancyvrb
+ texlive-latex-float
+ texlive-latex-footmisc
+ texlive-hyperref
+ texlive-latex-jknapltx
-
- ;; TODO: Use non-deprecated name
on
- ;; next rebuild cycle.
- texlive-latex-listings
-
++ texlive-listings
+ texlive-latex-multirow
+ texlive-latex-overpic
- texlive-latex-pdfpages
- texlive-latex-refcount
- texlive-latex-subfigure
- texlive-latex-titlesec
++ texlive-pdfpages
++ texlive-refcount
++ texlive-subfigure
++ texlive-titlesec
+ texlive-wasysym
- texlive-fonts-rsfs
- texlive-stmaryrd
+ texlive-fonts-rsfs
+ texlive-stmaryrd
- texlive-iftex)))
- texlive-generic-iftex)))
++ texlive-iftex)))
("imagemagick" ,imagemagick) ;for convert
- ("inkscape" ,inkscape) ;for svg conversion
+ ("inkscape" ,inkscape/stable) ;for svg conversion
("docbook" ,docbook-xml)
("libxslt" ,libxslt))) ;for xsltproc
(arguments
diff --cc gnu/packages/gawk.scm
index 55759f47ff,9feaf059fb..0368e38362
--- a/gnu/packages/gawk.scm
+++ b/gnu/packages/gawk.scm
@@@ -2,7 -2,8 +2,8 @@@
;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2021, 2022 Marius Bakke <marius@gnu.org>
+ ;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -20,13 -21,18 +21,19 @@@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages gawk)
- #:use-module (guix licenses)
+ #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
+ #:use-module (gnu packages base)
#:use-module (gnu packages bash)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages libsigsegv)
+ #:use-module (gnu packages multiprecision)
#:use-module (guix packages)
+ #:use-module (guix gexp)
#:use-module (guix download)
+ #:use-module (guix git-download)
+ #:use-module (guix utils)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system gnu))
(define-public gawk
diff --cc gnu/packages/glib.scm
index e774781227,820a44cbde..7fd43221f3
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@@ -607,14 -611,16 +607,14 @@@ The intltool collection can be used to
(inputs
(list libxml2 python-libxml2 python))
(arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'install 'wrap-program
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((prog (string-append (assoc-ref outputs "out")
- "/bin/itstool")))
- (wrap-program prog
- `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))))
- #t))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'wrap-program
+ (lambda _
+ (wrap-program (string-append #$output "/bin/itstool")
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))))))))
- (home-page "http://www.itstool.org";)
+ (home-page "https://itstool.org";)
(synopsis "Tool to translate XML documents with PO files")
(description
"ITS Tool allows you to translate your XML documents with PO files, using
diff --cc gnu/packages/gtk.scm
index 81d34a5151,cc25fac2aa..2cd4e77c34
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -248,37 -286,25 +248,50 @@@ output. Experimental backends include
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/harfbuzz/harfbuzz";
- "/releases/download/" version
- "/harfbuzz-" version ".tar.xz"))
+ "/releases/download/" version "/harfbuzz-"
+ version ".tar.xz"))
(sha256
(base32
- "0lprrl8iih8ji1n17xwm5llz05a1hv4g04b7a3y229dq9myahn3i"))))))
+ "1vn9id3i5196bq9q8xpcpzavk0a2xqff5k973pq54blv16n37g65"))))
+ (build-system gnu-build-system)
+ (outputs '("out"
+ "bin")) ;160K, only hb-view depend on cairo
+ (inputs
+ (list cairo))
+ (propagated-inputs
+ ;; There are all in the Requires or Requires.private field of '.pc'.
+ (list glib graphite2 icu4c))
+ (native-inputs
+ (list `(,glib "bin") ;for glib-mkenums
+ gobject-introspection
+ pkg-config
+ python-wrapper
+ which))
+ (arguments
+ (list #:configure-flags
+ #~(list "--with-graphite2"
+ "--with-gobject"
+ (string-append "--bindir=" #$output:bin "/bin"))))
+ (synopsis "OpenType text shaping engine")
+ (description
+ "HarfBuzz is an OpenType text shaping engine.")
+ (license (license:x11-style "file://COPYING"
+ "See 'COPYING' in the distribution."))
+ (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/";)))
+ (define-public harfbuzz-4
+ (package
+ (inherit harfbuzz)
+ (version "4.3.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/harfbuzz/harfbuzz";
+ "/releases/download/" version
+ "/harfbuzz-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0c5mzwgz43d37h75p4b6cgjg4v24jdd96i7gjpgxirn8qks2i5m4"))))))
+
(define-public libdatrie
(package
(name "libdatrie")
@@@ -1198,31 -1297,31 +1267,31 @@@ application suites."
libtiff
python
rest
- tracker)) ;for filechooser search support
+ tracker)) ;for filechooser search support
(propagated-inputs
;; Following dependencies are referenced in .pc files.
- `(("cairo" ,cairo)
- ("fontconfig" ,fontconfig)
- ("librsvg" ,librsvg)
- ("glib" ,glib)
- ("graphene" ,graphene)
- ("libepoxy" ,libepoxy)
- ("libx11" ,libx11) ;for x11 display-backend
- ("libxcomposite" ,libxcomposite)
- ("libxcursor" ,libxcursor)
- ("libxdamage" ,libxdamage)
- ("libxext" ,libxext)
- ("libxfixes" ,libxfixes)
- ("libxi" ,libxi)
- ("libxinerama" ,libxinerama) ;for xinerama support
- ("libxkbcommon" ,libxkbcommon)
- ("libxrandr" ,libxrandr)
- ("libxrender" ,libxrender)
- ("pango" ,pango)
- ("vulkan-headers" ,vulkan-headers)
- ("vulkan-loader" ,vulkan-loader) ;for vulkan graphics API support
- ("wayland" ,wayland) ;for wayland display-backend
- ("wayland-protocols" ,wayland-protocols)))
+ (list cairo
+ fontconfig
+ librsvg
+ glib
+ graphene
+ libepoxy
+ libx11 ;for x11 display-backend
+ libxcomposite
+ libxcursor
+ libxdamage
+ libxext
+ libxfixes
+ libxi
+ libxinerama ;for xinerama support
+ libxkbcommon
+ libxrandr
+ libxrender
- pango-next
++ pango
+ vulkan-headers
+ vulkan-loader ;for vulkan graphics API support
+ wayland ;for wayland display-backend
+ wayland-protocols))
(native-search-paths
(list
(search-path-specification
diff --cc gnu/packages/icu4c.scm
index 2be431512f,94a72fac15..2e00b6ba26
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@@ -1,10 -1,10 +1,10 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
- ;;; Copyright © 2016, 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
+ ;;; Copyright © 2016, 2017, 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
@@@ -119,24 -136,22 +119,38 @@@ C/C++ part."
"-src.tgz"))
(sha256
(base32
- "1m9zgkaf5lyh65nyc6n0n5bs2f5k53nnj1ih6nskpwbvq4l5884d"))))))
+ "1m9zgkaf5lyh65nyc6n0n5bs2f5k53nnj1ih6nskpwbvq4l5884d"))))
+ (arguments
+ (if (target-riscv64?)
+ (substitute-keyword-arguments (package-arguments icu4c)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'disable-failing-test
+ ;; It is unknown why these tests are failing.
+ (lambda _
+ (substitute* "source/test/cintltst/ucptrietest.c"
+ ((".*addTest.*") ""))
+ (substitute* "source/test/intltest/numbertest_api.cpp"
+ (("(TESTCASE_AUTO\\(unitUsage\\));" all)
+ (string-append "//" all))))))))
+ (package-arguments icu4c)))))
+(define-public icu4c-69
+ (package
+ (inherit icu4c)
+ (version "69.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+
"https://github.com/unicode-org/icu/releases/download/release-";
+ (string-map (lambda (x) (if (char=? x #\.) #\- x))
version)
+ "/icu4c-"
+ (string-map (lambda (x) (if (char=? x #\.) #\_ x))
version)
+ "-src.tgz"))
+ (sha256
+ (base32
+ "0icps0avkwy5df3wwc5kybxcg63hcgk4phdh9g244g0xrmx7pfjc"))))))
+
(define-public icu4c-67
(package
(inherit icu4c)
diff --cc gnu/packages/nss.scm
index b18c9213a3,23bd2cb2a7..bc628f536b
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@@ -41,43 -40,52 +41,43 @@@
(define-public nspr
(package
(name "nspr")
- (version "4.31")
+ (version "4.34")
(source (origin
- (method url-fetch)
- (uri (string-append
- "https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v";
- version "/src/nspr-" version ".tar.gz"))
- (sha256
- (base32
- "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap"))))
+ (method url-fetch)
+ (uri (string-append
+ "https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v";
+ version "/src/nspr-" version ".tar.gz"))
+ (sha256
+ (base32
+ "177rxcf3lglabs7sgwcvf72ww4v56qa71lc495wl13sxs4f03vxy"))))
- (build-system gnu-build-system)
+ (build-system mozilla-build-system)
(inputs
- ;; For 'compile-et.pl' and 'nspr-config'.
- (list perl ;for 'compile-et.pl'
- bash-minimal)) ;for 'nspr-config'
+ (list perl ;for 'compile-et.pl'
+ bash-minimal)) ;for 'nspr-config'
(native-inputs
(list perl))
(arguments
- `(;; Prevent the 'native' perl from sneaking into the closure.
- ;; XXX it would be nice to do the same for 'bash-minimal',
- ;; but using 'canonical-package' causes loops.
- ,@(if (%current-target-system)
- `(#:disallowed-references
- (,(gexp-input (this-package-native-input "perl") #:native?
#t)))
- '())
- #:tests? #f ; no check target
- #:configure-flags
- (list "--disable-static"
- "--enable-64bit"
- (string-append "LDFLAGS=-Wl,-rpath="
- (assoc-ref %outputs "out") "/lib"))
- ;; Use fixed timestamps for reproducibility.
- #:make-flags '("SH_DATE='1970-01-01 00:00:01'"
- ;; This is epoch 1 in microseconds.
- "SH_NOW=100000")
- #:phases (modify-phases %standard-phases
- (add-before 'configure 'chdir
- (lambda _ (chdir "nspr") #t)))))
+ (list
+ ;; Prevent the 'native' perl from sneaking into the closure.
+ ;; XXX it would be nice to do the same for 'bash-minimal',
+ ;; but using 'canonical-package' causes loops.
+ #:disallowed-references
+ (if (%current-target-system)
+ (list (gexp-input (this-package-native-input "perl") #:native? #t))
+ #f)
+ #:tests? #f ;no check target
+ #:configure-flags
+ #~(list "--disable-static"
+ "--enable-64bit"
+ (string-append "LDFLAGS=-Wl,-rpath="
- (assoc-ref %outputs "out") "/lib")
- ;; Mozilla deviates from Autotools conventions
- ;; due to historical reasons. Adjust to Mozilla conventions,
- ;; otherwise the Makefile will try to use TARGET-gcc
- ;; as a ‘native’ compiler.
- #$@(if (%current-target-system)
- #~((string-append "--host="
- #$(nix-system->gnu-triplet
(%current-system)))
- (string-append "--target="
#$(%current-target-system)))
- #~()))
++ (assoc-ref %outputs "out") "/lib"))
+ ;; Use fixed timestamps for reproducibility.
+ #:make-flags #~'("SH_DATE='1970-01-01 00:00:01'"
+ ;; This is epoch 1 in microseconds.
+ "SH_NOW=100000")
+ #:phases #~(modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _ (chdir "nspr") #t)))))
(home-page
"https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR";)
(synopsis "Netscape API for system level and libc-like functions")
diff --cc gnu/packages/python-xyz.scm
index a4a090be7c,fcac915282..22c118524d
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -13049,47 -13151,14 +13151,15 @@@ time."
"and not test_execute_widgets_from_nbconvert "
"and not test_execute_multiple_notebooks ")))))))))
(inputs
- (list inkscape pandoc))
+ (list inkscape/stable pandoc))
(native-inputs
- `(("python-ipykernel" ,python-ipykernel)
- ;; XXX: Disabled, not in guix.
- ;;("python-pyppeteer" ,python-pyppeteer)
- ("python-pytest" ,python-pytest)
- ("python-pytest-cov" ,python-pytest-cov)
- ("python-pytest-dependency" ,python-pytest-dependency)
- ("texlive" ,(texlive-updmap.cfg
- (list texlive-adjustbox
- texlive-amsfonts
- texlive-booktabs
- texlive-caption
- texlive-eurosym
- texlive-fancyvrb
- texlive-fonts-rsfs
- texlive-fontspec
- texlive-grffile
- texlive-hyperref
- texlive-iftex
- texlive-jknappen
- texlive-amsmath
- texlive-enumitem
- texlive-latex-float
- texlive-latex-geometry
- texlive-latex-jknapltx
- texlive-latex-parskip
- texlive-latex-trimspaces
- texlive-latex-ucs
- texlive-latex-upquote
- texlive-lm
- texlive-mathpazo
- texlive-ms
- texlive-oberdiek
- texlive-stringenc
- texlive-tcolorbox
- texlive-titling
- texlive-tools
- texlive-ulem
- texlive-xcolor
- texlive-zapfding)))))
+ (list python-ipykernel
+ ;; Adding ipywidgets would create a cycle.
+ ;;python-ipywidgets
- ;;python-pyppeteer ;TODO: package me
++ ;; XXX: Disabled, not in guix.
++ ;;python-pyppeteer
+ python-pytest
+ python-pytest-xdist))
(propagated-inputs
(list python-beautifulsoup4
python-bleach
diff --cc gnu/packages/radio.scm
index 1eeabbb809,a694bc0050..dd9ab151ed
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@@ -551,57 -553,60 +553,60 @@@ used by RDS Spy, and audio files contai
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "01wyqazrpphmb0fl69j93k0w4vm4d1l4177m1fyg7qx8hzia0aaq"))))
+ (base32 "0xdhb2blzajxpi0f2ch23hh6bzdwz5q7syi3bmiqzdjlj2yjfzd4"))))
(build-system cmake-build-system)
(native-inputs
- `(("doxygen" ,doxygen)
- ("ghostscript" ,ghostscript)
- ("js-mathjax" ,js-mathjax)
- ("orc" ,orc)
- ("pkg-config" ,pkg-config)
- ("pybind11" ,pybind11)
- ("python-cheetah" ,python-cheetah)
- ("python-mako" ,python-mako)
- ("python-pyzmq" ,python-pyzmq)
- ("python-scipy" ,python-scipy)
- ("python-sphinx" ,python-sphinx)
- ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts
- texlive-amsmath
- ;; TODO: Add newunicodechar.
- texlive-graphics)))
- ("xorg-server" ,xorg-server-for-tests)))
+ (list doxygen
+ ghostscript
+ js-mathjax
+ orc
+ pkg-config
+ pybind11
+ python-cheetah
+ python-mako
+ python-pyzmq
+ python-scipy
+ python-sphinx
+ (texlive-updmap.cfg (list texlive-amsfonts
+ texlive-amsmath
+ ;; TODO: Add newunicodechar.
- texlive-latex-graphics))
++ texlive-graphics))
+ xorg-server-for-tests))
(inputs
- `(("alsa-lib" ,alsa-lib)
- ("boost" ,boost)
- ("cairo" ,cairo)
- ("codec2" ,codec2)
- ("cppzmq" ,cppzmq)
- ("fftwf" ,fftwf)
- ("gmp" ,gmp)
- ("gsl" ,gsl)
- ("gsm" ,gsm)
- ("gtk+" ,gtk+)
- ("jack" ,jack-1)
- ("libsndfile" ,libsndfile)
- ("log4cpp" ,log4cpp)
- ("pango" ,pango)
- ("portaudio" ,portaudio)
- ("python" ,python)
- ("python-click" ,python-click)
- ("python-click-plugins" ,python-click-plugins)
- ("python-lxml" ,python-lxml)
- ("python-matplotlib" ,python-matplotlib)
- ("python-numpy" ,python-numpy)
- ("python-pycairo" ,python-pycairo)
- ("python-pygobject" ,python-pygobject)
- ("python-pyqt" ,python-pyqt-without-qtwebkit)
- ("python-pyqtgraph" ,python-pyqtgraph)
- ("python-pyyaml" ,python-pyyaml)
- ("qtbase" ,qtbase-5)
- ("qwt" ,qwt)
- ("sdl" ,sdl)
- ("volk" ,volk)
- ("zeromq" ,zeromq)))
+ (list alsa-lib
+ boost
+ cairo
+ codec2
+ cppzmq
+ fftwf
+ gmp
+ gsl
+ gsm
+ gtk+
+ jack-1
+ libsndfile
+ log4cpp
+ pango
+ portaudio
+ python
+ python-click
+ python-click-plugins
+ python-jsonschema
+ python-lxml
+ python-matplotlib
+ python-numpy
+ python-pycairo
+ python-pygobject
+ python-pyqt-without-qtwebkit
+ python-pyqtgraph
+ python-pyyaml
+ qtbase-5
+ qwt
+ sdl
+ soapysdr
+ spdlog
+ volk
+ zeromq))
(arguments
`(#:modules ((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix
glib-or-gtk:)
diff --cc gnu/packages/tls.scm
index 0772eaeb76,1ee5400a9c..61a768f2e1
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -350,7 -384,8 +350,8 @@@ OpenSSL for TARGET.
(define-public openssl
(package
(name "openssl")
- (version "1.1.1l")
+ (version "1.1.1p")
+ (replacement openssl/fixed)
(source (origin
(method url-fetch)
(uri (list (string-append
"https://www.openssl.org/source/openssl-";
diff --cc gnu/packages/version-control.scm
index 54fe2b5e10,612f69597f..d2a9acba91
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -220,141 -220,140 +220,141 @@@ Python 3.3 and later, rather than on Py
(define-public git
(package
- (name "git")
- (version "2.37.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://kernel.org/software/scm/git/git-"
- version ".tar.xz"))
- (sha256
- (base32
- "07s1jmsc1d4dlmr3qpibfzj14gy1gm049zp2vp1lw36h3dqs2zwz"))))
- (build-system gnu-build-system)
- (native-inputs
- `(("native-perl" ,perl)
- ;; Add bash-minimal explicitly to ensure it comes before bash-for-tests,
- ;; see <https://bugs.gnu.org/39513>.
- ("bash" ,bash-minimal)
- ("bash-for-tests" ,bash)
- ("gettext" ,gettext-minimal)
- ;; To build the man pages from the git sources, we would need a
dependency
- ;; on a full XML tool chain, and building it actually takes ages. So we
- ;; use this lazy approach and use released tarball.
- ("git-manpages"
- ,(origin
- (method url-fetch)
- (uri (string-append
- "mirror://kernel.org/software/scm/git/git-manpages-"
- version ".tar.xz"))
- (sha256
- (base32
- "1q68mnbpznapxxyjpysjx5lz8m6y25frxl5yshgx139c0xcr64c0"))))
- ;; For subtree documentation.
- ("asciidoc" ,asciidoc)
- ("docbook-xsl" ,docbook-xsl)
- ("xmlto" ,xmlto)
- ("pkg-config" ,pkg-config)))
- (inputs
- `(("curl" ,curl)
- ("expat" ,expat)
- ("openssl" ,openssl)
- ("perl" ,perl)
- ("python" ,python) ; for git-p4
- ("zlib" ,zlib)
-
- ;; For PCRE support in git grep (USE_LIBPCRE2).
- ("pcre" ,pcre2)
-
- ;; For 'gitweb.cgi'.
- ("perl-cgi" ,perl-cgi)
-
- ;; For 'git-svn'.
- ("subversion" ,subversion)
- ("perl-term-readkey" ,perl-term-readkey)
-
- ;; For 'git-send-email'.
- ("perl-authen-sasl" ,perl-authen-sasl)
- ("perl-net-smtp-ssl" ,perl-net-smtp-ssl)
- ("perl-io-socket-ssl" ,perl-io-socket-ssl)
-
- ;; For 'git gui', 'gitk', and 'git citool'.
- ("tcl" ,tcl)
- ("tk" ,tk)
-
- ;; For 'git-credential-libsecret'
- ("glib" ,glib)
- ("libsecret" ,libsecret)))
- (outputs '("out" ; the core
- "send-email" ; for git-send-email
- "svn" ; git-svn
- "credential-netrc" ; git-credential-netrc
- "credential-libsecret" ; git-credential-libsecret
- "subtree" ; git-subtree
- "gui")) ; gitk, git gui
- (arguments
- `(#:make-flags `("V=1" ;more verbose compilation
-
- ,(string-append "SHELL_PATH="
- (assoc-ref %build-inputs "bash")
- "/bin/sh")
-
- ;; Tests require a bash with completion support.
- ,(string-append "TEST_SHELL_PATH="
- (assoc-ref %build-inputs
"bash-for-tests")
- "/bin/bash")
-
- "USE_LIBPCRE2=yes"
-
- ;; By default 'make install' creates hard links for
- ;; things in 'libexec/git-core', which leads to huge
- ;; nars; see <https://bugs.gnu.org/21949>.
- "NO_INSTALL_HARDLINKS=indeed")
-
- ;; Make sure the full bash does not end up in the final closure.
- #:disallowed-references (,bash)
-
- #:test-target "test"
-
- ;; The explicit --with-tcltk forces the build system to hardcode the
- ;; absolute file name to 'wish'.
- #:configure-flags (list (string-append "--with-tcltk="
- (assoc-ref %build-inputs "tk")
- "/bin/wish8.6") ; XXX
- ,@(if (%current-target-system)
- git-cross-configure-flags
- '()))
-
- #:modules ((srfi srfi-1)
- (srfi srfi-26)
- ((guix build gnu-build-system) #:prefix gnu:)
- ,@%gnu-build-system-modules)
- #:phases
- (modify-phases %standard-phases
- ,@(if (%current-target-system)
- ;; The git build system assumes build == host
- `((add-after 'unpack 'use-host-uname_S
- (lambda _
- (substitute* "config.mak.uname"
- (("uname_S := .*" all)
- (if (equal? ,(%current-target-system) "i586-pc-gnu")
- "uname_S := GNU\n"
- all)))
- #t)))
- ;; We do not have bash-for-tests when cross-compiling.
- `((add-after 'unpack 'modify-PATH
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((path (string-split (getenv "PATH") #\:))
- (bash-full (assoc-ref inputs "bash-for-tests")))
- ;; Drop the test bash from PATH so that (which "sh") and
- ;; similar does the right thing.
- (setenv "PATH" (string-join
- (remove (cut string-prefix? bash-full
<>) path)
- ":"))
- #t)))))
- ;; Add cross curl-config script to PATH when cross-compiling.
- ,@(if (%current-target-system)
- '((add-before 'configure 'add-cross-curl-config
+ (name "git")
- (version "2.36.1")
++ (version "2.37.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kernel.org/software/scm/git/git-"
+ version ".tar.xz"))
+ (sha256
+ (base32
- "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0"))))
++ "07s1jmsc1d4dlmr3qpibfzj14gy1gm049zp2vp1lw36h3dqs2zwz"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("native-perl" ,perl)
+ ;; Add bash-minimal explicitly to ensure it comes before
bash-for-tests,
+ ;; see <https://bugs.gnu.org/39513>.
+ ("bash" ,bash-minimal)
+ ("bash-for-tests" ,bash)
+ ("gettext" ,gettext-minimal)
+ ;; To build the man pages from the git sources, we would need a
dependency
+ ;; on a full XML tool chain, and building it actually takes ages. So
we
+ ;; use this lazy approach and use released tarball.
+ ("git-manpages"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kernel.org/software/scm/git/git-manpages-"
+ version ".tar.xz"))
+ (sha256
+ (base32
- "0vsfjs6xg228yhqcpaiwkpncaqcghnm0pwdxmgibz0rj6d8ydrmi"))))
++ "1q68mnbpznapxxyjpysjx5lz8m6y25frxl5yshgx139c0xcr64c0"))))
+ ;; For subtree documentation.
+ ("asciidoc" ,asciidoc)
+ ("docbook2x" ,docbook2x)
+ ("docbook-xsl" ,docbook-xsl)
+ ("libxslt" ,libxslt)
+ ("pkg-config" ,pkg-config)
+ ("texinfo" ,texinfo)
+ ("xmlto" ,xmlto)))
+ (inputs
+ `(("curl" ,curl)
+ ("expat" ,expat)
+ ("openssl" ,openssl)
+ ("perl" ,perl)
+ ("python" ,python) ; for git-p4
+ ("zlib" ,zlib)
+
+ ;; For PCRE support in git grep (USE_LIBPCRE2).
+ ("pcre" ,pcre2)
+
+ ;; For 'gitweb.cgi'.
+ ("perl-cgi" ,perl-cgi)
+
+ ;; For 'git-svn'.
+ ("subversion" ,subversion)
+ ("perl-term-readkey" ,perl-term-readkey)
+
+ ;; For 'git-send-email'.
+ ("perl-authen-sasl" ,perl-authen-sasl)
+ ("perl-net-smtp-ssl" ,perl-net-smtp-ssl)
+ ("perl-io-socket-ssl" ,perl-io-socket-ssl)
+
+ ;; For 'git gui', 'gitk', and 'git citool'.
+ ("tcl" ,tcl)
+ ("tk" ,tk)
+
+ ;; For 'git-credential-libsecret'
+ ("glib" ,glib)
+ ("libsecret" ,libsecret)))
+ (outputs '("out" ; the core
+ "send-email" ; for git-send-email
+ "svn" ; git-svn
+ "credential-netrc" ; git-credential-netrc
+ "credential-libsecret" ; git-credential-libsecret
+ "subtree" ; git-subtree
+ "gui")) ; gitk, git gui
+ (arguments
+ `(#:make-flags `("V=1" ;more verbose compilation
+
+ ,(string-append "SHELL_PATH="
+ (assoc-ref %build-inputs "bash")
+ "/bin/sh")
+
+ ;; Tests require a bash with completion support.
+ ,(string-append "TEST_SHELL_PATH="
+ (assoc-ref %build-inputs
"bash-for-tests")
+ "/bin/bash")
+
+ "USE_LIBPCRE2=yes"
+
+ ;; By default 'make install' creates hard links for
+ ;; things in 'libexec/git-core', which leads to huge
+ ;; nars; see <https://bugs.gnu.org/21949>.
+ "NO_INSTALL_HARDLINKS=indeed")
+
+ ;; Make sure the full bash does not end up in the final closure.
+ #:disallowed-references (,bash)
+
+ #:test-target "test"
+
+ ;; The explicit --with-tcltk forces the build system to hardcode the
+ ;; absolute file name to 'wish'.
+ #:configure-flags (list (string-append "--with-tcltk="
+ (assoc-ref %build-inputs "tk")
+ "/bin/wish8.6") ; XXX
+ ,@(if (%current-target-system)
+ git-cross-configure-flags
+ '()))
+
+ #:modules ((srfi srfi-1)
+ (srfi srfi-26)
+ ((guix build gnu-build-system) #:prefix gnu:)
+ ,@%gnu-build-system-modules)
+ #:phases
+ (modify-phases %standard-phases
+ ,@(if (%current-target-system)
+ ;; The git build system assumes build == host
+ `((add-after 'unpack 'use-host-uname_S
+ (lambda _
+ (substitute* "config.mak.uname"
+ (("uname_S := .*" all)
+ (if (equal? ,(%current-target-system) "i586-pc-gnu")
+ "uname_S := GNU\n"
+ all))))))
+ ;; We do not have bash-for-tests when cross-compiling.
+ `((add-after 'unpack 'modify-PATH
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((path (string-split (getenv "PATH") #\:))
+ (bash-full (assoc-ref inputs "bash-for-tests")))
+ ;; Drop the test bash from PATH so that (which "sh")
and
+ ;; similar does the right thing.
+ (setenv "PATH" (string-join
+ (remove (cut string-prefix? bash-full
<>) path)
+ ":")))))))
+ ;; Add cross curl-config script to PATH when cross-compiling.
+ ,@(if (%current-target-system)
+ '((add-before 'configure 'add-cross-curl-config
(lambda* (#:key inputs #:allow-other-keys)
(setenv "PATH"
(string-append (assoc-ref inputs "curl") "/bin:"
diff --cc guix/scripts/home.scm
index 8ba7693a83,4add7e7c69..ae830d0b48
--- a/guix/scripts/home.scm
+++ b/guix/scripts/home.scm
@@@ -4,7 -4,7 +4,8 @@@
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
+ ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc guix/scripts/package.scm
index 14a8e1f5e8,7d92598efa..404925cb5a
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@@ -11,7 -11,7 +11,8 @@@
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2018 Steve Sprang <scs@stevesprang.com>
;;; Copyright © 2022 Josselin Poiret <dev@jpoiret.xyz>
+;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
+ ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;;
;;; This file is part of GNU Guix.
;;;