[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/27: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/27: Merge branch 'staging' into core-updates |
|
Date: |
Thu, 11 Aug 2022 18:45:06 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 77eb3008e350c069e0ae8df6a91bf0ebdcfc2ac0
Merge: f7e8be2318 b50eaa6764
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Aug 11 23:36:10 2022 +0200
Merge branch 'staging' into core-updates
.guix-authorizations | 3 +-
Makefile.am | 21 +-
doc/guix.texi | 450 +-
doc/htmlxref.cnf | 4 +-
etc/disarchive-manifest.scm | 21 +-
etc/news.scm | 33 +-
etc/system-tests.scm | 3 +-
etc/teams.scm.in | 9 +
gnu/artwork.scm | 4 +-
gnu/build/file-systems.scm | 6 +
gnu/build/marionette.scm | 9 +-
gnu/ci.scm | 43 +-
gnu/home.scm | 26 +-
gnu/home/services.scm | 14 +-
gnu/home/services/ssh.scm | 8 +-
gnu/home/services/xdg.scm | 25 +-
gnu/installer.scm | 3 +-
gnu/installer/parted.scm | 22 +-
gnu/installer/services.scm | 39 +-
gnu/installer/steps.scm | 32 +-
gnu/installer/user.scm | 7 +-
gnu/local.mk | 37 +-
gnu/packages/admin.scm | 283 +-
gnu/packages/algebra.scm | 73 +-
gnu/packages/android.scm | 30 +
gnu/packages/animation.scm | 8 +-
gnu/packages/aspell.scm | 11 +
gnu/packages/astronomy.scm | 229 +-
gnu/packages/audio.scm | 38 +-
gnu/packages/aux-files/emacs/guix-emacs.el | 2 +-
gnu/packages/backup.scm | 28 +-
gnu/packages/benchmark.scm | 2 +-
gnu/packages/bioconductor.scm | 187 +-
gnu/packages/bioinformatics.scm | 295 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/boost.scm | 8 +-
gnu/packages/bootloaders.scm | 21 +-
gnu/packages/c.scm | 22 +-
gnu/packages/check.scm | 11 +-
gnu/packages/chromium.scm | 14 +-
gnu/packages/code.scm | 5 +-
gnu/packages/compression.scm | 77 +-
gnu/packages/connman.scm | 2 +-
gnu/packages/cpp.scm | 8 +-
gnu/packages/cran.scm | 844 +-
gnu/packages/crates-io.scm | 46 +-
gnu/packages/crypto.scm | 6 +-
gnu/packages/databases.scm | 37 +-
gnu/packages/datastructures.scm | 26 +-
gnu/packages/diffoscope.scm | 8 +-
gnu/packages/disk.scm | 18 +-
gnu/packages/display-managers.scm | 244 +-
gnu/packages/django.scm | 8 +-
gnu/packages/djvu.scm | 2 +-
gnu/packages/documentation.scm | 10 +-
gnu/packages/ebook.scm | 4 +-
gnu/packages/education.scm | 46 +-
gnu/packages/electronics.scm | 4 +-
gnu/packages/elf.scm | 9 +-
gnu/packages/emacs-xyz.scm | 73 +-
gnu/packages/emacs.scm | 5 +
gnu/packages/emulators.scm | 8 +-
gnu/packages/engineering.scm | 66 +-
gnu/packages/fcitx5.scm | 6 +-
gnu/packages/finance.scm | 224 +-
gnu/packages/fonts.scm | 92 +-
gnu/packages/freedesktop.scm | 133 +-
gnu/packages/game-development.scm | 26 +-
gnu/packages/games.scm | 334 +-
gnu/packages/gdb.scm | 12 +
gnu/packages/geo.scm | 20 +-
gnu/packages/gnome-xyz.scm | 12 +-
gnu/packages/gnome.scm | 160 +-
gnu/packages/gnupg.scm | 9 +
gnu/packages/gnuzilla.scm | 8 +-
gnu/packages/gps.scm | 6 +-
gnu/packages/graphics.scm | 130 +-
gnu/packages/graphviz.scm | 3 +-
gnu/packages/gsasl.scm | 10 +-
gnu/packages/gstreamer.scm | 792 +-
gnu/packages/guile-xyz.scm | 68 +-
gnu/packages/guile.scm | 4 +-
gnu/packages/hardware.scm | 4 +-
gnu/packages/haxe.scm | 284 +
gnu/packages/hunspell.scm | 2 +-
gnu/packages/image-processing.scm | 13 +-
gnu/packages/image-viewers.scm | 20 +-
gnu/packages/image.scm | 180 +-
gnu/packages/inkscape.scm | 15 +-
gnu/packages/installers.scm | 9 +-
gnu/packages/instrumentation.scm | 58 +
gnu/packages/irc.scm | 6 +-
gnu/packages/jami.scm | 235 +-
gnu/packages/kde-frameworks.scm | 124 +-
gnu/packages/kde-internet.scm | 2 +-
gnu/packages/kde-multimedia.scm | 28 +-
gnu/packages/kde-pim.scm | 54 +-
gnu/packages/kde-plasma.scm | 6 +-
gnu/packages/kde-systemtools.scm | 2 +-
gnu/packages/kde-utils.scm | 4 +-
gnu/packages/kde.scm | 82 +-
gnu/packages/kerberos.scm | 31 +-
gnu/packages/lego.scm | 2 +-
gnu/packages/libreoffice.scm | 442 +-
gnu/packages/libunwind.scm | 4 +-
gnu/packages/linphone.scm | 10 +-
gnu/packages/linux.scm | 397 +-
gnu/packages/lisp-check.scm | 8 +-
gnu/packages/lisp-xyz.scm | 385 +-
gnu/packages/llvm.scm | 166 +-
gnu/packages/logging.scm | 9 +-
gnu/packages/lxqt.scm | 92 +-
gnu/packages/machine-learning.scm | 9 +-
gnu/packages/mail.scm | 168 +-
gnu/packages/maths.scm | 563 +-
gnu/packages/messaging.scm | 104 +-
gnu/packages/mingw.scm | 9 +-
gnu/packages/monitoring.scm | 19 +
gnu/packages/mp3.scm | 105 +-
gnu/packages/mpd.scm | 12 +-
gnu/packages/mtools.scm | 6 +-
gnu/packages/music.scm | 72 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 236 +-
gnu/packages/nim.scm | 110 +-
gnu/packages/node.scm | 4 +-
gnu/packages/notcurses.scm | 89 +-
gnu/packages/ocaml.scm | 136 +-
gnu/packages/onc-rpc.scm | 12 +-
gnu/packages/openstack.scm | 402 +-
gnu/packages/orange.scm | 4 +-
gnu/packages/package-management.scm | 97 +-
gnu/packages/parallel.scm | 7 +-
gnu/packages/password-utils.scm | 8 +-
.../aoflagger-use-system-provided-pybind11.patch | 38 +
gnu/packages/patches/aspell-CVE-2019-25051.patch | 99 +
gnu/packages/patches/barony-fix-textures.patch | 237 +
.../patches/fail2ban-0.11.2_CVE-2021-32749.patch | 155 +
.../fail2ban-0.11.2_fix-setuptools-drop-2to3.patch | 64 +
.../patches/fail2ban-0.11.2_fix-test-suite.patch | 48 +
.../patches/fail2ban-paths-guix-conf.patch | 32 +
.../patches/fail2ban-python310-server-action.patch | 27 +
.../fail2ban-python310-server-actions.patch | 25 +
.../patches/fail2ban-python310-server-jails.patch | 25 +
gnu/packages/patches/fuse-glibc-2.34.patch | 49 +
gnu/packages/patches/gnupg-CVE-2022-34903.patch | 54 +
.../patches/gst-plugins-good-fix-test.patch | 94 -
gnu/packages/patches/jami-fix-crash-on-quit.patch | 34 -
gnu/packages/patches/jami-fix-esc-bug.patch | 24 +
gnu/packages/patches/jami-images-loading.patch | 152 -
.../patches/jami-libclient-audio-managers.patch | 23 -
gnu/packages/patches/jami-memory-usage.patch | 70 -
.../libphonenumber-reproducible-build.patch | 25 +
gnu/packages/patches/libtirpc-CVE-2021-46828.patch | 567 +
.../patches/libvirt-add-install-prefix.patch | 268 +-
gnu/packages/patches/mumps-build-parallelism.patch | 13 -
gnu/packages/patches/mumps-shared-libseq.patch | 42 -
gnu/packages/patches/mumps-shared-mumps.patch | 63 -
gnu/packages/patches/mumps-shared-pord.patch | 77 -
gnu/packages/patches/nsis-env-passthru.patch | 17 +-
gnu/packages/patches/nsis-source-date-epoch.patch | 23 -
gnu/packages/patches/qtwayland-gcc-11.patch | 18 +
.../ruby-anystyle-data-immutable-install.patch | 40 +
.../ruby-anystyle-fix-dictionary-populate.patch | 94 +
.../patches/ruby-hydra-minimal-no-byebug.patch | 11 +
.../patches/ruby-latex-decode-fix-test.patch | 66 +
.../patches/shishi-fix-libgcrypt-detection.patch | 32 -
.../patches/texlive-hyph-utf8-no-byebug.patch | 13 +
.../unzip-CVE-2022-0529+CVE-2022-0530.patch | 177 +
gnu/packages/patches/xygrib-fix-finding-data.patch | 2 +-
gnu/packages/pdf.scm | 2 +-
gnu/packages/photo.scm | 60 +-
gnu/packages/printers.scm | 2 +-
gnu/packages/pulseaudio.scm | 29 +-
gnu/packages/python-check.scm | 4 +-
gnu/packages/python-science.scm | 47 +-
gnu/packages/python-web.scm | 97 +-
gnu/packages/python-xyz.scm | 464 +-
gnu/packages/python.scm | 8 +-
gnu/packages/qt.scm | 1281 +-
gnu/packages/radio.scm | 38 +-
gnu/packages/robotics.scm | 4 +-
gnu/packages/rpm.scm | 124 +-
gnu/packages/ruby.scm | 840 +-
gnu/packages/rust.scm | 50 +-
gnu/packages/sagemath.scm | 21 +-
gnu/packages/scribus.scm | 4 +-
gnu/packages/search.scm | 41 +-
gnu/packages/security-token.scm | 87 +-
gnu/packages/serialization.scm | 71 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/simulation.scm | 16 +-
gnu/packages/slang.scm | 49 +-
gnu/packages/statistics.scm | 110 +-
gnu/packages/suckless.scm | 39 +-
gnu/packages/sync.scm | 16 +-
gnu/packages/synergy.scm | 2 +-
gnu/packages/task-management.scm | 35 +-
gnu/packages/telegram.scm | 4 +-
gnu/packages/telephony.scm | 12 +-
gnu/packages/terminals.scm | 4 +-
gnu/packages/tex.scm | 461 +-
gnu/packages/text-editors.scm | 20 +-
gnu/packages/tls.scm | 84 +-
gnu/packages/tor.scm | 10 +-
gnu/packages/tryton.scm | 1010 +-
gnu/packages/version-control.scm | 9 +-
gnu/packages/video.scm | 218 +-
gnu/packages/virtualization.scm | 160 +-
gnu/packages/vpn.scm | 29 +-
gnu/packages/web-browsers.scm | 60 +-
gnu/packages/web.scm | 20 +-
gnu/packages/webkit.scm | 2 +
gnu/packages/wm.scm | 50 +-
gnu/packages/xdisorg.scm | 89 +-
gnu/packages/xfce.scm | 8 +-
gnu/packages/xorg.scm | 72 +-
gnu/services/admin.scm | 21 +-
gnu/services/configuration.scm | 11 +-
gnu/services/cuirass.scm | 5 +-
gnu/services/desktop.scm | 8 +-
gnu/services/file-sharing.scm | 4 +-
gnu/services/mail.scm | 45 +-
gnu/services/messaging.scm | 12 +-
gnu/services/networking.scm | 17 +-
gnu/services/telephony.scm | 6 +-
gnu/services/virtualization.scm | 12 +-
gnu/system/examples/vm-image.tmpl | 13 +-
gnu/system/file-systems.scm | 4 +-
gnu/system/install.scm | 17 +-
gnu/system/linux-container.scm | 97 +-
gnu/tests/install.scm | 15 +-
gnu/tests/telephony.scm | 53 +-
gnu/tests/virtualization.scm | 84 +
guix/build-system/asdf.scm | 18 +-
guix/build-system/channel.scm | 78 +
guix/build-system/perl.scm | 122 +-
guix/build-system/qt.scm | 14 +
guix/build/asdf-build-system.scm | 33 +-
guix/build/download.scm | 103 +-
guix/build/lisp-utils.scm | 46 +-
guix/build/qt-utils.scm | 48 +-
guix/build/syscalls.scm | 3 +
guix/channels.scm | 27 +-
guix/lint.scm | 4 +-
guix/read-print.scm | 696 +
guix/scripts/build.scm | 29 +-
guix/scripts/describe.scm | 40 +-
guix/scripts/environment.scm | 27 +-
guix/scripts/gc.scm | 6 +-
guix/scripts/import.scm | 4 +-
guix/scripts/lint.scm | 22 +-
guix/scripts/style.scm | 527 +-
guix/scripts/system.scm | 5 -
guix/self.scm | 1 +
guix/ssh.scm | 4 +
guix/tests/git.scm | 1 +
guix/utils.scm | 12 +
po/doc/guix-cookbook.de.po | 37 +-
po/doc/guix-cookbook.sk.po | 6 +-
po/doc/guix-manual.de.po | 27978 +++---
po/doc/guix-manual.es.po | 27480 +++---
po/doc/guix-manual.fr.po | 85675 ++++++-------------
po/doc/guix-manual.pt_BR.po | 27141 +++---
po/doc/guix-manual.ru.po | 27215 +++---
po/doc/guix-manual.zh_CN.po | 27108 +++---
po/guix/LINGUAS | 1 +
po/guix/POTFILES.in | 1 +
po/guix/{ja.po => bn.po} | 1107 +-
po/guix/cs.po | 1046 +-
po/guix/da.po | 1090 +-
po/guix/de.po | 1183 +-
po/guix/eo.po | 1095 +-
po/guix/es.po | 1119 +-
po/guix/fa.po | 1036 +-
po/guix/fi.po | 1036 +-
po/guix/fr.po | 1111 +-
po/guix/hu.po | 1079 +-
po/guix/it.po | 1164 +-
po/guix/ja.po | 1035 +-
po/guix/ko.po | 1057 +-
po/guix/nl.po | 1117 +-
po/guix/oc.po | 1038 +-
po/guix/pl.po | 1045 +-
po/guix/pt_BR.po | 1120 +-
po/guix/ru.po | 1063 +-
po/guix/si.po | 1036 +-
po/guix/sk.po | 1242 +-
po/guix/sr.po | 1078 +-
po/guix/sv.po | 1083 +-
po/guix/ta.po | 1093 +-
po/guix/tr.po | 1036 +-
po/guix/uk.po | 1209 +-
po/guix/vi.po | 1082 +-
po/guix/zh_CN.po | 2226 +-
po/packages/da.po | 3352 +-
po/packages/de.po | 3352 +-
po/packages/eo.po | 3352 +-
po/packages/es.po | 3352 +-
po/packages/fa.po | 3352 +-
po/packages/fi.po | 3352 +-
po/packages/fr.po | 3509 +-
po/packages/hu.po | 3352 +-
po/packages/it.po | 3352 +-
po/packages/ko.po | 3352 +-
po/packages/nl.po | 3352 +-
po/packages/oc.po | 3352 +-
po/packages/pl.po | 3352 +-
po/packages/pt_BR.po | 3352 +-
po/packages/sk.po | 3352 +-
po/packages/sr.po | 3352 +-
po/packages/tr.po | 3352 +-
po/packages/zh_CN.po | 3352 +-
tests/guix-home.sh | 5 +-
tests/guix-style.sh | 80 +
tests/read-print.scm | 380 +
tests/services/configuration.scm | 26 +-
tests/style.scm | 185 +-
318 files changed, 160343 insertions(+), 175593 deletions(-)
diff --cc gnu/local.mk
index bcfa15ca52,0ee0a4d8b6..d61453b24b
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1298,12 -1316,10 +1311,9 @@@ dist_patch_DATA =
%D%/packages/patches/irrlicht-link-against-needed-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/itk-snap-alt-glibc-compat.patch \
+ %D%/packages/patches/jami-fix-esc-bug.patch \
%D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
%D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
- %D%/packages/patches/jami-fix-crash-on-quit.patch \
- %D%/packages/patches/jami-images-loading.patch \
- %D%/packages/patches/jami-memory-usage.patch \
- %D%/packages/patches/jami-libclient-audio-managers.patch \
- %D%/packages/patches/jsoncpp-pkg-config-version.patch \
%D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \
%D%/packages/patches/jamvm-1.5.1-armv7-support.patch \
%D%/packages/patches/jamvm-2.0.0-aarch64-support.patch \
diff --cc gnu/packages/compression.scm
index d885d65883,684979018c..26c151002c
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@@ -116,27 -113,39 +116,39 @@@
(build-system gnu-build-system)
(outputs '("out" "static"))
(arguments
- `(#:make-flags
- ,(if (target-mingw?)
- `(list ,(string-append "PREFIX=" (%current-target-system) "-")
- "BINARY_PATH = $(prefix)/bin"
- "INCLUDE_PATH = $(prefix)/include"
- "LIBRARY_PATH = $(prefix)/lib"
- "SHARED_MODE = 1"
- (string-append "prefix = " (assoc-ref %outputs "out")))
- ''())
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Zlib's home-made `configure' fails when passed
- ;; extra flags like `--enable-fast-install', so we need to
- ;; invoke it with just what it understand.
- (let ((out (assoc-ref outputs "out")))
- ;; 'configure' doesn't understand '--host'.
- ,@(if (%current-target-system)
- `((setenv "CHOST" ,(%current-target-system)))
- '())
- ,@(if (target-mingw?)
- `((rename-file "win32/Makefile.gcc" "Makefile"))
- `((invoke "./configure"
- (string-append "--prefix=" out)))))))
- (add-after 'install 'move-static-library
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (static (assoc-ref outputs "static")))
- (with-directory-excursion (string-append out "/lib")
- (install-file "libz.a" (string-append static "/lib"))
- (delete-file "libz.a")
- #t)))))))
+ (list
++ #:make-flags
++ (if (target-mingw?)
++ #~(list #$(string-append "PREFIX=" (%current-target-system) "-")
++ "BINARY_PATH = $(prefix)/bin"
++ "INCLUDE_PATH = $(prefix)/include"
++ "LIBRARY_PATH = $(prefix)/lib"
++ "SHARED_MODE = 1"
++ (string-append "prefix = " #$output))
++ #~'())
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ ;; Zlib's home-made `configure' fails when passed
+ ;; extra flags like `--enable-fast-install', so we need to
+ ;; invoke it with just what it understand.
+ (setenv "CC" #$(cc-for-target))
+ ;; 'configure' doesn't understand '--host'.
+ #$@(if (%current-target-system)
+ #~((setenv "CHOST" #$(%current-target-system)))
+ #~())
- (invoke "./configure"
- (string-append "--prefix=" #$output))))
++
++ #$@(if (target-mingw?)
++ #~((rename-file "win32/Makefile.gcc" "Makefile"))
++ #~((invoke "./configure"
++ (string-append "--prefix=" #$output))))))
+ (add-after 'install 'move-static-library
+ (lambda _
+ (with-directory-excursion (string-append #$output "/lib")
+ (install-file "libz.a" (string-append #$output:static
+ "/lib"))
+ (delete-file "libz.a")))))))
(home-page "https://zlib.net/";)
(synopsis "Compression library")
(description
diff --cc gnu/packages/node.scm
index c757d202eb,2839348554..782d109b24
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@@ -864,9 -864,9 +864,9 @@@ source files."
(list ;; Runtime dependencies for binaries used as a bootstrap.
c-ares-for-node
brotli
- icu4c-70
- icu4c-71
++ icu4c
libuv-for-node
- `(,nghttp2 "lib")
+ `(,nghttp2-for-node "lib")
openssl
zlib
;; Regular build-time dependencies.
@@@ -879,7 -879,7 +879,7 @@@
(list bash-minimal
coreutils
c-ares-for-node
- icu4c-70
- icu4c-71
++ icu4c
libuv-for-node
llhttp-bootstrap
brotli
diff --cc gnu/packages/tex.scm
index 8e80f23f18,1a5ffdcdc3..d4db2a61ac
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -20,8 -20,9 +20,10 @@@
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
+;;; Copyright © 2022 Simon South <simon@simonsouth.net>
;;; Copyright © 2022 Jack Hill <jackhill@jackhill.us>
+ ;;; Copyright © 2022 Fabio Natali <me@fabionatali.com>
+ ;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/tls.scm
index a32677bd59,4ee75ace3d..e2842cfa08
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -303,6 -329,30 +303,23 @@@ required structures."
(properties '((ftp-server . "ftp.gnutls.org")
(ftp-directory . "/gcrypt/gnutls")))))
+ (define-public gnutls-latest
+ ;; Version 3.7.7 introduces 'set-session-record-port-close!', which allows
+ ;; us to get rid of the wrapper port in 'tls-wrap'.
+ (package
+ (inherit gnutls)
+ (version "3.7.7")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnupg/gnutls/v"
+ (version-major+minor version)
+ "/gnutls-" version ".tar.xz"))
+ (patches (search-patches "gnutls-skip-trust-store-test.patch"
+ "gnutls-cross.patch"))
+ (sha256
+ (base32
+ "01i1gl15k6qwvxmxx0by1mn9nlmcmym18wdpm7dn9awfsp8474dy"))))))
+
-(define-public gnutls/guile-2.0
- ;; GnuTLS for Guile 2.0.
- (package/inherit gnutls
- (name "guile2.0-gnutls")
- (inputs `(("guile" ,guile-2.0)
- ,@(alist-delete "guile" (package-inputs gnutls))))))
-
(define-public gnutls/dane
;; GnuTLS with build libgnutls-dane, implementing DNS-based
;; Authentication of Named Entities. This is required for GNS functionality
diff --cc gnu/packages/version-control.scm
index 0e3f01ede9,9bf5ac76df..9529963a85
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -480,118 -478,128 +480,125 @@@ Python 3.3 and later, rather than on Py
(format #t "restoring shebang on `~a'~%" file)
(substitute* file
(("^#!.*/bin/sh") "#!/bin/sh")))
- (find-files dir ".*"))
- #t)))
- (add-after 'install 'split
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Split the binaries to the various outputs.
- (let* ((out (assoc-ref outputs "out"))
- (se (assoc-ref outputs "send-email"))
- (svn (assoc-ref outputs "svn"))
- (gui (assoc-ref outputs "gui"))
- (gitk (string-append out "/bin/gitk"))
- (gitk* (string-append gui "/bin/gitk"))
- (git-gui (string-append out "/libexec/git-core/git-gui"))
- (git-gui* (string-append gui "/libexec/git-core/git-gui"))
- (git-cit (string-append out
"/libexec/git-core/git-citool"))
- (git-cit* (string-append gui
"/libexec/git-core/git-citool"))
- (git-se (string-append out
"/libexec/git-core/git-send-email"))
- (git-se* (string-append se
"/libexec/git-core/git-send-email"))
- (git-svn (string-append out "/libexec/git-core/git-svn"))
- (git-svn* (string-append svn "/libexec/git-core/git-svn"))
- (git-sm (string-append out
-
"/libexec/git-core/git-submodule")))
- (mkdir-p (string-append gui "/bin"))
- (mkdir-p (string-append gui "/libexec/git-core"))
- (mkdir-p (string-append se "/libexec/git-core"))
- (mkdir-p (string-append svn "/libexec/git-core"))
-
- (for-each (lambda (old new)
- (copy-file old new)
- (delete-file old)
- (chmod new #o555))
- (list gitk git-gui git-cit git-se git-svn)
- (list gitk* git-gui* git-cit* git-se* git-svn*))
-
- ;; Tell 'git-svn' where Subversion and perl-term-readkey are.
- (wrap-program git-svn*
- `("PATH" ":" prefix
- (,(string-append (assoc-ref inputs "subversion")
- "/bin")))
- `("PERL5LIB" ":" prefix
- ,(map (lambda (i) (string-append (assoc-ref inputs i)
- "/lib/perl5/site_perl"))
- '("subversion" "perl-term-readkey")))
-
- ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so
- ;; help it find 'libsvn_client-1.so'.
- `("LD_LIBRARY_PATH" ":" prefix
- (,(string-append (assoc-ref inputs "subversion")
- "/lib"))))
-
- ;; Tell 'git-send-email' where perl modules are.
- (wrap-program git-se*
- `("PERL5LIB" ":" prefix
- ,(map (lambda (o) (string-append o "/lib/perl5/site_perl"))
- (list
- ,@(transitive-input-references
- 'inputs
- (map (lambda (l)
- (assoc l (package-inputs this-package)))
- '("perl-authen-sasl"
- "perl-net-smtp-ssl"
- "perl-io-socket-ssl")))))))
-
- ;; Tell 'gitweb.cgi' where perl modules are.
- (wrap-program (string-append out "/share/gitweb/gitweb.cgi")
- `("PERL5LIB" ":" prefix
- ,(map (lambda (o) (string-append o "/lib/perl5/site_perl"))
- (list
- ,@(transitive-input-references
- 'inputs
- (map (lambda (l)
- (assoc l (package-inputs this-package)))
- '("perl-cgi")))))))
-
- ;; Tell 'git-submodule' where Perl is.
- (wrap-program git-sm
- `("PATH" ":" prefix
- (,(string-append (assoc-ref inputs "perl")
- "/bin"))))
-
- #t)))
- (add-after 'split 'install-man-pages
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (man (string-append out "/share/man"))
- (manpages (assoc-ref inputs "git-manpages")))
- (mkdir-p man)
- (with-directory-excursion man
- (invoke "tar" "xvf" manpages))))))))
-
- (native-search-paths
- ;; For HTTPS access, Git needs a single-file certificate bundle, specified
- ;; with $GIT_SSL_CAINFO.
- (list (search-path-specification
- (variable "GIT_SSL_CAINFO")
- (file-type 'regular)
- (separator #f) ;single entry
- (files '("etc/ssl/certs/ca-certificates.crt")))
- (search-path-specification
- (variable "GIT_EXEC_PATH")
- (separator #f) ;single entry
- (files '("libexec/git-core")))))
-
- (synopsis "Distributed version control system")
- (description
- "Git is a free distributed version control system designed to handle
+ (find-files dir ".*")))))
+ (add-after 'install 'split
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Split the binaries to the various outputs.
+ (let* ((out (assoc-ref outputs "out"))
+ (se (assoc-ref outputs "send-email"))
+ (svn (assoc-ref outputs "svn"))
+ (gui (assoc-ref outputs "gui"))
+ (gitk (string-append out "/bin/gitk"))
+ (gitk* (string-append gui "/bin/gitk"))
+ (git-gui (string-append out "/libexec/git-core/git-gui"))
+ (git-gui* (string-append gui "/libexec/git-core/git-gui"))
+ (git-cit (string-append out
"/libexec/git-core/git-citool"))
+ (git-cit* (string-append gui
"/libexec/git-core/git-citool"))
+ (git-se (string-append out
"/libexec/git-core/git-send-email"))
+ (git-se* (string-append se
"/libexec/git-core/git-send-email"))
+ (git-svn (string-append out "/libexec/git-core/git-svn"))
+ (git-svn* (string-append svn "/libexec/git-core/git-svn"))
+ (git-sm (string-append out
+
"/libexec/git-core/git-submodule")))
+ (mkdir-p (string-append gui "/bin"))
+ (mkdir-p (string-append gui "/libexec/git-core"))
+ (mkdir-p (string-append se "/libexec/git-core"))
+ (mkdir-p (string-append svn "/libexec/git-core"))
+
+ (for-each (lambda (old new)
+ (copy-file old new)
+ (delete-file old)
+ (chmod new #o555))
+ (list gitk git-gui git-cit git-se git-svn)
+ (list gitk* git-gui* git-cit* git-se* git-svn*))
+
+ ;; Tell 'git-svn' where Subversion and perl-term-readkey are.
+ (wrap-program git-svn*
+ `("PATH" ":" prefix
+ (,(string-append (assoc-ref inputs "subversion")
+ "/bin")))
+ `("PERL5LIB" ":" prefix
+ ,(map (lambda (i) (string-append (assoc-ref inputs i)
+ "/lib/perl5/site_perl"))
+ '("subversion" "perl-term-readkey")))
+
+ ;; XXX: The .so for SVN/Core.pm lacks a RUNPATH, so
+ ;; help it find 'libsvn_client-1.so'.
+ `("LD_LIBRARY_PATH" ":" prefix
+ (,(string-append (assoc-ref inputs "subversion")
+ "/lib"))))
+
+ ;; Tell 'git-send-email' where perl modules are.
+ (wrap-program git-se*
+ `("PERL5LIB" ":" prefix
+ ,(map (lambda (o) (string-append o "/lib/perl5/site_perl"))
+ (list
+ ,@(transitive-input-references
+ 'inputs
+ (map (lambda (l)
+ (assoc l (package-inputs this-package)))
+ '("perl-authen-sasl"
+ "perl-net-smtp-ssl"
+ "perl-io-socket-ssl")))))))
+
+ ;; Tell 'gitweb.cgi' where perl modules are.
+ (wrap-program (string-append out "/share/gitweb/gitweb.cgi")
+ `("PERL5LIB" ":" prefix
+ ,(map (lambda (o) (string-append o "/lib/perl5/site_perl"))
+ (list
+ ,@(transitive-input-references
+ 'inputs
+ (map (lambda (l)
+ (assoc l (package-inputs this-package)))
+ '("perl-cgi")))))))
+
+ ;; Tell 'git-submodule' where Perl is.
+ (wrap-program git-sm
+ `("PATH" ":" prefix
+ (,(string-append (assoc-ref inputs "perl")
+ "/bin")))))))
+ (add-after 'split 'install-man-pages
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (man (string-append out "/share/man"))
+ (manpages (assoc-ref inputs "git-manpages")))
+ (mkdir-p man)
+ (with-directory-excursion man
+ (invoke "tar" "xvf" manpages))))))))
+
+ (native-search-paths
+ ;; For HTTPS access, Git needs a single-file certificate bundle,
specified
+ ;; with $GIT_SSL_CAINFO.
+ (list (search-path-specification
+ (variable "GIT_SSL_CAINFO")
+ (file-type 'regular)
+ (separator #f) ;single entry
+ (files '("etc/ssl/certs/ca-certificates.crt")))
+ (search-path-specification
+ (variable "GIT_EXEC_PATH")
+ (separator #f) ;single entry
+ (files '("libexec/git-core")))))
+
+ (synopsis "Distributed version control system")
+ (description
+ "Git is a free distributed version control system designed to handle
everything from small to very large projects with speed and efficiency.")
- ;; XXX: Ignore this CVE to work around a name clash with the unrelated
- ;; "cpe:2.3:a:jenkins:git" package. The proper fix is for (guix cve) to
- ;; account for "vendor names".
- (properties '((lint-hidden-cve . ("CVE-2018-1000182"
- "CVE-2018-1000110"
- "CVE-2019-1003010"
- "CVE-2020-2136"
- "CVE-2021-21684"
- "CVE-2022-30947"
- "CVE-2022-30948"
- "CVE-2022-30949"
- "CVE-2022-36882"
- "CVE-2022-36883"
- "CVE-2022-36884"))))
- (license license:gpl2)
- (home-page "https://git-scm.com/";)))
+ ;; XXX: Ignore this CVE to work around a name clash with the unrelated
+ ;; "cpe:2.3:a:jenkins:git" package. The proper fix is for (guix cve) to
+ ;; account for "vendor names".
+ (properties '((lint-hidden-cve . ("CVE-2018-1000182"
+ "CVE-2018-1000110"
+ "CVE-2019-1003010"
- "CVE-2020-2136"))))
++ "CVE-2020-2136"
++ "CVE-2021-21684"
++ "CVE-2022-30947"
++ "CVE-2022-30948"
++ "CVE-2022-30949"
++ "CVE-2022-36882"
++ "CVE-2022-36883"
++ "CVE-2022-36884"))))
+ (license license:gpl2)
+ (home-page "https://git-scm.com/";)))
(define-public git-minimal
;; The size of the closure of 'git-minimal' is two thirds that of 'git'.
diff --cc guix/build/qt-utils.scm
index b9c5a76f34,2e47f1bc02..b8ecfedd43
--- a/guix/build/qt-utils.scm
+++ b/guix/build/qt-utils.scm
@@@ -82,17 -87,20 +87,20 @@@
"/applications" "/cursors" "/fonts" "/icons" "/glib-2.0/schemas"
"/mime" "/sounds" "/themes" "/wallpapers")
'("XDG_CONFIG_DIRS" suffix directory "/etc/xdg")
- ;; The following variables can be extended by the user, but not
- ;; overridden, to ensure proper operation.
- '("QT_PLUGIN_PATH" prefix directory "/lib/qt5/plugins")
- '("QML2_IMPORT_PATH" prefix directory "/lib/qt5/qml")
+ ;; We wrap exactly to avoid potentially mixing Qt5/Qt6 components, which
+ ;; would cause warnings, perhaps problems.
+ `("QT_PLUGIN_PATH" = directory
+ ,(format #f "/lib/qt~a/plugins" qt-major-version))
+ `("QML2_IMPORT_PATH" = directory
+ ,(format #f "/lib/qt~a/qml" qt-major-version))
;; QTWEBENGINEPROCESS_PATH accepts a single value, which makes 'exact the
;; most suitable environment variable type for it.
- '("QTWEBENGINEPROCESS_PATH" = regular
- "/lib/qt5/libexec/QtWebEngineProcess"))))
+ `("QTWEBENGINEPROCESS_PATH" = regular
+ ,(format #f "/lib/qt~a/libexec/QtWebEngineProcess" qt-major-version)))))
-(define* (wrap-qt-program* program #:key inputs output-dir
+(define* (wrap-qt-program* program #:key sh inputs output-dir
- qt-wrap-excluded-inputs)
+ qt-wrap-excluded-inputs
+ (qt-major-version %default-qt-major-version))
(define input-directories
(filter-map
@@@ -104,23 -112,26 +112,27 @@@
(let ((vars-to-wrap (variables-for-wrapping
(cons output-dir input-directories)
- output-dir)))
+ output-dir
+ #:qt-major-version qt-major-version)))
(when (not (null? vars-to-wrap))
- (apply wrap-program program vars-to-wrap))))
+ (apply wrap-program program #:sh sh vars-to-wrap))))
-(define* (wrap-qt-program program-name #:key inputs output
+(define* (wrap-qt-program program-name #:key (sh (which "bash")) inputs output
- (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs))
+ (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)
+ (qt-major-version %default-qt-major-version))
"Wrap the specified program (which must reside in the OUTPUT's \"/bin\"
directory) with suitably set environment variables.
This is like qt-build-systems's phase \"qt-wrap\", but only the named program
is wrapped."
(wrap-qt-program* (string-append output "/bin/" program-name)
+ #:sh sh
#:output-dir output #:inputs inputs
- #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs))
+ #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs
+ #:qt-major-version qt-major-version))
-(define* (wrap-all-qt-programs #:key inputs outputs
+(define* (wrap-all-qt-programs #:key (sh (which "bash")) inputs outputs
+ qtbase
(qt-wrap-excluded-outputs '())
(qt-wrap-excluded-inputs
%qt-wrap-excluded-inputs)
#:allow-other-keys)
@@@ -149,9 -169,9 +170,10 @@@ add a dependency of that output on Qt.
((output . output-dir)
(unless (member output qt-wrap-excluded-outputs)
(for-each (cut wrap-qt-program* <>
+ #:sh sh
#:output-dir output-dir #:inputs inputs
- #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs)
+ #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs
+ #:qt-major-version qt-major-version)
(find-files-to-wrap output-dir))))))
(for-each handle-output outputs))
- 12/27: gnu: fribidi: Update to 1.0.12., (continued)
- 12/27: gnu: fribidi: Update to 1.0.12., guix-commits, 2022/08/11
- 14/27: gnu: pango: Update to 1.50.8., guix-commits, 2022/08/11
- 09/27: gnu: inkscape: Remove input labels., guix-commits, 2022/08/11
- 15/27: gnu: graphviz: Remove input labels., guix-commits, 2022/08/11
- 17/27: gnu: vala: Remove 0.54.2., guix-commits, 2022/08/11
- 20/27: gnu: dconf: Remove input labels., guix-commits, 2022/08/11
- 03/27: gnu: Remove librsvg-bootstrap., guix-commits, 2022/08/11
- 10/27: gnu: lib2geom: Remove 1.1., guix-commits, 2022/08/11
- 23/27: gnu: libvisual-plugins: Remove input labels., guix-commits, 2022/08/11
- 24/27: gnu: Remove gnupg/fixed., guix-commits, 2022/08/11
- 01/27: Merge branch 'staging' into core-updates,
guix-commits <=
- 02/27: gnu: librsvg: Update to 2.54.4., guix-commits, 2022/08/11
- 05/27: gnu: libsoup-minimal@2: Update to 2.72.4., guix-commits, 2022/08/11
- 04/27: gnu: libsoup-minimal: Update to 3.0.7., guix-commits, 2022/08/11
- 08/27: gnu: inkscape: Remove obsolete input., guix-commits, 2022/08/11
- 07/27: gnu: inkscape/stable: Update to 1.2.1., guix-commits, 2022/08/11
- 11/27: gnu: gtk+@2: Disable failing tests., guix-commits, 2022/08/11
- 13/27: gnu: libthai: Update to 0.1.29., guix-commits, 2022/08/11
- 16/27: gnu: graphviz: Update to 5.0.0., guix-commits, 2022/08/11
- 18/27: gnu: vala: Remove input labels., guix-commits, 2022/08/11
- 19/27: gnu: harfbuzz: Update to 5.1.0., guix-commits, 2022/08/11