[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/02: Merge branch 'staging' into core-updates |
|
Date: |
Sat, 27 Aug 2022 11:25:14 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit ad384816fe260be98bc53701d9d761197ef162fc
Merge: d08411ffd0 fb3d90b8f3
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Aug 27 17:10:55 2022 +0200
Merge branch 'staging' into core-updates
doc/guix.texi | 175 +-
etc/news.scm | 13 +-
etc/time-travel-manifest.scm | 2 +-
gnu/bootloader.scm | 1 -
gnu/ci.scm | 61 +-
gnu/home.scm | 2 +-
gnu/home/services.scm | 5 +-
gnu/home/services/ssh.scm | 12 +-
gnu/installer/parted.scm | 1 -
gnu/local.mk | 13 +-
gnu/packages/admin.scm | 55 +-
gnu/packages/algebra.scm | 12 +-
gnu/packages/animation.scm | 49 +-
gnu/packages/assembly.scm | 7 +-
gnu/packages/audio.scm | 32 +
gnu/packages/benchmark.scm | 4 +-
gnu/packages/bioconductor.scm | 207 +-
gnu/packages/bioinformatics.scm | 473 +-
gnu/packages/bittorrent.scm | 3 +-
gnu/packages/bootloaders.scm | 6 +-
gnu/packages/browser-extensions.scm | 4 +-
gnu/packages/build-tools.scm | 4 +-
gnu/packages/c.scm | 4 +-
gnu/packages/cdrom.scm | 83 +-
gnu/packages/check.scm | 37 +-
gnu/packages/chromium.scm | 6 +-
gnu/packages/ci.scm | 22 +-
gnu/packages/code.scm | 4 +-
gnu/packages/coq.scm | 13 +-
gnu/packages/cpp.scm | 34 +
gnu/packages/cran.scm | 238 +-
gnu/packages/crates-io.scm | 328 +-
gnu/packages/cups.scm | 35 +-
gnu/packages/databases.scm | 109 +-
gnu/packages/debian.scm | 6 +-
gnu/packages/dezyne.scm | 4 +-
gnu/packages/diffoscope.scm | 4 +-
gnu/packages/dns.scm | 12 +-
gnu/packages/documentation.scm | 12 +-
gnu/packages/dunst.scm | 4 +-
gnu/packages/ebook.scm | 4 +-
gnu/packages/emacs-xyz.scm | 468 +-
gnu/packages/engineering.scm | 80 +-
gnu/packages/file-systems.scm | 44 +-
gnu/packages/finance.scm | 175 +-
gnu/packages/firmware.scm | 8 +-
gnu/packages/fonts.scm | 25 +-
gnu/packages/fontutils.scm | 10 +-
gnu/packages/fpga.scm | 6 +-
gnu/packages/game-development.scm | 87 +-
gnu/packages/games.scm | 396 +-
gnu/packages/gcc.scm | 4 +-
gnu/packages/geo.scm | 41 +-
gnu/packages/gnome-xyz.scm | 3 +-
gnu/packages/gnome.scm | 86 +-
gnu/packages/gnuzilla.scm | 247 +-
gnu/packages/golang.scm | 106 +-
gnu/packages/graph.scm | 4 +-
gnu/packages/graphics.scm | 15 +-
gnu/packages/graphviz.scm | 2 +
gnu/packages/gstreamer.scm | 2 +-
gnu/packages/gtk.scm | 19 +-
gnu/packages/guile-xyz.scm | 97 +-
gnu/packages/hardware.scm | 90 +-
gnu/packages/haskell.scm | 486 +-
gnu/packages/image-viewers.scm | 50 +-
gnu/packages/image.scm | 26 +
gnu/packages/instrumentation.scm | 35 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/java.scm | 3 +
gnu/packages/julia.scm | 39 +-
gnu/packages/libreoffice.scm | 5 +-
gnu/packages/linux.scm | 123 +-
gnu/packages/lisp-xyz.scm | 34 +-
gnu/packages/lisp.scm | 8 +-
gnu/packages/lxde.scm | 150 +-
gnu/packages/lxqt.scm | 445 +-
gnu/packages/machine-learning.scm | 8 +-
gnu/packages/mail.scm | 49 +-
gnu/packages/maths.scm | 64 +
gnu/packages/maven.scm | 4 +-
gnu/packages/messaging.scm | 31 +
gnu/packages/moe.scm | 5 +-
gnu/packages/music.scm | 21 +-
gnu/packages/networking.scm | 19 +-
gnu/packages/ocaml.scm | 394 +-
gnu/packages/ocr.scm | 186 +-
gnu/packages/package-management.scm | 17 +
gnu/packages/patches/crawl-upgrade-saves.patch | 4 +-
.../guile-fibers-epoll-instance-is-dead.patch | 99 +
.../patches/lcalc-default-parameters-1.patch | 26 -
.../patches/lcalc-default-parameters-2.patch | 58 -
gnu/packages/patches/lcalc-lcommon-h.patch | 13 -
.../patches/lcalc-using-namespace-std.patch | 43 -
gnu/packages/patches/lrcalc-includes.patch | 92 -
.../perl-class-methodmaker-reproducible.patch | 21 +
gnu/packages/patches/polkit-CVE-2021-4034.patch | 82 -
.../patches/polkit-configure-elogind.patch | 15 -
gnu/packages/patches/polkit-use-duktape.patch | 5030 --------------------
.../patches/python-dateutil-pytest-compat.patch | 43 +
gnu/packages/patches/python-mypy-12332.patch | 68 -
.../patches/python-mypy-use-sys-path.patch | 130 -
gnu/packages/perl-check.scm | 6 +-
gnu/packages/perl.scm | 10 +-
gnu/packages/plotutils.scm | 4 +-
gnu/packages/polkit.scm | 108 +-
gnu/packages/pulseaudio.scm | 55 +-
gnu/packages/python-check.scm | 12 +-
gnu/packages/python-compression.scm | 47 +-
gnu/packages/python-crypto.scm | 29 +-
gnu/packages/python-science.scm | 2 +-
gnu/packages/python-web.scm | 25 +
gnu/packages/python-xyz.scm | 404 +-
gnu/packages/qt.scm | 101 +-
gnu/packages/radio.scm | 10 +-
gnu/packages/rsync.scm | 4 +-
gnu/packages/sagemath.scm | 72 +-
gnu/packages/search.scm | 10 +-
gnu/packages/security-token.scm | 8 +-
gnu/packages/selinux.scm | 384 +-
gnu/packages/shells.scm | 13 +-
gnu/packages/sphinx.scm | 26 +-
gnu/packages/syncthing.scm | 18 +-
gnu/packages/telegram.scm | 2 +-
gnu/packages/telephony.scm | 2 +-
gnu/packages/terminals.scm | 56 +-
gnu/packages/tex.scm | 2 +
gnu/packages/text-editors.scm | 4 +-
gnu/packages/time.scm | 1 +
gnu/packages/tor.scm | 47 +-
gnu/packages/upnp.scm | 4 +-
gnu/packages/version-control.scm | 10 +-
gnu/packages/video.scm | 94 +-
gnu/packages/vim.scm | 8 +-
gnu/packages/vpn.scm | 6 +-
gnu/packages/web.scm | 117 +-
gnu/packages/wm.scm | 10 +-
gnu/packages/xfce.scm | 38 +-
gnu/packages/xiph.scm | 12 +-
gnu/packages/xorg.scm | 20 +-
gnu/services/base.scm | 24 +-
gnu/services/configuration.scm | 40 +-
gnu/services/desktop.scm | 23 +-
gnu/services/file-sharing.scm | 11 +-
gnu/services/getmail.scm | 6 +-
gnu/services/kerberos.scm | 1 +
gnu/services/messaging.scm | 17 +-
gnu/services/networking.scm | 2 +-
gnu/services/telephony.scm | 6 +-
gnu/tests/desktop.scm | 17 +
guix/build-system/gnu.scm | 2 +-
guix/import/utils.scm | 6 +-
guix/ui.scm | 27 +-
po/packages/Makevars | 3 +-
tests/services/configuration.scm | 4 +-
155 files changed, 5537 insertions(+), 8478 deletions(-)
diff --cc gnu/packages/cups.scm
index bd5e06a9a5,3de9ddbf22..4c8b9cd4d2
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@@ -51,9 -50,9 +51,10 @@@
#:use-module (gnu packages tls)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
diff --cc gnu/packages/databases.scm
index ad425cb617,6c97dbe413..7002aedd05
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -3510,44 -3540,37 +3540,37 @@@ PickleShare."
(define-public python-apsw
(package
(name "python-apsw")
- (version "3.36.0-r1")
+ (version "3.39.2.0")
(source
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/rogerbinns/apsw/releases";
- "/download/" version "/apsw-" version ".zip"))
- (sha256
- (base32
- "0w8q73147hv77dlpqrx6h1gx03acc8xqhvdpfp6vkffdm0wmqd8p"))))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rogerbinns/apsw";)
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0q7fnk8n3m5mpjzh6xyhj409k8sacdbjsfis98my9c50fdn5sr7y"))))
(build-system python-build-system)
- (native-inputs
- (list unzip))
- (inputs
- (list sqlite))
- (inputs (list sqlite-next)) ;SQLite 3.39 required.
++ (inputs (list sqlite))
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'build
- (lambda _
- (invoke "python" "setup.py" "build" "--enable-all-extensions"
- "--enable=load_extension")
- #t))
- (add-after 'build 'build-test-helper
- (lambda _
- (invoke "gcc" "-fPIC" "-shared" "-o" "./testextension.sqlext"
- "-I." "-Isqlite3" "src/testextension.c")
- #t))
- (replace 'check
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (add-installed-pythonpath inputs outputs)
- (invoke "python" "setup.py" "test")
- #t)))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (replace 'build
+ (lambda _
+ (invoke "python" "setup.py" "build"
"--enable-all-extensions"
+ "--enable=load_extension")))
+ (add-after 'build 'build-test-helper
+ (lambda _
+ (invoke "gcc" "-fPIC" "-shared" "-o"
"./testextension.sqlext"
+ "-I." "-Isqlite3" "src/testextension.c"))))))
(home-page "https://github.com/rogerbinns/apsw/";)
(synopsis "Another Python SQLite Wrapper")
- (description "APSW is a Python wrapper for the SQLite
- embedded relational database engine. In contrast to other wrappers such as
- pysqlite it focuses on being a minimal layer over SQLite attempting just to
- translate the complete SQLite API into Python.")
+ (description
+ "APSW is a Python wrapper for the SQLite embedded relational database
+ engine. In contrast to other wrappers such as pysqlite it focuses on being a
+ minimal layer over SQLite attempting just to translate the complete SQLite API
+ into Python.")
(license license:zlib)))
(define-public python-aiosqlite
diff --cc gnu/packages/gnuzilla.scm
index faebb2c349,589f123029..c4239d769f
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -228,7 -205,7 +206,7 @@@ fractional-second-digits-append-item.js
rust
`(,rust "cargo")))
(inputs
- (list icu4c-69 readline zlib))
- (list icu4c-71 readline zlib))
++ (list icu4c readline zlib))
(propagated-inputs
(list nspr)) ; in the Requires.private field of mozjs-*.pc
(home-page
@@@ -238,6 -215,139 +216,139 @@@
in C/C++.")
(license license:mpl2.0))) ; and others for some files
+ (define-public mozjs-91
+ (package
+ (inherit mozjs)
+ (version "91.13.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://ftp.mozilla.org/pub/firefox";
+ "/releases/" version "esr/source/firefox-"
+ version "esr.source.tar.xz"))
+ (sha256
+ (base32
+ "0qh7j960wdp5zcfqhkj8ki47spp9i9ms12xx0v0kxvmmw36jpgjk"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments mozjs)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-before 'check 'disable-timezone-tests
+ (lambda _
+ (with-directory-excursion "../js/src/tests"
+ ;; FIXME: Assertion failed: got "2021a", expected "2021a3"?
+ (delete-file
"non262/Intl/DateTimeFormat/timeZone_version.js")
+ ;; XXX: Delete all tests that test time zone functionality,
+ ;; because the test suite uses /etc/localtime to figure out
+ ;; the offset from the hardware clock, which does not work
+ ;; in the build container. See
<tests/non262/Date/shell.js>.
+ (delete-file-recursively "non262/Date")
+ (delete-file
+
"non262/Intl/DateTimeFormat/tz-environment-variable.js"))))))))
+ (inputs (modify-inputs (package-inputs mozjs)
- (replace "icu4c" icu4c)))))
++ (replace "icu4c" icu4c-69)))))
+
+ (define-public mozjs-78
+ (package
+ (inherit mozjs)
+ (name "mozjs")
+ (version "78.15.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://archive.mozilla.org/pub/firefox";
+ "/releases/" version "esr/source/firefox-"
+ version "esr.source.tar.xz"))
+ (sha256
+ (base32
+ "0l91cxdc5v9fps79ckb1kid4gw6v5qng1jd9zvaacwaiv628shx4"))))
+ (build-system gnu-build-system)
+ (arguments
+ (substitute-keyword-arguments (package-arguments mozjs)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'configure
+ (lambda* (#:key configure-flags #:allow-other-keys)
+ ;; The configure script does not accept environment variables
as
+ ;; arguments. It also must be run from a different directory,
+ ;; but not the root directory either.
+ (mkdir "run-configure-from-here")
+ (chdir "run-configure-from-here")
+ (setenv "SHELL" (which "sh"))
+ (setenv "CONFIG_SHELL" (which "sh"))
+ (setenv "AUTOCONF" (which "autoconf"))
+ (apply invoke "../js/src/configure"
+ (cons (string-append "--prefix=" #$output)
+ configure-flags))))
+ (replace 'adjust-tests
+ (lambda _
+ (with-directory-excursion "../js/src/tests"
+ ;; The test suite expects a lightly patched ICU 67. Since
+ ;; Guix is about to switch to ICU 68, massage the tests to
+ ;; work with that instead of patching ICU. Try removing
this
+ ;; phase for newer versions of mozjs.
+
+ ;; These tests look up locale names and expects to get
+ ;; "GB" instead of "UK".
+ (substitute* "non262/Intl/DisplayNames/language.js"
+ (("Traditionell, GB")
+ "Traditionell, UK"))
+ (substitute* "non262/Intl/DisplayNames/region.js"
+ (("\"GB\": \"GB\"")
+ "\"GB\": \"UK\""))
+
+ ;; XXX: Some localized time formats have changed, and
+ ;; substitution fails for accented characters, even though
+ ;; it works in the REPL(?). Just delete these for now.
+ (delete-file "non262/Intl/Date/toLocaleString_timeZone.js")
+ (delete-file
"non262/Intl/Date/toLocaleDateString_timeZone.js")
+
+ ;; Similarly, these get an unexpected "A" suffix when
looking
+ ;; up a time in the "ar-MA-u-ca-islamicc" locale, which is
+ ;; tricky to substitute.
+ (delete-file
"non262/Intl/DateTimeFormat/format_timeZone.js")
+ (delete-file "non262/Intl/DateTimeFormat/format.js")
+
+ ;; This file compares a generated list of ICU locale names
+ ;; with actual lookups. Some have changed slightly, i.e.
+ ;; daf-Latn-ZZ -> daf-Latn-CI, so drop it for simplicity.
+ (delete-file
"non262/Intl/Locale/likely-subtags-generated.js"))))
+ (replace 'pre-check
+ (lambda _
+ (with-directory-excursion "../js/src/tests"
+ (substitute* "shell/os.js"
+ ;; FIXME: Why does the killed process have an exit status?
+ ((".*killed process should not have exitStatus.*")
+ ""))
+
+ ;; XXX: Delete all tests that test time zone functionality,
+ ;; because the test suite uses /etc/localtime to figure out
+ ;; the offset from the hardware clock, which does not work
+ ;; in the build container. See
<tests/non262/Date/shell.js>.
+ (delete-file-recursively "non262/Date")
+ (delete-file
"non262/Intl/DateTimeFormat/tz-environment-variable.js")
+
+ (setenv "JSTESTS_EXTRA_ARGS"
+ (string-join
+ (list
+ ;; Do not run tests marked as "random".
+ "--exclude-random"
+ ;; Exclude web platform tests.
+ "--wpt=disabled"
+ ;; Respect the daemons configured number of jobs.
+ (string-append "--worker-count="
+ (number->string
+ (parallel-job-count)))))))))))))
+ (native-inputs
+ (list autoconf-2.13
+ automake
+ llvm ;for llvm-objdump
+ perl
+ pkg-config
+ python-3
+ rust
+ `(,rust "cargo")))
+ (inputs
- (list icu4c readline zlib))))
++ (list icu4c-69 readline zlib))))
+
(define mozilla-compare-locales
(origin
(method hg-fetch)
diff --cc gnu/packages/haskell.scm
index ad2aa20ee1,8a3c8d44c7..2eb5d6461c
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@@ -599,21 -587,7 +591,9 @@@ interactive environment for the functio
(supported-systems '("i686-linux" "x86_64-linux"))
(outputs '("out" "doc"))
(inputs
- `(("gmp" ,gmp)
- ("ncurses" ,ncurses)
-
- ;; Use a LibFFI variant without static trampolines to work around
- ;; <https://gitlab.haskell.org/ghc/ghc/-/issues/20051>.
- ("libffi" ,libffi-sans-static-trampolines)
-
- ("ghc-testsuite"
- ,(origin
- (method url-fetch)
- (uri (string-append
- "https://www.haskell.org/ghc/dist/";
- version "/" name "-" version "-testsuite.tar.xz"))
- (sha256
- (base32
"1wjc3x68l305bl1h1ijd3yhqp2vqj83lkp3kqbr94qmmkqlms8sj"))))))
- (list gmp ncurses libffi))
++ ;; Use a LibFFI variant without static trampolines to work around
++ ;; <https://gitlab.haskell.org/ghc/ghc/-/issues/20051>.
++ (list gmp ncurses libffi-sans-static-trampolines))
(native-inputs
`(("perl" ,perl)
("python" ,python-2) ; for tests
diff --cc gnu/packages/python-xyz.scm
index 68d4ae8687,ca7b1074b1..e71b921896
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -5644,8 -5708,26 +5709,10 @@@ with Python. It contains among other t
object, sophisticated (broadcasting) functions, tools for integrating C/C++
and Fortran code, useful linear algebra, Fourier transform, and random number
capabilities.")
+ (properties
+ '((upstream-name . "numpy")))
(license license:bsd-3)))
-(define-public python-numpy-next
- (package
- (inherit python-numpy)
- (name "python-numpy-next")
- (version "1.22.3")
- (source
- (origin
- (inherit (package-source python-numpy))
- (method url-fetch)
- (uri (string-append
- "https://github.com/numpy/numpy/releases/download/v";
- version "/numpy-" version ".tar.gz"))
- (sha256
- (base32
- "19dw91pqbqcniw2z57kiyqs1qp56g7kqy1bdyv664g8s62sc01m9"))))))
-
(define-public python-numpy-documentation
(package
(inherit python-numpy)
diff --cc gnu/packages/sphinx.scm
index 065358a57f,cded866c90..dc3a90bbcb
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@@ -109,16 -109,12 +109,12 @@@
texlive-capt-of
texlive-carlisle ;remreset
texlive-etoolbox
- texlive-generic-ltxcmds
+ texlive-ltxcmds
texlive-hyperref
- ;; TODO: Remove texlive-stringenc and texlive-zapfding after
- ;; propagating them in texlive-hyperref in next rebuild cycle.
- texlive-stringenc
- texlive-zapfding
texlive-latex-base ;alltt, atbegshi, makeidx, textcomp
texlive-latex-cmap
- texlive-latex-fancyhdr
- texlive-latex-fancyvrb
+ texlive-fancyhdr
+ texlive-fancyvrb
texlive-latex-float
texlive-latex-fncychap
texlive-latex-framed
diff --cc gnu/packages/tex.scm
index d4db2a61ac,3f44c6239d..16024ada52
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -3524,52 -3402,36 +3524,54 @@@ XML, using UTF-8 or a suitable 8-bit en
(inherit template)
(arguments
(substitute-keyword-arguments (package-arguments template)
- ((#:tex-directory _ #t)
+ ((#:tex-directory _ '())
"latex/hyperref")
+ ((#:build-targets _ '())
+ #~(list "hyperref.ins"))
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'chdir
- (lambda _ (chdir "source/latex/hyperref") #t))))))
+ #~(modify-phases #$phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "source/latex/hyperref")))
+ (replace 'copy-files
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((origin (assoc-ref inputs "source"))
+ (source (string-append #$output
+ "/share/texmf-dist/source"))
+ (doc (string-append #$output:doc
+ "/share/texmf-dist/doc")))
+ (copy-recursively (string-append origin "/source") source)
+ (copy-recursively (string-append origin "/doc") doc)
+ ;; XXX: These files are not auto-generated from the
+ ;; sources.
+ (for-each (lambda (f)
+ (install-file
+ (string-append origin "/tex/latex/hyperref/"
f)
+ (string-append
+ #$output
+ "/share/texmf-dist/tex/latex/hyperref")))
+ '("minitoc-hyper.sty"
+ "ntheorem-hyper.sty"
+ "xr-hyper.sty")))))))))
(propagated-inputs
- (list texlive-generic-atbegshi
- texlive-generic-bitset
- texlive-generic-etexcmds
- texlive-generic-gettitlestring
- texlive-generic-iftex
- texlive-generic-infwarerr
- texlive-generic-intcalc
- texlive-generic-kvdefinekeys
- texlive-generic-kvsetkeys
- texlive-generic-ltxcmds
- texlive-generic-pdfescape
- texlive-latex-auxhook
- texlive-latex-atveryend
- texlive-latex-hycolor
- texlive-latex-kvoptions
- texlive-latex-letltxmacro
- texlive-latex-pdftexcmds
- texlive-latex-refcount
- texlive-latex-rerunfilecheck
- texlive-url
+ (list texlive-atbegshi
+ texlive-auxhook
+ texlive-bitset
+ texlive-cm
- texlive-latex-graphics ;for keyval
+ texlive-etexcmds
+ texlive-gettitlestring
++ texlive-graphics ;for keyval
+ texlive-hycolor
+ texlive-intcalc
+ texlive-kvdefinekeys
+ texlive-kvsetkeys
+ texlive-letltxmacro
+ texlive-ltxcmds
+ texlive-pdfescape
+ texlive-refcount
+ texlive-rerunfilecheck
texlive-stringenc
+ texlive-url
texlive-zapfding))
(home-page "https://www.ctan.org/pkg/hyperref";)
(synopsis "Extensive support for hypertext in LaTeX")
diff --cc gnu/packages/version-control.scm
index 9529963a85,277ea2835b..15f3471c88
--- 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.2")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://kernel.org/software/scm/git/git-"
- version ".tar.xz"))
- (sha256
- (base32
- "00xhdm086bxm4v2p8m7ra7vf9kwdppw4l2n3vakfff253j19qg8w"))))
- (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
- "1zhn91fzyyz890a5hm0bvs0vnhy8c81q1fhsk2gfwbbh73z161nz"))))
- ;; 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.37.1")
++ (version "2.37.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://kernel.org/software/scm/git/git-"
+ version ".tar.xz"))
+ (sha256
+ (base32
- "001m3gnal902hv22gp1m44c6247357pb80db0svms74gidmjq5n8"))))
++ "00xhdm086bxm4v2p8m7ra7vf9kwdppw4l2n3vakfff253j19qg8w"))))
+ (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
- "098yz8kzvzmmrkyiv8j79s5nryws302pnq6jcbrqbidrziwcxkjd"))))
++ "1zhn91fzyyz890a5hm0bvs0vnhy8c81q1fhsk2gfwbbh73z161nz"))))
+ ;; 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:"