me
/
guix
Archived
1
0
Fork 0
Code

Merge branch 'master' into gnome-team

master
Liliana Marie Prikler 2024-03-02 12:22:34 +01:00
parent 71a3dca25c 4a0549be52
commit 25c14c893f
No known key found for this signature in database
GPG Key ID: 442A84B8C70E2F87
95 changed files with 112170 additions and 136339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
doc/guix.texi
View File

@ -40546,16 +40546,31 @@ After @command{guix system reconfigure} configure Nix for your user:
@itemize @itemize
@item Add a Nix channel and update it. See @item Add a Nix channel and update it. See
@url{https://nixos.org/nix/manual/, Nix Package Manager Guide}. @url{https://nixos.wiki/wiki/Nix_channels, Nix channels} for more
information about the available channels. If you would like to use the
unstable Nix channel you can do this by running:
@example
$ nix-channel --add https://nixos.org/channels/nixpkgs-unstable
$ nix-channel --update
@end example
@item Create your Nix profile directory:
@example
$ sudo mkdir -p /nix/var/nix/profiles/per-user/$USER
$ sudo chown $USER:root /nix/var/nix/profiles/per-user/$USER
@end example
@item Create a symlink to your profile and activate Nix profile: @item Create a symlink to your profile and activate Nix profile:
@end itemize
@example @example
$ ln -s "/nix/var/nix/profiles/per-user/$USER/profile" ~/.nix-profile $ ln -s "/nix/var/nix/profiles/per-user/$USER/profile" ~/.nix-profile
$ source /run/current-system/profile/etc/profile.d/nix.sh $ source /run/current-system/profile/etc/profile.d/nix.sh
@end example @end example
@end itemize
@end defvar @end defvar
@deftp {Data Type} nix-configuration @deftp {Data Type} nix-configuration

19
gnu/local.mk
View File

@ -56,7 +56,7 @@
# Copyright © 2022 Alex Griffin <a@ajgrf.com> # Copyright © 2022 Alex Griffin <a@ajgrf.com>
# Copyright © 2022 ( <paren@disroot.org> # Copyright © 2022 ( <paren@disroot.org>
# Copyright © 2022 jgart <jgart@dismail.de> # Copyright © 2022 jgart <jgart@dismail.de>
# Copyright © 2023 Zheng Junjie <873216071@qq.com> # Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
# Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com> # Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
# Copyright © 2023 Andy Tai <atai@atai.org> # Copyright © 2023 Andy Tai <atai@atai.org>
# Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com> # Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
@ -202,9 +202,15 @@ GNU_SYSTEM_MODULES = \
%D%/packages/cpp.scm \ %D%/packages/cpp.scm \
%D%/packages/cppi.scm \ %D%/packages/cppi.scm \
%D%/packages/cran.scm \ %D%/packages/cran.scm \
%D%/packages/crates-apple.scm \
%D%/packages/crates-crypto.scm \
%D%/packages/crates-io.scm \ %D%/packages/crates-io.scm \
%D%/packages/crates-graphics.scm \ %D%/packages/crates-graphics.scm \
%D%/packages/crates-gtk.scm \ %D%/packages/crates-gtk.scm \
%D%/packages/crates-tls.scm \
%D%/packages/crates-vcs.scm \
%D%/packages/crates-web.scm \
%D%/packages/crates-windows.scm \
%D%/packages/cross-base.scm \ %D%/packages/cross-base.scm \
%D%/packages/cross-toolchain.scm \ %D%/packages/cross-toolchain.scm \
%D%/packages/crypto.scm \ %D%/packages/crypto.scm \
@ -975,7 +981,6 @@ dist_patch_DATA = \
%D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \
%D%/packages/patches/bc-fix-cross-compilation.patch \ %D%/packages/patches/bc-fix-cross-compilation.patch \
%D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \ %D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \
%D%/packages/patches/bind-re-add-attr-constructor-priority.patch \
%D%/packages/patches/brightnessctl-elogind-support.patch \ %D%/packages/patches/brightnessctl-elogind-support.patch \
%D%/packages/patches/bsd-games-2.17-64bit.patch \ %D%/packages/patches/bsd-games-2.17-64bit.patch \
%D%/packages/patches/bsd-games-add-configure-config.patch \ %D%/packages/patches/bsd-games-add-configure-config.patch \
@ -1411,7 +1416,6 @@ dist_patch_DATA = \
%D%/packages/patches/guile-fibers-libevent-timeout.patch \ %D%/packages/patches/guile-fibers-libevent-timeout.patch \
%D%/packages/patches/guile-fix-invalid-unicode-handling.patch \ %D%/packages/patches/guile-fix-invalid-unicode-handling.patch \
%D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \
%D%/packages/patches/guile-git-adjust-for-libgit2-1.2.0.patch \
%D%/packages/patches/guile-hurd-posix-spawn.patch \ %D%/packages/patches/guile-hurd-posix-spawn.patch \
%D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-present-coding.patch \
%D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \
@ -1523,7 +1527,6 @@ dist_patch_DATA = \
%D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch \
%D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \ %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \
%D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \
%D%/packages/patches/librime-fix-build-with-gcc10.patch \
%D%/packages/patches/libvirt-add-install-prefix.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \
%D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/libziparchive-add-includes.patch \
%D%/packages/patches/lightdm-arguments-ordering.patch \ %D%/packages/patches/lightdm-arguments-ordering.patch \
@ -1816,7 +1819,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-sip-include-dirs.patch \ %D%/packages/patches/python-sip-include-dirs.patch \
%D%/packages/patches/python-sgmllib3k-assertions.patch \ %D%/packages/patches/python-sgmllib3k-assertions.patch \
%D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch \ %D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch \
%D%/packages/patches/python-telingo-fix-comparison.patch \
%D%/packages/patches/python-typeguard-python3.10.patch \ %D%/packages/patches/python-typeguard-python3.10.patch \
%D%/packages/patches/python-uqbar-python3.10.patch \ %D%/packages/patches/python-uqbar-python3.10.patch \
%D%/packages/patches/python-wxwidgets-type-errors.patch \ %D%/packages/patches/python-wxwidgets-type-errors.patch \
@ -2009,13 +2011,14 @@ dist_patch_DATA = \
%D%/packages/patches/rustc-1.54.0-src.patch \ %D%/packages/patches/rustc-1.54.0-src.patch \
%D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch \ %D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch \
%D%/packages/patches/rust-1.70-fix-rustix-build.patch \ %D%/packages/patches/rust-1.70-fix-rustix-build.patch \
%D%/packages/patches/rust-ring-0.16-missing-files.patch \ %D%/packages/patches/rust-cargo-edit-remove-ureq.patch \
%D%/packages/patches/rust-ring-0.16-test-files.patch \ %D%/packages/patches/rust-ring-0.17-ring-core.patch \
%D%/packages/patches/i3status-rust-enable-unstable-features.patch \
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \ %D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
%D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \ %D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \
%D%/packages/patches/rust-ndarray-0.14-remove-blas-src.patch \ %D%/packages/patches/rust-ndarray-0.14-remove-blas-src.patch \
%D%/packages/patches/rust-nettle-disable-vendor.patch \ %D%/packages/patches/rust-nettle-disable-vendor.patch \
%D%/packages/patches/rust-rspec-1-remove-clippy.patch \
%D%/packages/patches/rust-trash-2-update-windows.patch \
%D%/packages/patches/rust-webbrowser-remove-unsupported-os.patch \ %D%/packages/patches/rust-webbrowser-remove-unsupported-os.patch \
%D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \
%D%/packages/patches/rw-igraph-0.10.patch \ %D%/packages/patches/rw-igraph-0.10.patch \

1
gnu/packages/admin.scm
View File

@ -114,6 +114,7 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages crates-graphics) #:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-windows)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages cryptsetup) #:use-module (gnu packages cryptsetup)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)

43
gnu/packages/algebra.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2022 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2022, 2023, 2024 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2015, 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
@ -133,25 +133,26 @@ greatest common divisor operations.")
(define-public cm (define-public cm
(package (package
(name "cm") (name "cm")
(version "0.4.2") (version "0.4.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://www.multiprecision.org/downloads/cm-" "https://www.multiprecision.org/downloads/cm-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1c6m00wiw3rs5f0lq6c80rdr3dzklsvh69l8w3s7bj2r6yha6qbw")))) "01dha0hl0daappjiydpk4ngl9nxkxli6a48jp6d7v85yjjykac5j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
(list mpfrcx zlib)) ; Header files included from cm_common.h. (list mpfrcx zlib)) ; Header files included from lib/cm.h.
(inputs (inputs
(list pari-gp)) (list flint pari-gp))
(synopsis "CM constructions for elliptic curves") (synopsis "CM constructions for elliptic curves")
(description (description
"The CM software implements the construction of ring class fields of "The CM software implements the construction of ring class fields of
imaginary quadratic number fields and of elliptic curves with complex imaginary quadratic number fields and of elliptic curves with complex
multiplication via floating point approximations. It consists of libraries multiplication via floating point approximations, and the elliptic curve
primality proving algorithm (ECPP). It consists of libraries
that can be called from within a C program and of executable command that can be called from within a C program and of executable command
line applications.") line applications.")
(license license:gpl3+) (license license:gpl3+)
@ -295,6 +296,34 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
(license license:gpl2) (license license:gpl2)
(home-page "https://pari.math.u-bordeaux.fr/"))) (home-page "https://pari.math.u-bordeaux.fr/")))
(define-public paritwine
(package
(name "paritwine")
(version "0.2.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://www.multiprecision.org/downloads/" name
"-" version
".tar.gz"))
(sha256
(base32
"15m5jxmhx5zivk1k9wxpmzs8kqva3kvgxizdrkrmmp1qycn85n23"))))
(build-system gnu-build-system)
(propagated-inputs (list pari-gp
gmp
mpfr
mpc
cmh
flint)) ; referenced in src/paritwine.h
(synopsis "Glue library between PARI/GP and other mathematics libraries")
(description
"PariTwine is a glue library between the system for computer algebra
and number theory PARI/GP and a number of other mathematics libraries,
currently GMP, GNU MPFR, GNU MPC, FLINT and CMH.")
(license license:gpl2+)
(home-page "https://www.multiprecision.org/paritwine/index.html")))
(define-public cmh (define-public cmh
(package (package
(name "cmh") (name "cmh")

541
gnu/packages/astronomy.scm
View File

@ -188,7 +188,7 @@ reused in several astronomical applications, such as @code{wsclean},
(define-public calceph (define-public calceph
(package (package
(name "calceph") (name "calceph")
(version "3.5.4") (version "3.5.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -196,7 +196,7 @@ reused in several astronomical applications, such as @code{wsclean},
"https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-" "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "1d95k62926p6h43qh9pxbpa5wm8rby5la9pqq3k6sdyg4gl39a69")))) (base32 "1jiaqyir2qcxzjlhk7f9fhrf6snjsiwxznvzdl996xr6m4lzbb7p"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list gfortran)) (list gfortran))
@ -505,6 +505,13 @@ in FITS files.")
(sha256 (sha256
(base32 "0ph9jhv4q4i4z6nkqr6hjw9148kdlnayxsn83qgv5dqn0h3nc9r8")))) (base32 "0ph9jhv4q4i4z6nkqr6hjw9148kdlnayxsn83qgv5dqn0h3nc9r8"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments
(list
;; FIXME: https://github.com/aplpy/aplpy/issues/492
#:tests? #f
#:phases
#~(modify-phases %standard-phases
(delete 'sanity-check))))
(propagated-inputs (propagated-inputs
(list python-astropy (list python-astropy
python-matplotlib python-matplotlib
@ -562,7 +569,13 @@ Main features:
(arguments (arguments
(list (list
#:test-flags #:test-flags
'(list "--ignore-glob=examples/*") '(list "--ignore-glob=examples/*"
;; Disable tests which are not compatible with Astropy 6.0.0, see
;; <https://github.com/astroML/astroML/issues/273>.
"--ignore=astroML/density_estimation/tests/test_bayesian_blocks.py"
"--ignore=astroML/density_estimation/tests/test_bayesian_blocks.py"
"--ignore=astroML/density_estimation/tests/test_hist_binwidth.py"
"--ignore=astroML/density_estimation/tests/test_hist_binwidth.py")
#:phases #:phases
'(modify-phases %standard-phases '(modify-phases %standard-phases
(add-after 'unpack 'patch-build-system (add-after 'unpack 'patch-build-system
@ -693,6 +706,63 @@ CFITSIO library. Among other things, it can
series in Python.") series in Python.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public python-ginga
(package
(name "python-ginga")
(version "4.1.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ginga" version))
(sha256
(base32 "0w60w9d2yqhbmggp0dljj5a0sk07gywifjq8nzw3y2v47vzgwqb6"))))
(build-system pyproject-build-system)
(propagated-inputs
(list ;;python-exifread ; optional, not packed yet in Guix
python-astropy
python-astroquery
python-dateutil
python-magic
python-matplotlib
python-fitsio
python-numpy
python-photutils
python-pillow
python-qtpy
python-scipy))
(native-inputs
(list python-attrs
python-docutils
python-pytest-astropy
python-semantic-version
python-tornado))
(home-page "https://ejeschke.github.io/ginga/")
(synopsis "Scientific image viewer and toolkit for FITS files")
(description "Ginga is a toolkit designed for building viewers for
scientific image data in Python, visualizing 2D pixel data in numpy arrays. It
can view astronomical data such as contained in files based on the
FITS (Flexible Image Transport System) file format. It is written and is
maintained by software engineers at the National Astronomical Observatory of
Japan (NAOJ), the Space Telescope Science Institute (STScI), and other
contributing entities.
The Ginga toolkit centers around an image display object which supports zooming
and panning, color and intensity mapping, a choice of several automatic cut
levels algorithms and canvases for plotting scalable geometric forms. In
addition to this widget, a general purpose \"reference\" FITS viewer is
provided, based on a plugin framework. A fairly complete set of standard plugins
are provided for features that we expect from a modern FITS viewer: panning and
zooming windows, star catalog access, cuts, star pick/FWHM, thumbnails, etc.")
(license license:bsd-3)))
(define-public ginga-qt5
(package/inherit python-ginga
(name "ginga-qt5")
(inputs
(modify-inputs (package-inputs python-ginga)
(prepend python-pyqt)))
(synopsis "Qt5 image viewer build based on python-ginga library")))
(define-public qfits (define-public qfits
(package (package
(name "qfits") (name "qfits")
@ -982,7 +1052,7 @@ programs for the manipulation and analysis of astronomical data.")
(define-public phd2 (define-public phd2
(package (package
(name "phd2") (name "phd2")
(version "2.6.12") (version "2.6.13")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -991,7 +1061,7 @@ programs for the manipulation and analysis of astronomical data.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "16695vyczl861fz5qinp23wqn6hzv5h1aspz9x21x67w0a3smbmy")) (base32 "0shr50ngi7dliijy8fxrd1c4hzkm4vp4m0a4m0d9gvrx56vzyx0s"))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 ftw) (ice-9 ftw)
(srfi srfi-26))) (srfi srfi-26)))
@ -1094,7 +1164,7 @@ crowded star fields.")
(define-public siril (define-public siril
(package (package
(name "siril") (name "siril")
(version "1.2.0") (version "1.2.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1102,7 +1172,7 @@ crowded star fields.")
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"0ss1m9w4cz1752vp5738057nzmqc6k7fc9pi6kr9cwgspi1haall")) "1lc6ga1n18br43rlj8qmg23chfniyvjz3vx73km6sv171z4c2fwy"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (list cmake git glib libconfig pkg-config)) (native-inputs (list cmake git glib libconfig pkg-config))
@ -1478,13 +1548,13 @@ accurately in real time at any rate desired.")
(define-public python-astropy (define-public python-astropy
(package (package
(name "python-astropy") (name "python-astropy")
(version "5.3.4") (version "6.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "astropy" version)) (uri (pypi-uri "astropy" version))
(sha256 (sha256
(base32 "1n7iwvjari4xv37094cpiapmjhhm57b04hi4r40wqb5czbigg46l")) (base32 "1nbpqx7ibm8zsyyy17y5rmfjamwz6mv0sy4drlisap9hald81k83"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1499,64 +1569,69 @@ accurately in real time at any rate desired.")
(for-each delete-file-recursively '("expat" "wcslib"))))))) (for-each delete-file-recursively '("expat" "wcslib")))))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'preparations (add-after 'unpack 'preparations
(lambda _ (lambda _
;; Use our own libraries in place of bundles. ;; Use our own libraries in place of bundles.
(setenv "ASTROPY_USE_SYSTEM_ALL" "1") (setenv "ASTROPY_USE_SYSTEM_ALL" "1")
;; Some tests require a writable home.
(setenv "HOME" "/tmp")
;; Relax xfail tests. ;; Relax xfail tests.
(substitute* "setup.cfg" (substitute* "pyproject.toml"
(("xfail_strict = true") "xfail_strict = false")) (("xfail_strict = true") "xfail_strict = false"))
;; Replace all references to external ply. ;; Replace reference to external ply.
(let ((ply-files '("coordinates/angle_formats.py" (substitute* "astropy/utils/parsing.py"
"utils/parsing.py"))) (("astropy.extern.ply") "ply"))
(with-directory-excursion "astropy"
(map (lambda (file)
(substitute* file (("astropy.extern.ply")
"ply")))
ply-files)))
;; Replace reference to external configobj. ;; Replace reference to external configobj.
(with-directory-excursion "astropy/config" (substitute* "astropy/config/configuration.py"
(substitute* "configuration.py" (("from astropy.extern.configobj ") ""))))
(("from astropy.extern.configobj ") "")))))
;; This file is opened in both install and check phases. ;; This file is opened in both install and check phases.
(add-before 'install 'writable-compiler (add-before 'install 'writable-compiler
(lambda _ (make-file-writable "astropy/_compiler.c"))) (lambda _
(add-before 'check 'writable-compiler (make-file-writable "astropy/_compiler.c")))
(lambda _ (make-file-writable "astropy/_compiler.c"))) (add-before 'check 'prepare-test-environment
(replace 'check (lambda _
(lambda* (#:key inputs outputs tests? #:allow-other-keys) ;; Some tests require a writable home.
(when tests? (setenv "HOME" "/tmp")
(add-installed-pythonpath inputs outputs) (make-file-writable "astropy/_compiler.c")
;; Extensions have to be rebuilt before running the tests. ;; Extensions have to be rebuilt before running the tests.
(invoke "python" "setup.py" "build_ext" "--inplace") (invoke "python" "setup.py" "build_ext" "--inplace"
"-j" (number->string (parallel-job-count)))))
;; TODO: The swap to pyproject-build-system introduced all tests
;; failed due to pytest could not load conftest.py, find out how
;; to resolve it and migrate completely to pyproject-build-system.
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "python" "-m" "pytest" "--pyargs" "astropy" (invoke "python" "-m" "pytest" "--pyargs" "astropy"
;; Skip tests that need remote data. ;; with -n : 133.00s
;; without -n : 326.14s
"-n" (number->string (parallel-job-count))
"-k" (string-append "-k" (string-append
;; Skip tests that need remote data.
"not remote_data" "not remote_data"
;; XXX: Check why this tests failing. ;; E astropy.samp.errors.SAMPProxyError:
" and not test_ignore_sigint" ;; <SAMPProxyError 1: 'Timeout expired!'>
" and not test_parquet_filter" " and not test_main"
;; See https://github.com/astropy/astropy/issues/15537 ;; E ModuleNotFoundError: No module named 'wofz'
" and not test_pvstar")))))))) " and not test_pickle_functional"))))))))
(native-inputs (native-inputs
(list pkg-config (list pkg-config
python-colorlog python-colorlog
python-coverage python-coverage
python-cython python-cython-3
python-extension-helpers python-extension-helpers
python-h5py python-h5py
python-ipython python-ipython
python-jplephem python-jplephem
python-matplotlib
python-objgraph python-objgraph
python-pandas python-pandas
python-pyarrow python-pyarrow
python-pytest python-pytest
python-pytest-astropy python-pytest-astropy
python-pytest-astropy-header python-pytest-astropy-header
python-pytest-mpl
python-pytest-xdist python-pytest-xdist
python-scikit-image python-scikit-image
python-scipy python-scipy
@ -1567,7 +1642,8 @@ accurately in real time at any rate desired.")
(inputs (inputs
(list expat wcslib)) (list expat wcslib))
(propagated-inputs (propagated-inputs
(list python-configobj (list python-astropy-iers-data
python-configobj
python-numpy python-numpy
python-packaging python-packaging
python-ply python-ply
@ -1616,6 +1692,50 @@ astronomy and astrophysics.")
(description "This package provides HEALPix to the Astropy project.") (description "This package provides HEALPix to the Astropy project.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-astropy-iers-data
(package
(name "python-astropy-iers-data")
;; In case of changing the source method git-fetch, consider to check the
;; tag as it's not following the PyPI version, see
;; <https://github.com/astropy/astropy-iers-data/issues/17>.
(version "0.2024.2.19.0.28.47")
(source
(origin
(method url-fetch)
(uri (pypi-uri "astropy-iers-data" version))
(sha256
(base32 "0j42hkl8z42x5n3aacld9cvacjzg79lqsivm3xn6bv1gjgy69br9"))))
(build-system pyproject-build-system)
(arguments
(list
;; Dependencies cycle wit python-astropy, see
;; <https://github.com/astropy/astropy-iers-data/issues/21>.
#:tests? #f
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'set-env-version
(lambda _
(setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
(native-inputs
(list python-hypothesis
python-pytest
python-pytest-remotedata
python-setuptools-scm))
(home-page "https://docs.astropy.org/en/latest/utils/iers.html")
(synopsis "IERS Earth Rotation and Leap Second tables for the astropy core package")
(description
"The @code{iers} package provides access to the tables provided by the
@acronym{International Earth Rotation and Reference Systems, IERS} service, in
particular the
@url{https://www.iers.org/IERS/EN/DataProducts/EarthOrientationData/eop.html,
Earth Orientation data} allowing interpolation of published UT1-UTC and polar
motion values for given times. The UT1-UTC values are used in
@url{https://docs.astropy.org/en/latest/time/index.html#astropy-time, Time and
Dates (astropy.time)} to provide UT1 values, and the polar motions are used in
@code{astropy.coordinates} to determine Earth orientation for
celestial-to-terrestrial coordinate transformations.")
(license license:bsd-3)))
(define-public python-astroquery (define-public python-astroquery
(package (package
(name "python-astroquery") (name "python-astroquery")
@ -1807,7 +1927,7 @@ bad pixel tracking throughout the reduction process.")
(define-public python-cdflib (define-public python-cdflib
(package (package
(name "python-cdflib") (name "python-cdflib")
(version "1.2.3") (version "1.2.4")
(source (source
(origin (origin
(method git-fetch) ; no tests in pypi archive (method git-fetch) ; no tests in pypi archive
@ -1816,7 +1936,7 @@ bad pixel tracking throughout the reduction process.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0vpgcbc9pmx0qqfia1frnwq3jkgfp8y3ikqdnzs5bs1sr13p9p3w")))) (base32 "0pjd4dwwlza2592zgdccw1s341s3ikg44pwsr1gk8vjix40m46fr"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
;; Disable shaky test. ;; Disable shaky test.
@ -1859,13 +1979,13 @@ attempting to maintain ISTP compliance
(define-public python-crds (define-public python-crds
(package (package
(name "python-crds") (name "python-crds")
(version "11.17.14") (version "11.17.16")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "crds" version)) (uri (pypi-uri "crds" version))
(sha256 (sha256
(base32 (base32
"1z9lrwrb07s9kn28nammjx75qb0ky7srd9i40dnkmm9zsaqz5jfm")))) "0j84l7132mvwww2y83h2dgz5qw792ilp3hml4h12n7ydks0w0534"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
@ -1967,7 +2087,7 @@ used with local NetDRMS sites.")
(define-public python-drizzle (define-public python-drizzle
(package (package
(name "python-drizzle") (name "python-drizzle")
(version "1.14.4") (version "1.15.0")
(source (source
(origin (origin
(method git-fetch) ;PyPi doesn't have the test data sets (method git-fetch) ;PyPi doesn't have the test data sets
@ -1976,7 +2096,7 @@ used with local NetDRMS sites.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "01zsq1r3p9lig0aik01szncd7nbmyi561mhi1n44yjhh7d86fp8y")))) (base32 "06qh3b60xvm5f2p09l2njwwsh0n95s54r730fyfn66w8mvr1jk82"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
@ -1992,7 +2112,7 @@ used with local NetDRMS sites.")
(propagated-inputs (propagated-inputs
(list python-astropy python-numpy)) (list python-astropy python-numpy))
(native-inputs (native-inputs
(list python-flake8 python-pytest python-setuptools-scm)) (list python-pytest python-setuptools-scm))
(home-page "https://github.com/spacetelescope/drizzle") (home-page "https://github.com/spacetelescope/drizzle")
(synopsis (synopsis
"Astronomical tool for combining dithered images into a single image") "Astronomical tool for combining dithered images into a single image")
@ -2051,6 +2171,32 @@ for a table giving the position of a planet, asteroid, or comet for a series
of dates.") of dates.")
(license license:expat))) (license license:expat)))
(define-public python-extinction
(package
(name "python-extinction")
(version "0.4.6")
(source
(origin
(method git-fetch) ; No tests in PyPI
(uri (git-reference
(url "https://github.com/kbarbary/extinction")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1adxq926jd469mxm6llvsljgf2jqb06905h61i9qzc7m2yrm4wga"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags #~(list "test.py")))
(native-inputs (list python-cython python-pytest))
(propagated-inputs (list python-numpy))
(home-page "http://github.com/kbarbary/extinction")
(synopsis "Fast interstellar dust extinction laws")
(description
"This package provides a cython-optimized implementations of empirical dust
exitinction laws found in the literature.")
(license license:expat)))
(define-public python-hvpy (define-public python-hvpy
(package (package
(name "python-hvpy") (name "python-hvpy")
@ -2160,6 +2306,8 @@ can be described by @acronym{WCS, World Coordinate System} translations.")
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
#:test-flags
#~(list "-n" "auto")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
;; This file is opened in both install and check phases. ;; This file is opened in both install and check phases.
@ -2190,6 +2338,7 @@ can be described by @acronym{WCS, World Coordinate System} translations.")
(list python-cython (list python-cython
python-extension-helpers python-extension-helpers
python-pytest-astropy python-pytest-astropy
python-pytest-xdist
python-semantic-version python-semantic-version
python-setuptools-scm)) python-setuptools-scm))
(home-page "https://github.com/astropy/photutils") (home-page "https://github.com/astropy/photutils")
@ -2198,6 +2347,9 @@ can be described by @acronym{WCS, World Coordinate System} translations.")
of astronomical sources.") of astronomical sources.")
(license license:bsd-3))) (license license:bsd-3)))
;; XXX: The project is archived, maintained fork is available see
;; <https://github.com/poliastro/poliastro/issues/1640>.
;; Maintained fork <https://github.com/pleiszenburg/hapsira>.
(define-public python-poliastro (define-public python-poliastro
(package (package
(name "python-poliastro") (name "python-poliastro")
@ -2230,6 +2382,10 @@ of astronomical sources.")
" and not test_porkchop_plotting")) " and not test_porkchop_plotting"))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
(substitute* "pyproject.toml"
(("5.0,<6") "5.0,<7"))))
(add-after 'unpack 'matplotlib-compatibility (add-after 'unpack 'matplotlib-compatibility
(lambda _ (lambda _
(substitute* "src/poliastro/plotting/static.py" (substitute* "src/poliastro/plotting/static.py"
@ -2294,6 +2450,10 @@ Low-Earth Orbit (LEO).")
(base32 (base32
"0s8rb61q8dz66s8d3qg44kb6bb5gi40zl41ik9wyccgb4kyf3brp")))) "0s8rb61q8dz66s8d3qg44kb6bb5gi40zl41ik9wyccgb4kyf3brp"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments
(list
#:test-flags
#~(list "-n" "auto")))
(propagated-inputs (propagated-inputs
;; XXX: With python-synphot (marked as optional) package added to the list ;; XXX: With python-synphot (marked as optional) package added to the list
;; it tries to download from remote host during tests and fails. Overall ;; it tries to download from remote host during tests and fails. Overall
@ -2308,8 +2468,10 @@ Low-Earth Orbit (LEO).")
python-pandas python-pandas
python-pytest python-pytest
python-pytest-astropy python-pytest-astropy
python-sphinx python-pytest-xdist
python-setuptools-scm)) python-scikit-image
python-setuptools-scm
python-sphinx))
(home-page "https://poppy-optics.readthedocs.io/") (home-page "https://poppy-optics.readthedocs.io/")
(synopsis "Physical Optics Propagation in Python") (synopsis "Physical Optics Propagation in Python")
(description (description
@ -2385,6 +2547,8 @@ Virtual observatory (VO) using Python.")
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
#:test-flags
#~(list "-n" "auto")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
;; This file is opened in both install and check phases. ;; This file is opened in both install and check phases.
@ -2409,6 +2573,7 @@ Virtual observatory (VO) using Python.")
python-pytest-arraydiff python-pytest-arraydiff
python-pytest-astropy python-pytest-astropy
python-pytest-runner python-pytest-runner
python-pytest-xdist
python-setuptools-scm)) python-setuptools-scm))
(home-page "https://github.com/astropy/regions") (home-page "https://github.com/astropy/regions")
(synopsis "Package for region handling") (synopsis "Package for region handling")
@ -2522,7 +2687,9 @@ orbits described in TLE files.")
(arguments (arguments
(list (list
#:test-flags #:test-flags
#~(list "-k" (string-append #~(list
"-n" "auto"
"-k" (string-append
;; XXX: Failed: DID NOT RAISE <class 'ModuleNotFoundError'> ;; XXX: Failed: DID NOT RAISE <class 'ModuleNotFoundError'>
;; It struggles to find python-opencsv package info with ;; It struggles to find python-opencsv package info with
;; 'importlib.metadata' ;; 'importlib.metadata'
@ -2532,6 +2699,12 @@ orbits described in TLE files.")
"--ignore=sunpy/coordinates/tests/test_spice.py") "--ignore=sunpy/coordinates/tests/test_spice.py")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
(substitute* "setup.cfg"
;; It's already updated in master branch, but not released yet.
;; drms>=0.6.1,<0.7.0
(("0.7.0") "0.7.2"))))
(add-before 'install 'writable-compiler (add-before 'install 'writable-compiler
(lambda _ (lambda _
(make-file-writable "sunpy/_compiler.c"))) (make-file-writable "sunpy/_compiler.c")))
@ -2589,6 +2762,50 @@ python_files = test_*.py"))))))))
SolarSoft data analysis environment.") SolarSoft data analysis environment.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public python-sunpy-soar
(package
(name "python-sunpy-soar")
(version "1.10")
(source
(origin
(method url-fetch)
(uri (pypi-uri "sunpy-soar" version))
(sha256
(base32 "0pb7dr06n20hdhlqf8npb4j1qb5034cgwqi3iciqdi1wxyy5pjc6"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags
;; Disabe tests requireing network access.
#~(list "-k" (string-append
"not test_search"
" and not test_search_low_latency"
" and not test_insitu_search"
" and not test_no_results"
" and not test_no_instrument"
" and not test_download_path"
" and not test_search_soop"
" and not test_when_soar_provider_passed"
" and not test_when_sdac_provider_passed"
" and not test_when_wrong_provider_passed"))
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'set-home-env
(lambda _
;; Tests require HOME to be set.
;; Permission denied: '/homeless-shelter'
(setenv "HOME" "/tmp"))))))
(propagated-inputs
(list python-sunpy))
(native-inputs
(list python-pytest))
(home-page "https://docs.sunpy.org/projects/soar")
(synopsis "Solar Orbiter Archive plugin for SunPy")
(description
"This package provides a @code{sunpy} FIDO plugin for accessing data in the
@acronym{Solar Orbiter Archive, SOAR}.")
(license license:bsd-2)))
(define-public python-astral (define-public python-astral
(package (package
(name "python-astral") (name "python-astral")
@ -2661,9 +2878,17 @@ elevation, solar azimuth, rahukaalam, and the phases of the moon.")
(sha256 (sha256
(base32 "0cqxgmk46gv2qa2kls8fph105lgwbwf13hvizh6w85mzgypyp740")))) (base32 "0cqxgmk46gv2qa2kls8fph105lgwbwf13hvizh6w85mzgypyp740"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments
(list
#:test-flags
#~(list "-n" "auto")))
(propagated-inputs (propagated-inputs
(list python-astropy (list python-astropy
python-aplpy ;; XXX: Currently failing in upstream as it's optional silent
;; until a new version is released, see:
;; <https://github.com/aplpy/aplpy/issues/492>.
;;
;; python-aplpy
python-casa-formats-io python-casa-formats-io
python-dask python-dask
python-distributed python-distributed
@ -2683,6 +2908,7 @@ elevation, solar azimuth, rahukaalam, and the phases of the moon.")
;; in [noviz] option. ;; in [noviz] option.
;; python-pvextractor ;; python-pvextractor
python-pytest-astropy python-pytest-astropy
python-pytest-xdist
python-regions python-regions
python-semantic-version python-semantic-version
python-setuptools-scm)) python-setuptools-scm))
@ -2902,13 +3128,13 @@ image processing functions: @code{xyxymatch}, @code{geomap}.")
(define-public python-stcal (define-public python-stcal
(package (package
(name "python-stcal") (name "python-stcal")
(version "1.5.2") (version "1.6.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "stcal" version)) (uri (pypi-uri "stcal" version))
(sha256 (sha256
(base32 "0r1a9f476f8ivhrwbcny3rnj9s4plaps6p36c22w73g546d476b7")))) (base32 "12skkbc59alw3asvw36x7nvibx68ccfiqdlgs8b5cvdns5j47f9n"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
@ -2923,7 +3149,7 @@ image processing functions: @code{xyxymatch}, @code{geomap}.")
(invoke "python" "setup.py" "build_ext" "--inplace")))))) (invoke "python" "setup.py" "build_ext" "--inplace"))))))
(propagated-inputs (propagated-inputs
(list opencv ;Provides OpenCV-Python (list opencv ;Provides OpenCV-Python
python-asdf-3.0 python-asdf
python-astropy python-astropy
python-gwcs python-gwcs
python-numpy python-numpy
@ -2945,13 +3171,13 @@ image processing functions: @code{xyxymatch}, @code{geomap}.")
(define-public python-stdatamodels (define-public python-stdatamodels
(package (package
(name "python-stdatamodels") (name "python-stdatamodels")
(version "1.9.0") (version "1.9.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "stdatamodels" version)) (uri (pypi-uri "stdatamodels" version))
(sha256 (sha256
(base32 "16hwhvd8bqm1cmkgcn1v43hp2cvf094fz954rxb6jv2xx6csic15")))) (base32 "0h1v5c96c4q44b2npq9953x44dr6pwmkr1s05wfixdv95arqd8v0"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
@ -3179,8 +3405,6 @@ low quality ones")
(sha256 (sha256
(base32 "1na3gyb3nzb5gdgccs1653j2gnz6w3v1mqzhyhkx3yqw8bs3q5x0")))) (base32 "1na3gyb3nzb5gdgccs1653j2gnz6w3v1mqzhyhkx3yqw8bs3q5x0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(supported-systems '("i686-linux" "x86_64-linux"
"armhf-linux" "aarch64-linux"))
(arguments (arguments
(list (list
#:tests? #f ; no tests provided #:tests? #f ; no tests provided
@ -3196,7 +3420,9 @@ low quality ones")
'("CPU_TARGET=i386")) '("CPU_TARGET=i386"))
("x86_64-linux" ("x86_64-linux"
'("CPU_TARGET=x86_64")) '("CPU_TARGET=x86_64"))
((or "armhf-linux" "aarch64-linux") ;; There is no a case for RISCV in upstream, attempt to treat it
;; as ARM.
((or "armhf-linux" "aarch64-linux" "riscv64")
'("CPU_TARGET=armv7l")) '("CPU_TARGET=armv7l"))
(_ '())) (_ '()))
(string-append "PREFIX=" #$output)) (string-append "PREFIX=" #$output))
@ -3467,7 +3693,7 @@ floating-point (no compression, LZW- or ZIP-compressed), FITS 8-bit, 16-bit,
(define-public indi-2.0 (define-public indi-2.0
(package (package
(name "indi") (name "indi")
(version "2.0.5") (version "2.0.6")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3476,7 +3702,7 @@ floating-point (no compression, LZW- or ZIP-compressed), FITS 8-bit, 16-bit,
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1lmp5p1rsckb8j44g34wxpyjzzy2ff78llxyc84pv5xs9pay6p4z")))) (base32 "0j1yr8wz6q6xi4dskv3yyhm0valsyfhcw1n8xpfgzbzbdzc8biyw"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
;; TODO: fix failing tests on aarch64-system. ;; TODO: fix failing tests on aarch64-system.
@ -3636,13 +3862,13 @@ milliarcsecond).")
(define-public python-jwst (define-public python-jwst
(package (package
(name "python-jwst") (name "python-jwst")
(version "1.12.5") (version "1.13.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "jwst" version)) (uri (pypi-uri "jwst" version))
(sha256 (sha256
(base32 (base32
"0blrl00lz1snhcnr7j59nh05rnpqxdnfp8hhgagkr50h85q4smrn")))) "0n5cfjayg15kf5p6pns7k2zfcldqz1464ndbldgzanc33fp9wnfz"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
@ -3859,26 +4085,44 @@ Features:
(license license:expat))) (license license:expat)))
(define-public python-pysynphot (define-public python-pysynphot
;; XXX: 2.0.0 was released in 2021 there are a lot of changes since that
;; time and it failed to build with python-astropy 6.0.0, use the latest
;; upstream commit for now.
(let ((commit "54e9e2a624910c4d177ca70f8e9fb8110c8fae5b")
(revision "0"))
(package (package
(name "python-pysynphot") (name "python-pysynphot")
(version "2.0.0") (version (git-version "2.0.0" revision commit))
(source (origin (source
(method url-fetch) (origin
(uri (pypi-uri "pysynphot" version)) (method git-fetch)
(uri (git-reference
(url "https://github.com/spacetelescope/pysynphot")
(commit commit)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32 "09sivpfqilk86zp8k5wmrs4g48m4kypn34jcy95y5h4ygbn5zbzy"))))
"1rr29m63bnj47f6gvbvg3pm1296x14ad29c6qd0sdj4f4ilrzhj5"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list #:phases #~(modify-phases %standard-phases (list
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'set-version
(lambda _
(setenv "SETUPTOOLS_SCM_PRETEND_VERSION" "2.0.0")))
(add-before 'check 'set-env-data-path (add-before 'check 'set-env-data-path
(lambda _ (lambda _
(setenv "PYSYN_CDBS" (setenv "PYSYN_CDBS" (string-append #$output "/crds")))))))
(string-append #$output "/crds"))))))) (native-inputs
(native-inputs (list python-pytest python-pytest-remotedata (list python-pytest
python-pytest-remotedata
python-setuptools-scm)) python-setuptools-scm))
(propagated-inputs (list python-astropy python-beautifulsoup4 python-numpy (propagated-inputs
python-pytest-astropy-header python-six)) (list python-astropy
python-beautifulsoup4
python-numpy
python-pytest-astropy-header
python-six))
(home-page "https://github.com/spacetelescope/pysynphot") (home-page "https://github.com/spacetelescope/pysynphot")
(synopsis "Python Synthetic Photometry Utilities") (synopsis "Python Synthetic Photometry Utilities")
(description (description
@ -3888,7 +4132,7 @@ IRAF. @code{pysynphot} simulates photometric data and spectra as they are
observed with the Hubble Space Telescope (HST). Passbands for standard observed with the Hubble Space Telescope (HST). Passbands for standard
photometric systems are available, and users can incorporate their own filters, photometric systems are available, and users can incorporate their own filters,
spectra, and data.") spectra, and data.")
(license license:bsd-3))) (license license:bsd-3))))
(define-public python-sep (define-public python-sep
(package (package
@ -4007,7 +4251,7 @@ between image and reference catalogs. Currently only aligning images with
@code{FITS WCS} and @code{JWST gWCS} are supported.") @code{FITS WCS} and @code{JWST gWCS} are supported.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-asdf-3.0 (define-public python-asdf
(package (package
(name "python-asdf") (name "python-asdf")
(version "3.0.1") (version "3.0.1")
@ -4018,6 +4262,10 @@ between image and reference catalogs. Currently only aligning images with
(sha256 (sha256
(base32 "1jsk7b4mx04l0a08j832vnl309dba3gjnha9mbd61dzs9ridrfna")))) (base32 "1jsk7b4mx04l0a08j832vnl309dba3gjnha9mbd61dzs9ridrfna"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments
(list
#:test-flags
#~(list "-n" "auto")))
(native-inputs (native-inputs
(list python-fsspec (list python-fsspec
python-packaging python-packaging
@ -4025,6 +4273,7 @@ between image and reference catalogs. Currently only aligning images with
python-pytest python-pytest
python-pytest-doctestplus python-pytest-doctestplus
python-pytest-remotedata python-pytest-remotedata
python-pytest-xdist
python-semantic-version python-semantic-version
python-setuptools-scm)) python-setuptools-scm))
(propagated-inputs (propagated-inputs
@ -4045,34 +4294,6 @@ interchange format for scientific data. This package contains the Python
implementation of the ASDF Standard.") implementation of the ASDF Standard.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-asdf-2.15
(package
(inherit python-asdf-3.0)
(version "2.15.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "asdf" version))
(sha256
(base32 "11s56797l5330kkhppkyz0bsvms016knmyswj4gx91zrxf8iqvv8"))))
(arguments
(list #:test-flags
#~(list "-k" (string-append
"not test_overwrite"
" and not test_tagging_scalars"
" and not test_info_command"
" and not test_array_inline_threshold_recursive"))))
(native-inputs
(modify-inputs (package-native-inputs python-asdf-3.0)
(prepend python-astropy python-pytest-openfiles)))
(propagated-inputs
(modify-inputs (package-propagated-inputs python-asdf-3.0)
(prepend python-jsonschema python-importlib-resources)))))
(define-public python-asdf
;; Default version of ASDF..
python-asdf-2.15)
(define-public python-asdf-standard (define-public python-asdf-standard
(package (package
(name "python-asdf-standard") (name "python-asdf-standard")
@ -4117,13 +4338,13 @@ up-front for extensibility.")
(define python-asdf-transform-schemas (define python-asdf-transform-schemas
(package (package
(name "python-asdf-transform-schemas") (name "python-asdf-transform-schemas")
(version "0.3.0") (version "0.4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "asdf_transform_schemas" version)) (uri (pypi-uri "asdf_transform_schemas" version))
(sha256 (sha256
(base32 "1midgn575970p5cnsh9y6bz77fjr392b5nfxb3z0id6c49xzzwhc")))) (base32 "1jlls8mirwarf8d67gaix39d8zcx1rx8fmr9qdzrbyrmxqzxqzyy"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
;; Dependency cycle with python-asdf ;; Dependency cycle with python-asdf
@ -4149,8 +4370,15 @@ package such as asdf-astropy.")
(sha256 (sha256
(base32 "1x6mipg76c6qldq8s2p2wpsq0cpr9b5krp62xskljdz1f84abyg3")))) (base32 "1x6mipg76c6qldq8s2p2wpsq0cpr9b5krp62xskljdz1f84abyg3"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments
(list
#:test-flags
#~(list "-n" "auto")))
(native-inputs (native-inputs
(list python-pytest python-semantic-version python-setuptools-scm)) (list python-pytest
python-pytest-xdist
python-semantic-version
python-setuptools-scm))
(propagated-inputs (propagated-inputs
(list python-asdf)) (list python-asdf))
(home-page "https://github.com/asdf-format/asdf-coordinates-schemas") (home-page "https://github.com/asdf-format/asdf-coordinates-schemas")
@ -4162,8 +4390,8 @@ install an implementation package such as asdf-astropy.")
(define python-asdf-fits-schemas (define python-asdf-fits-schemas
;; TODO: No release, change to tag when it's ready. ;; TODO: No release, change to tag when it's ready.
(let ((commit "572bb370d777f3a325b25c1af9d76e1b7d27dcea") (let ((commit "d1b5e7a12a49fe61d43855045bab106be34cd252")
(revision "0")) (revision "1"))
(package (package
(name "python-asdf-fits-schemas") (name "python-asdf-fits-schemas")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -4176,7 +4404,7 @@ install an implementation package such as asdf-astropy.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1yqnzd0gcrdfl0jqm8m8kz5fd36i8lgh7xkglmp1chsi1cc6mkz2")))) "1h2xbk9c9l2959i3sdnwviv3z0hp1f0lba2vz9hpzgcm46qadqp8"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
@ -4197,8 +4425,8 @@ install an implementation package such as asdf-astropy.")
(define python-asdf-time-schemas (define python-asdf-time-schemas
;; TODO: No release, change to tag when it's ready. ;; TODO: No release, change to tag when it's ready.
(let ((commit "e9174083d9cfd3c6f7ded9eeb360d99ccb8d9d18") (let ((commit "a3062066ee70f1b934f7339d1ce96a5c5f61f055")
(revision "2")) (revision "3"))
(package (package
(name "python-asdf-time-schemas") (name "python-asdf-time-schemas")
(version (git-version "0.0.1" revision commit)) (version (git-version "0.0.1" revision commit))
@ -4211,7 +4439,7 @@ install an implementation package such as asdf-astropy.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1i40hcxp8sds2zq939fwczjlshfqb9r9pnzy3a44c3wqdbwhcbdb")))) "1i8lm2d18r6fadsch52dxc2zp1swkfa8w40s03albn7p290n4a97"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
@ -4266,7 +4494,10 @@ install an implementation package such as asdf-astropy.")
(base32 "061y7r1d2fqlr8a6gyaffqa3z5m0ymljahhvxzcb71355xkqig7v")))) (base32 "061y7r1d2fqlr8a6gyaffqa3z5m0ymljahhvxzcb71355xkqig7v"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list #:phases #~(modify-phases %standard-phases (list
#:test-flags
#~(list "-n" "auto")
#:phases #~(modify-phases %standard-phases
(add-before 'check 'set-home-env (add-before 'check 'set-home-env
(lambda _ (setenv "HOME" "/tmp")))))) (lambda _ (setenv "HOME" "/tmp"))))))
(native-inputs (native-inputs
@ -4294,18 +4525,27 @@ Astropy objects.")
(define python-asdf-wcs-schemas (define python-asdf-wcs-schemas
(package (package
(name "python-asdf-wcs-schemas") (name "python-asdf-wcs-schemas")
(version "0.1.1") (version "0.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "asdf_wcs_schemas" version)) (uri (pypi-uri "asdf_wcs_schemas" version))
(sha256 (sha256
(base32 "0khyab9mnf2lv755as8kwhk3lqqpd3f4291ny3b9yp3ik86fzhz1")))) (base32 "1r9ls2skgwq6my68nfwfah1s0q6bm2qq97s0h79vwh997jy97rai"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments
(list
#:test-flags #~(list "tests")))
(native-inputs (native-inputs
(list python-pytest python-setuptools-scm python-semantic-version)) (list python-asdf
python-pytest
python-pytest-openfiles
python-semantic-version
python-setuptools-scm))
(propagated-inputs (propagated-inputs
(list python-asdf)) (list python-asdf-standard
python-asdf-transform-schemas
python-asdf-unit-schemas))
(home-page "https://github.com/asdf-format/asdf-wcs-schemas") (home-page "https://github.com/asdf-format/asdf-wcs-schemas")
(synopsis "ASDF WCS Schemas") (synopsis "ASDF WCS Schemas")
(description (description
@ -4355,20 +4595,23 @@ default) to world coordinates.")
(define-public python-rad (define-public python-rad
(package (package
(name "python-rad") (name "python-rad")
(version "0.18.0") (version "0.19.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "rad" version)) (uri (pypi-uri "rad" version))
(sha256 (sha256
(base32 (base32
"1wgnbhldgq0j55yzg33y11vd5k5nzwckiccxywvmq518qh19pky5")))) "0cp3nrv1vq3g61zx6dq36vdlxd5i8g52vg4hwpxakmwvqvc8p3gd"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
;; XXX: Tests introduce dependencies cycle, breaking it by disable them. ;; Ignore tests requiring python-crds to break cycle:
;; python-rad -> python-roman-datamodels -> python-crds -> python-rad ;; python-rad -> python-roman-datamodels -> python-crds -> python-rad
#:tests? #f)) #:test-flags #~(list "--ignore=tests/test_schemas.py")))
(native-inputs (list python-semantic-version python-setuptools-scm)) (native-inputs
(list python-pytest
python-semantic-version
python-setuptools-scm))
(propagated-inputs (list python-asdf python-asdf-astropy)) (propagated-inputs (list python-asdf python-asdf-astropy))
(home-page "https://github.com/spacetelescope/rad") (home-page "https://github.com/spacetelescope/rad")
(synopsis "Roman Attribute Dictionary") (synopsis "Roman Attribute Dictionary")
@ -4414,19 +4657,58 @@ channels
@end itemize") @end itemize")
(license license:bsd-3))) (license license:bsd-3)))
(define-public python-radiospectra
(package
(name "python-radiospectra")
(version "0.4.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "radiospectra" version))
(sha256
(base32 "0gq61ywk7li0gxwmp4hp2hc4zbrlqgn8zy0sz24qh55kn5l5gxjr"))))
(build-system pyproject-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'set-home-env
(lambda _
;; Tests require HOME to be set.
;; Permission denied: '/homeless-shelter'
(setenv "HOME" "/tmp"))))))
(propagated-inputs
(list python-cdflib
python-matplotlib
python-numpy
python-scipy
python-sunpy))
(native-inputs
(list python-pytest-astropy
python-setuptools-scm
python-sunpy-soar))
(home-page "https://docs.sunpy.org/projects/radiospectra")
(synopsis "Support for radio spectra on solar physics")
(description
"@code{radiospectra} provides support for some type of radio spectra in
solar physics.")
(license license:bsd-2)))
(define-public python-roman-datamodels (define-public python-roman-datamodels
(package (package
(name "python-roman-datamodels") (name "python-roman-datamodels")
(version "0.18.0") (version "0.19.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "roman_datamodels" version)) (uri (pypi-uri "roman_datamodels" version))
(sha256 (sha256
(base32 (base32
"0crlmd99p2nyqmrbykdqqng7v8zb4sibm8j9aqrq3ppak3r3r7q1")))) "1ym06rj637fq9gxncdrn3phplk5djrzdwqghszis0di1dvsrif4j"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
#:test-flags
#~(list "-n" "auto")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'set-env (add-after 'unpack 'set-env
@ -4443,6 +4725,7 @@ channels
(native-inputs (list python-pytest (native-inputs (list python-pytest
python-pytest-doctestplus python-pytest-doctestplus
python-pytest-env python-pytest-env
python-pytest-xdist
python-semantic-version python-semantic-version
python-setuptools-scm)) python-setuptools-scm))
(home-page "https://github.com/spacetelescope/roman_datamodels") (home-page "https://github.com/spacetelescope/roman_datamodels")
@ -4495,13 +4778,13 @@ astronomical images, especially when there is no WCS information available.")
(define-public python-skyfield (define-public python-skyfield
(package (package
(name "python-skyfield") (name "python-skyfield")
(version "1.47") (version "1.48")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "skyfield" version)) (uri (pypi-uri "skyfield" version))
(sha256 (sha256
(base32 "0272pwk88csmrrl44fc4l52agd68pkg4zbmdhs7gliq5q9wf3hrs")))) (base32 "1qaz0k0lkni3y423r66mkvj99bx08qa9xgqp3cs2df70cmdz30cb"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
;; XXX: Tests depend on custom test framework ;; XXX: Tests depend on custom test framework

29
gnu/packages/audio.scm
View File

@ -1424,6 +1424,35 @@ performances. The plugins include a cellular automaton synthesizer, an
envelope follower, distortion effects, tape effects and more.") envelope follower, distortion effects, tape effects and more.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public omins-lv2
(let ((commit "058f341053067b69a84d4081107fda5058290ff9")
(revision "1"))
(package
(name "omins-lv2")
;; No release despite being perfectly usable. 0.0.0 seems to be the only
;; version the author ever specified:
(version (git-version "0.0.0" revision commit))
(source
(origin (method git-fetch)
(uri
(git-reference
(url "https://git.drobilla.net/cgit.cgi/omins.lv2.git/")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"01hnx4hhbz3ap3bw15s42q4q1mw1mhdjwygq4550wvjfg6k4ga8w"))))
(build-system waf-build-system)
(arguments (list #:tests? #false)) ;There are no tests.
(inputs (list lv2))
(native-inputs (list pkg-config))
(home-page "https://git.drobilla.net/cgit.cgi/omins.lv2.git/")
(synopsis "LV2 audio plugins for modular synthesis")
(description
"Omins-lv2 is a small collection of LV2 audio plugins for modular
synthesis.")
(license license:gpl2+))))
(define-public snapcast (define-public snapcast
(package (package
(name "snapcast") (name "snapcast")

40
gnu/packages/bioconductor.scm
View File

@ -3464,13 +3464,13 @@ for use in Bioconductor’s AnnotationHub.")
(define-public r-anvil (define-public r-anvil
(package (package
(name "r-anvil") (name "r-anvil")
(version "1.14.1") (version "1.14.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "AnVIL" version)) (uri (bioconductor-uri "AnVIL" version))
(sha256 (sha256
(base32 (base32
"06n0as71m3dfbnzjfq8f1s0r40w4flc8am7zb0293c1037clmcig")))) "1vfriymy1v3mxahfdf4sd6rawi0qy7vzxrymi852w49fmy54bgp7"))))
(properties `((upstream-name . "AnVIL"))) (properties `((upstream-name . "AnVIL")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -3789,13 +3789,13 @@ sequencing data.")
(define-public r-anf (define-public r-anf
(package (package
(name "r-anf") (name "r-anf")
(version "1.22.0") (version "1.24.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "ANF" version)) (uri (bioconductor-uri "ANF" version))
(sha256 (sha256
(base32 (base32
"08vkkfccfq8j4hanxsmjx5657kkw4qcp46qfhqvp1sd6wym69wzw")))) "0yal8lbillhj3zi2rcdk7k9r748jxm3196z54y1674qxzpvp24rk"))))
(properties `((upstream-name . "ANF"))) (properties `((upstream-name . "ANF")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -7563,13 +7563,13 @@ global-scaling and full-quantile normalization.")
(define-public r-edger (define-public r-edger
(package (package
(name "r-edger") (name "r-edger")
(version "4.0.15") (version "4.0.16")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "edgeR" version)) (uri (bioconductor-uri "edgeR" version))
(sha256 (sha256
(base32 (base32
"08fsb0h4kqm31ynrhxinmnwjyij1350v352411q11iv8v9sk4z48")))) "0jflbh1wsszz98y0y294g69mm81fwwxfbhpi3kmdncin8bwf8ifi"))))
(properties `((upstream-name . "edgeR"))) (properties `((upstream-name . "edgeR")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -10950,13 +10950,13 @@ single-cell RNA-seq.")
(define-public r-seqarray (define-public r-seqarray
(package (package
(name "r-seqarray") (name "r-seqarray")
(version "1.42.0") (version "1.42.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "SeqArray" version)) (uri (bioconductor-uri "SeqArray" version))
(sha256 (sha256
(base32 (base32
"0zs60yh3x6kgy6izn11d400vw59ww2w6bmhg6fw5ijinknyr3ixc")))) "1bwqyvvfwwscznwi1bm4wh2pqf0fmq68g7siwbbw5ypj087ibnnm"))))
(properties `((upstream-name . "SeqArray"))) (properties `((upstream-name . "SeqArray")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (list r-biostrings (propagated-inputs (list r-biostrings
@ -13029,14 +13029,14 @@ determining dependencies between variables, code improvement suggestions.")
(define-public r-chippeakanno (define-public r-chippeakanno
(package (package
(name "r-chippeakanno") (name "r-chippeakanno")
(version "3.36.0") (version "3.36.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "ChIPpeakAnno" version)) (uri (bioconductor-uri "ChIPpeakAnno" version))
(sha256 (sha256
(base32 (base32
"012hhakhk81qk1hi4igfa4vji678gmyvdxi05z9mdsx721lwwy2i")))) "1jmg958v8ai9v3mpizj24nc0vsl564inndm0irflprs1ky90k8vl"))))
(properties `((upstream-name . "ChIPpeakAnno"))) (properties `((upstream-name . "ChIPpeakAnno")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -16206,14 +16206,14 @@ Affymetrix arrays.")
(define-public r-a4 (define-public r-a4
(package (package
(name "r-a4") (name "r-a4")
(version "1.50.0") (version "1.50.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "a4" version)) (uri (bioconductor-uri "a4" version))
(sha256 (sha256
(base32 (base32
"1hdqnipg326z2k7vs6sc1brc9lvvhmr2l6cjp4f9a205g4q7r9rr")))) "0sibsmn7ma2imhfn2pn1fvy6hinzlmsczmx944fzg0aj1lpjcdqr"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-a4base r-a4classif r-a4core r-a4preproc r-a4reporting)) (list r-a4base r-a4classif r-a4core r-a4preproc r-a4reporting))
@ -19507,14 +19507,14 @@ populations, splice site strength, conservation, etc.")
(define-public r-variancepartition (define-public r-variancepartition
(package (package
(name "r-variancepartition") (name "r-variancepartition")
(version "1.32.3") (version "1.32.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "variancePartition" version)) (uri (bioconductor-uri "variancePartition" version))
(sha256 (sha256
(base32 (base32
"1mbjh1n13y08mc8vdm10lsd3i7mc4vm3855lvm08fm9685siz909")))) "1yrss51gwg73rlva0xhk34md0cx43h2j4vfk0z2hzchr2r1amzmc"))))
(properties (properties
`((upstream-name . "variancePartition"))) `((upstream-name . "variancePartition")))
(build-system r-build-system) (build-system r-build-system)
@ -21531,14 +21531,14 @@ provided.")
(define-public r-hdf5array (define-public r-hdf5array
(package (package
(name "r-hdf5array") (name "r-hdf5array")
(version "1.30.0") (version "1.30.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "HDF5Array" version)) (uri (bioconductor-uri "HDF5Array" version))
(sha256 (sha256
(base32 (base32
"0p52n96mydqszpq1ysmbh5xs4n4icqsd0gbxl5wpkcwvvhxliw8b")))) "17cjjlgbp5kj0cpjm6915wy4cm6h5wl6d59j4na1s6kvgxx95qd0"))))
(properties `((upstream-name . "HDF5Array"))) (properties `((upstream-name . "HDF5Array")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
@ -21644,14 +21644,14 @@ packages.")
(define-public r-beachmat (define-public r-beachmat
(package (package
(name "r-beachmat") (name "r-beachmat")
(version "2.18.0") (version "2.18.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "beachmat" version)) (uri (bioconductor-uri "beachmat" version))
(sha256 (sha256
(base32 (base32
"1yixv6vs1q2k4vx17bq4nar3g4v2076i5dq77gh63mlka46qr3g2")))) "1kz8jn3kaqrhvk1dd92l7w45mmwabcqb0508fv4i4w307ja8xk2l"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-biocgenerics r-delayedarray r-matrix r-rcpp r-sparsearray)) (list r-biocgenerics r-delayedarray r-matrix r-rcpp r-sparsearray))
@ -24293,14 +24293,14 @@ fragments by exact matching.")
(define-public r-dmrseq (define-public r-dmrseq
(package (package
(name "r-dmrseq") (name "r-dmrseq")
(version "1.22.0") (version "1.22.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (bioconductor-uri "dmrseq" version)) (uri (bioconductor-uri "dmrseq" version))
(sha256 (sha256
(base32 (base32
"0z53vh5qirkyn7yw3g2m2kj6dzii96l81vc8j59n2dl7p602l9a2")))) "10ps9k5cp2adpx91g23gc9hl1qzzax5w1mxjcjaii7knkh70cz3p"))))
(properties `((upstream-name . "dmrseq"))) (properties `((upstream-name . "dmrseq")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs

22
gnu/packages/bioinformatics.scm
View File

@ -4,7 +4,7 @@
;;; Copyright © 2015, 2016, 2018, 2019, 2020 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2015, 2016, 2018, 2019, 2020 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016, 2020, 2021 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2020, 2021 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2016, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2016, 2018 Raoul Bonnal <ilpuccio.febo@gmail.com> ;;; Copyright © 2016, 2018 Raoul Bonnal <ilpuccio.febo@gmail.com>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -3756,14 +3756,14 @@ gapped, local, and paired-end alignment modes.")
(define-public bowtie1 (define-public bowtie1
(package (package
(name "bowtie1") (name "bowtie1")
(version "1.3.0") (version "1.3.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/bowtie-bio/bowtie/" (uri (string-append "mirror://sourceforge/bowtie-bio/bowtie/"
version "/bowtie-" version "-src.zip")) version "/bowtie-" version "-src.zip"))
(sha256 (sha256
(base32 (base32
"11dbihdnrizc6qhx9xsw77w3q5ssx642alaqzvhxx32ak9glvq04")) "0q87nhgj9wrnbazcpvqp4594hmyh1isi3s9b2wlghvl4afm1fdg2"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Makefile" '(substitute* "Makefile"
@ -3772,16 +3772,22 @@ gapped, local, and paired-end alignment modes.")
(("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\""))))) (("-DBUILD_TIME=.*") "-DBUILD_TIME=\"\\\"0\\\"\"")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no "check" target `(#:tests? #f ; Tests need various perl modules
#:test-target "simple-test"
#:make-flags #:make-flags
,#~(list "CC=gcc" "all" ,#~(append #$(if (not (target-x86?))
(string-append "prefix=" #$output)) #~'("POPCNT_CAPABILITY=0")
#~'())
(list (string-append "CC=" #$(cc-for-target))
(string-append "CXX=" #$(cxx-for-target))
"all"
(string-append "prefix=" #$output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) (delete 'configure))))
(inputs (inputs
(list python-wrapper tbb-2020 zlib)) (list python-wrapper tbb zlib))
(supported-systems '("x86_64-linux")) (supported-systems %64bit-supported-systems)
(home-page "https://bowtie-bio.sourceforge.net/index.shtml") (home-page "https://bowtie-bio.sourceforge.net/index.shtml")
(synopsis "Fast aligner for short nucleotide sequence reads") (synopsis "Fast aligner for short nucleotide sequence reads")
(description (description

6
gnu/packages/bittorrent.scm
View File

@ -529,7 +529,7 @@ desktops.")
(define-public qbittorrent (define-public qbittorrent
(package (package
(name "qbittorrent") (name "qbittorrent")
(version "4.6.2") (version "4.6.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -538,7 +538,7 @@ desktops.")
(commit (string-append "release-" version)))) (commit (string-append "release-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1wps17iv4gj7y751fibvcxk51v09wyniv6xm2yx429dj7z8rfmzs")))) (base32 "01d393v0v4c9rp909l3ddif984pp1z6sym74yc0kgxqq2kplj5g1"))))
(build-system qt-build-system) (build-system qt-build-system)
(arguments (arguments
(list #:configure-flags #~(list "-DTESTING=ON") (list #:configure-flags #~(list "-DTESTING=ON")
@ -547,7 +547,7 @@ desktops.")
(list qttools-5)) (list qttools-5))
(inputs (inputs
(list boost (list boost
libtorrent-rasterbar-1.2 libtorrent-rasterbar
openssl openssl
python-wrapper python-wrapper
qtsvg-5 qtsvg-5

57
gnu/packages/check.scm
View File

@ -942,7 +942,7 @@ generation.")
(define-public googlebenchmark (define-public googlebenchmark
(package (package
(name "googlebenchmark") (name "googlebenchmark")
(version "1.8.2") (version "1.8.3")
(home-page "https://github.com/google/benchmark") (home-page "https://github.com/google/benchmark")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -951,7 +951,7 @@ generation.")
(file-name (git-file-name "google-benchmark" version)) (file-name (git-file-name "google-benchmark" version))
(sha256 (sha256
(base32 (base32
"1p72bw7xcd88d8268fmmzji59408f552fbiv37jmsixml5dmq9wv")))) "1hf8xrdd9k57kw3mpdi68a78fd96vzdqv3179v2yy5dxx336ffw3"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" '(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
@ -966,6 +966,29 @@ generation.")
similar to unit tests.") similar to unit tests.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public greatest
(package
(name "greatest")
(version "1.5.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/silentbicycle/greatest")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"11rajkb5m7mlzi3i3v0i27k6rrjw3x8a7bl6fkc29igzpwfbxndy"))))
(build-system copy-build-system)
(arguments (list #:install-plan
#~'(("greatest.h" "include/"))))
(home-page "https://github.com/silentbicycle/greatest")
(synopsis "Single-header test system")
(description "Greatest is a single-header test system for C, including
macros for defining tests, grouping them into suites, and providing a test
runner. It is quite unopinionated with most of its features being optional.")
(license license:isc)))
(define-public cpputest (define-public cpputest
(package (package
(name "cpputest") (name "cpputest")
@ -3104,6 +3127,36 @@ retried.")
allowing you to declaratively define \"match\" rules.") allowing you to declaratively define \"match\" rules.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public theft
(package
(name "theft")
(version "0.4.5")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/silentbicycle/theft")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1n2mkawfl2bpd4pwy3mdzxwlqjjvb5bdrr2x2gldlyqdwbk7qjhd"))
(snippet #~(begin
(delete-file "vendor/greatest.h")))))
(build-system gnu-build-system)
(arguments (list #:make-flags #~(list "VENDOR="
(string-append "CC=" #$(cc-for-target))
(string-append "PREFIX=" #$output))
#:test-target "test"
#:phases
#~(modify-phases %standard-phases
(delete 'bootstrap)
(delete 'configure))))
(native-inputs (list greatest))
(home-page "https://github.com/silentbicycle/theft")
(synopsis "Property-based testing for C")
(description "Theft is a library for property-based testing.")
(license license:isc)))
(define-public unittest-cpp (define-public unittest-cpp
(package (package
(name "unittest-cpp") (name "unittest-cpp")

8
gnu/packages/clifm.scm
View File

@ -30,7 +30,7 @@
(define-public clifm (define-public clifm
(package (package
(name "clifm") (name "clifm")
(version "1.16") (version "1.17")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -39,7 +39,7 @@
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1ddg6d4y4kfjk34j0fb7nij5vi5m69vv48knv7j1plbhzqk6qg5n")))) (base32 "00f5x0352dsf8f9ixkcwma7wr5pg78maavmd950nni38m647clm6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list (string-append "CC=" `(#:make-flags (list (string-append "CC="
@ -53,8 +53,8 @@
(inputs (list readline acl libcap)) (inputs (list readline acl libcap))
(home-page "https://github.com/leo-arch/clifm") (home-page "https://github.com/leo-arch/clifm")
(synopsis "Command-line file manager") (synopsis "Command-line file manager")
(description "Clifm a shell-like, text-based terminal file manager that (description "Clifm is a shell-like, text-based terminal file manager
sits on the command line. that sits on the command line.
It is built with command line principles in mind: instead of navigating It is built with command line principles in mind: instead of navigating
through a big menu of files, it lets you type, exactly as you do in your through a big menu of files, it lets you type, exactly as you do in your

4
gnu/packages/cmake.scm
View File

@ -4,7 +4,7 @@
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2017, 2018, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@ -380,6 +380,8 @@ and workspaces that can be used in the compiler environment of your choice.")
(string-append "-DCMAKE_DOC_DIR=share/doc/cmake-" (string-append "-DCMAKE_DOC_DIR=share/doc/cmake-"
#$(version-major+minor (package-version #$(version-major+minor (package-version
cmake-minimal))) cmake-minimal)))
(string-append "-DCMake_INSTALL_VIMFILES_DIR=" #$output
"/share/vim/vimfiles/pack/guix/start/cmake")
"-DCMAKE_INFO_DIR=share/info" "-DCMAKE_INFO_DIR=share/info"
"-DCMAKE_MAN_DIR=share/man") "-DCMAKE_MAN_DIR=share/man")
#$flags)) #$flags))

50
gnu/packages/cpp.scm
View File

@ -279,16 +279,18 @@ use by the C++ Core Guidelines maintained by the Standard C++ Foundation.")
(name "c2ffi") (name "c2ffi")
;; As per the c2ffi README: the first three elements are encoding the ;; As per the c2ffi README: the first three elements are encoding the
;; required Clang/LLVM version, and the last one is the c2ffi revision. ;; required Clang/LLVM version, and the last one is the c2ffi revision.
(version "12.0.0.0") (version "16.0.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/rpav/c2ffi") (url "https://github.com/rpav/c2ffi")
(commit (string-append "v" version)))) ;; Upstream is not tagging releases consistently.
;; (commit (string-append "v" version))
(commit "097cbe61ca02dc79ea60859aa056975131a9d985")))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1qq8dfismd20d9kfxpfvwz07v9mfvd0y7p5r3c92mk2pm4xnmzfy")) (base32 "1mqhw4838chl495gaj9z0731ahkmqb4f3wlc1qalk82fdsaniyd5"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "CMakeLists.txt" '(substitute* "CMakeLists.txt"
@ -309,9 +311,9 @@ LLVMOption LLVMBitReader LLVMProfileData")))))
(when tests? (when tests?
(invoke "./bin/c2ffi" "--help"))))))) (invoke "./bin/c2ffi" "--help")))))))
(native-inputs (native-inputs
(list clang-12)) ; CMakeLists.txt invokes `clang -print-resource-dir` (list clang-16)) ; CMakeLists.txt invokes `clang -print-resource-dir`
(inputs (inputs
(list clang-12)) ; Compiled with gcc, but links against libclang-cpp.so (list clang-16)) ; Compiled with gcc, but links against libclang-cpp.so
(home-page "https://github.com/rpav/c2ffi") (home-page "https://github.com/rpav/c2ffi")
(synopsis "Clang-based FFI wrapper generator") (synopsis "Clang-based FFI wrapper generator")
(description (description
@ -1065,10 +1067,9 @@ and make @code{cpplint} usable in wider contexts.")
(base32 "09xnf8hmld1fk8j33zwlz1qcxnjdx1ncbg62csic9va4m1wc2v1d")))) (base32 "09xnf8hmld1fk8j33zwlz1qcxnjdx1ncbg62csic9va4m1wc2v1d"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
;; No tests. (list #:tests? #f ; No tests.
`(#:tests? #f #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"
;; Build the shared library instead of a static one. "-DREPROC++=ON")))
#:configure-flags `("-DBUILD_SHARED_LIBS=1")))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(synopsis "Process IO library") (synopsis "Process IO library")
@ -2703,6 +2704,37 @@ addition and subtraction for all combinations of signed and unsigned 32-bit and
64-bit integers.") 64-bit integers.")
(license license:expat))) (license license:expat)))
(define-public wide-integer
(let ((commit "22b8428746248e682d5276f8e8b7fb52af73ea47")
(revision "1314")) ; commit count
(package
(name "wide-integer")
(version (git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ckormanyos/wide-integer")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0bhjnbdcphv5kddddh8kpwjpjix23m12vmfsz0r6wjc5d27md33z"))
(modules '((guix build utils)))
(snippet #~(substitute* "CMakeLists.txt"
(("WideIntegerTargets") "wide-integer-targets")
(("WideIntegerConfig") "wide-integer-config")
(("WideInteger") "wide-integer")))))
(build-system cmake-build-system)
(native-inputs (list boost))
(home-page "https://github.com/ckormanyos/wide-integer")
(synopsis "C++ template for arbitrary-precision integers")
(description "This package implements a generic template for extended
width signed and unsigned integral types. Up to 63 limbs of any built-in
integer type are supported, and can be used to build powers of two like
int128_t, uint256_t, but also somewhat esoteric types such as int24_t,
uint80_t, or uint1536_t. The provided types can be used in much the same
way as basic integer types.")
(license license:boost1.0))))
(define-public wdl (define-public wdl
;; No tag is available. ;; No tag is available.
(let ((commit "da86a62d11e46e4ecd8b16f9775cb5188340a0e2") (let ((commit "da86a62d11e46e4ecd8b16f9775cb5188340a0e2")

123
gnu/packages/cran.scm
View File

@ -35,7 +35,7 @@
;;; Copyright © 2020 Aniket Patil <aniket112.patil@gmail.com> ;;; Copyright © 2020 Aniket Patil <aniket112.patil@gmail.com>
;;; Copyright © 2021 Marcel Schilling <marcel.schilling@uni-luebeck.de> ;;; Copyright © 2021 Marcel Schilling <marcel.schilling@uni-luebeck.de>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022, 2023 Navid Afkhami <navid.afkhami@mdc-berlin.de> ;;; Copyright © 2022-2024 Navid Afkhami <navid.afkhami@mdc-berlin.de>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com> ;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -1495,6 +1495,44 @@ matrix decomposition, sparse principal components analysis, and sparse
canonical correlation analysis.") canonical correlation analysis.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public r-rpresto
(package
(name "r-rpresto")
(version "1.4.6")
(source
(origin
(method url-fetch)
(uri (cran-uri "RPresto" version))
(sha256
(base32 "1q8c3h328iwscnayxj8qc71s2hkqdqwnpf38kn3zz3ks66qzjf8c"))))
(properties `((upstream-name . "RPresto")))
(build-system r-build-system)
(propagated-inputs
(list r-bit64
r-dbi
r-dbplyr
r-dplyr
r-httr
r-jsonlite
r-lifecycle
r-lubridate
r-openssl
r-progress
r-purrr
r-rlang
r-stringi
r-tibble
r-vctrs))
(native-inputs (list r-knitr))
(home-page "https://github.com/prestodb/RPresto")
(synopsis "DBI connector to Presto")
(description
"This package implements a DBI compliant interface to
@url{https://prestodb.io/, Presto}, a distributed SQL query engine for running
interactive analytic queries against data sources of all sizes ranging from
gigabytes to petabytes.")
(license license:bsd-3)))
(define-public r-prettydoc (define-public r-prettydoc
(package (package
(name "r-prettydoc") (name "r-prettydoc")
@ -2672,13 +2710,13 @@ respecting the grammar of its graphics paradigm.")
(define-public r-ggside (define-public r-ggside
(package (package
(name "r-ggside") (name "r-ggside")
(version "0.2.3") (version "0.3.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ggside" version)) (uri (cran-uri "ggside" version))
(sha256 (sha256
(base32 (base32
"0qj564rqxw8fn5h00wwmkvk6p3x60r64gpvxw9yrb5lvcykgsj8q")))) "0mx6j9wi54inklmyydcqm0ahbx0b6c6y4sfh2awqsbgwigc3056p"))))
(properties `((upstream-name . "ggside"))) (properties `((upstream-name . "ggside")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -2729,14 +2767,14 @@ organisms via the @code{g:Profiler} toolkit.")
(define-public r-gprofiler2 (define-public r-gprofiler2
(package (package
(name "r-gprofiler2") (name "r-gprofiler2")
(version "0.2.2") (version "0.2.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "gprofiler2" version)) (uri (cran-uri "gprofiler2" version))
(sha256 (sha256
(base32 (base32
"1zbfvpb4qqj6vipz0ps4pyy14h6rc4jaqfa8q4zrbhi5vvw9805r")))) "1klmg0zj5kr663dzgfzpy1yn161znmjcjq8pl3rahjh2lwaahbmh"))))
(properties `((upstream-name . "gprofiler2"))) (properties `((upstream-name . "gprofiler2")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -3935,13 +3973,13 @@ scraping tasks, inspired by libraries like @code{BeautifulSoup}.")
(define-public r-secretbase (define-public r-secretbase
(package (package
(name "r-secretbase") (name "r-secretbase")
(version "0.2.0") (version "0.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "secretbase" version)) (uri (cran-uri "secretbase" version))
(sha256 (sha256
(base32 "1z0ddzdimma8rgd47fn5mma09d5c7vrl5b7gdlvfk8l047yihyb6")))) (base32 "1wgbk16by9w933cff5ybb2sa0ndgj3sv9ahr2r1843vgqiyvx2xi"))))
(properties `((upstream-name . "secretbase"))) (properties `((upstream-name . "secretbase")))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://shikokuchuo.net/secretbase/") (home-page "https://shikokuchuo.net/secretbase/")
@ -6833,14 +6871,14 @@ on (non-orthogonal) variable vectors in scatterplots and biplots.")
(define-public r-shape (define-public r-shape
(package (package
(name "r-shape") (name "r-shape")
(version "1.4.6") (version "1.4.6.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "shape" version)) (uri (cran-uri "shape" version))
(sha256 (sha256
(base32 (base32
"0yqbrrx2ywmfl99s6d1n6jblc63k1mxbiqyv8y0kq8jws1g3w45r")))) "1912znpk85j8c01s4m2f7x8rcqwski8b5n7g70cczmkzk47vvya3"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/shape") (home-page "https://cran.r-project.org/web/packages/shape")
(synopsis "Functions for plotting graphical shapes") (synopsis "Functions for plotting graphical shapes")
@ -6925,13 +6963,13 @@ graphics packages that comes with the base installation.")
(define-public r-ctrdata (define-public r-ctrdata
(package (package
(name "r-ctrdata") (name "r-ctrdata")
(version "1.17.1") (version "1.17.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ctrdata" version)) (uri (cran-uri "ctrdata" version))
(sha256 (sha256
(base32 (base32
"0vb6nxhms66p90lh8ky693k7hchi5fbxxf8lnjcj4vhc0c5ijxns")))) "0xsi3yc08gg9h5zh9h9r2d2ixv36f6wblmkcv51h9nfmawjyd8f8"))))
(properties `((upstream-name . "ctrdata"))) (properties `((upstream-name . "ctrdata")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -13370,14 +13408,14 @@ those searches and pull data into their R sessions.")
(define-public r-renv (define-public r-renv
(package (package
(name "r-renv") (name "r-renv")
(version "1.0.3") (version "1.0.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "renv" version)) (uri (cran-uri "renv" version))
(sha256 (sha256
(base32 (base32
"1d2y1yks34dg862zcxx03dak1h2gikis6mabmws2srja2hr18nlq")))) "0jfrkxslx1bw4b2akkp12bgvpfc58dh2vrm91hgb1xa5xydai7j6"))))
(properties `((upstream-name . "renv"))) (properties `((upstream-name . "renv")))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
@ -14177,14 +14215,14 @@ references and Rd files.")
(define-public r-officer (define-public r-officer
(package (package
(name "r-officer") (name "r-officer")
(version "0.6.4") (version "0.6.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "officer" version)) (uri (cran-uri "officer" version))
(sha256 (sha256
(base32 (base32
"1mhkb2k9l0fp7xxhx69h1cxyh8gnlpwr5rjiw25s7rp1czwmyjk5")))) "1lzpabpdrwx3331b9qn43376r25bzgph1j9gbxzqjhzr1h871cpb"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-openssl r-r6 r-ragg r-uuid r-xml2 r-zip)) (list r-openssl r-r6 r-ragg r-uuid r-xml2 r-zip))
@ -14502,13 +14540,13 @@ tidyverse workflow.")
(define-public r-nodbi (define-public r-nodbi
(package (package
(name "r-nodbi") (name "r-nodbi")
(version "0.10.1") (version "0.10.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "nodbi" version)) (uri (cran-uri "nodbi" version))
(sha256 (sha256
(base32 (base32
"180zydrq9wr53y0nd5v1z86f00v49m4xlam91ykc6jy4s7xvamz1")))) "1pznlnln0p55qqwy22h9m79ddf3wgnx3vaxx2q39wvgqwj0kk1b0"))))
(properties `((upstream-name . "nodbi"))) (properties `((upstream-name . "nodbi")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -14519,6 +14557,7 @@ tidyverse workflow.")
r-stringi r-stringi
r-uuid r-uuid
r-v8)) r-v8))
(native-inputs (list r-knitr))
(home-page "https://docs.ropensci.org/nodbi/") (home-page "https://docs.ropensci.org/nodbi/")
(synopsis "NoSQL database connector") (synopsis "NoSQL database connector")
(description (description
@ -15542,14 +15581,14 @@ Models\" (Hastie and Tibshirani, 1990).")
(define-public r-superlearner (define-public r-superlearner
(package (package
(name "r-superlearner") (name "r-superlearner")
(version "2.0-28.1") (version "2.0-29")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "SuperLearner" version)) (uri (cran-uri "SuperLearner" version))
(sha256 (sha256
(base32 (base32
"19kb4shfhj5aigjm1ljmlvr0jmgcbd6yl4gl3wfddy0nk2wi2bvm")))) "0g1baz8jakgfwdh5bd9hrg1nm4ljpnxiiy5pmf00d27ld7wh6sr3"))))
(properties `((upstream-name . "SuperLearner"))) (properties `((upstream-name . "SuperLearner")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -15807,13 +15846,13 @@ Processing of very large files is supported.")
(define-public r-mosaic (define-public r-mosaic
(package (package
(name "r-mosaic") (name "r-mosaic")
(version "1.9.0") (version "1.9.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "mosaic" version)) (uri (cran-uri "mosaic" version))
(sha256 (sha256
(base32 "1dydqawljv5l9lmhdrhmr7wh3q1c2mnc61gc99jr0jbb1bmls327")))) (base32 "0l7h3zg5izr5xxqy1sngz6fzbwdffzljnjmfbshzzbl4x80f5lwl"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-dplyr (list r-dplyr
@ -17310,14 +17349,14 @@ effects models and Bayesian models.")
(define-public r-ggeffects (define-public r-ggeffects
(package (package
(name "r-ggeffects") (name "r-ggeffects")
(version "1.4.0") (version "1.5.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ggeffects" version)) (uri (cran-uri "ggeffects" version))
(sha256 (sha256
(base32 (base32
"1r9mbfcanwh2f617fgxnz3gijgpcjxvwzvpd7z8dg30rcm3ajb5r")))) "0yczz34rn4sikwzqpm3w47zwm201mv4mljrcgpb50is06g3l7azk"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-insight)) (list r-insight))
@ -18078,14 +18117,14 @@ using C++ code and of the OpenMP API.")
(define-public r-afex (define-public r-afex
(package (package
(name "r-afex") (name "r-afex")
(version "1.3-0") (version "1.3-1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "afex" version)) (uri (cran-uri "afex" version))
(sha256 (sha256
(base32 (base32
"0cqr3vv4aapg8ckhrkwqhs5qvzl8zla147fvhd5wb2020yhpdqpq")))) "1a1ilqn5xz7kkiwwaqi911b1cf9zc78l9my0fvjq3l73hrzgnr2a"))))
(build-system r-build-system) (build-system r-build-system)
;; This is needed for the vignette builder ;; This is needed for the vignette builder
(arguments (arguments
@ -25561,14 +25600,14 @@ colored by the number of neighboring points. This is useful to visualize the
(define-public r-arrow (define-public r-arrow
(package (package
(name "r-arrow") (name "r-arrow")
(version "14.0.0.2") (version "14.0.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "arrow" version)) (uri (cran-uri "arrow" version))
(sha256 (sha256
(base32 (base32
"1dwap9lap0hac0bhi8ajz06n9ccjdyfr5s153k1lxfgicqnsaf3i")))) "1l1ninmq6mbqm7cckcy0qw4f20fkrixrykcqkh24bszg514r9af5"))))
(properties `((upstream-name . "arrow"))) (properties `((upstream-name . "arrow")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
@ -25849,13 +25888,13 @@ code edited with @code{RStudio IDE}, @code{Emacs} and @code{Vim}.")
(define-public r-sccore (define-public r-sccore
(package (package
(name "r-sccore") (name "r-sccore")
(version "1.0.4") (version "1.0.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "sccore" version)) (uri (cran-uri "sccore" version))
(sha256 (sha256
(base32 "11l7xl1ylzmda4i2p1b08a43pvciin2i2sas2n3cj1gmamflkji3")))) (base32 "12jljngm0v75zp0zka1zdrn6pvxvqy7qpakr7vzazvq1vvjd5qlg"))))
(properties `((upstream-name . "sccore"))) (properties `((upstream-name . "sccore")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -32612,19 +32651,19 @@ recommendations for developers.")
(define-public r-loo (define-public r-loo
(package (package
(name "r-loo") (name "r-loo")
(version "2.6.0") (version "2.7.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "loo" version)) (uri (cran-uri "loo" version))
(sha256 (sha256
(base32 "040jk0zmpljq3ayd87bjy5vwwfy49im6kylp6z4wnqisypyn1nk6")))) (base32 "0dnbbflglm7b29vr11rfrawnys9s3rl4h00h6xh9smjyalqz6r3n"))))
(properties `((upstream-name . "loo"))) (properties `((upstream-name . "loo")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
(list pandoc)) (list pandoc))
(propagated-inputs (propagated-inputs
(list r-checkmate r-matrixstats)) (list r-checkmate r-matrixstats r-posterior))
(native-inputs (native-inputs
(list r-knitr)) (list r-knitr))
(home-page "https://mc-stan.org/loo/") (home-page "https://mc-stan.org/loo/")
@ -34296,14 +34335,14 @@ Kemeny distance and correlation coefficient.")
(define-public r-fastshap (define-public r-fastshap
(package (package
(name "r-fastshap") (name "r-fastshap")
(version "0.1.0") (version "0.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "fastshap" version)) (uri (cran-uri "fastshap" version))
(sha256 (sha256
(base32 (base32
"112hc585aryzc5pgvr3qaa7arlx2h2sj9jlq9xha3nncyzqkh7c6")))) "1j6bnkv4q8n85xlvzm5p6p4yg8wdp6an6skbvdif5g9c376hzqb2"))))
(properties `((upstream-name . "fastshap"))) (properties `((upstream-name . "fastshap")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -35940,14 +35979,14 @@ prediction of kriging models.")
(define-public r-dials (define-public r-dials
(package (package
(name "r-dials") (name "r-dials")
(version "1.2.0") (version "1.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "dials" version)) (uri (cran-uri "dials" version))
(sha256 (sha256
(base32 (base32
"1zj8f47jzgaydp3cff96w0kx1gm208vyq3f77p3g59nc01r0wri4")))) "0xrvvz4pkzmjsizjqfcvpn6f1cl9yp56lyc2iw8vcvwa18gb6szf"))))
(properties `((upstream-name . "dials"))) (properties `((upstream-name . "dials")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -38619,14 +38658,14 @@ to read the latter.")
(define-public r-readtext (define-public r-readtext
(package (package
(name "r-readtext") (name "r-readtext")
(version "0.90") (version "0.91")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "readtext" version)) (uri (cran-uri "readtext" version))
(sha256 (sha256
(base32 (base32
"01hscqmjb3fz4iqqgi0l2s1z48a53a25jnsxb0cdd631c97alqrh")))) "0bzaq0vx6c83i4xf7p9zwka7h7jbv1qfy6w4v3kljx30hl048dpn"))))
(properties `((upstream-name . "readtext"))) (properties `((upstream-name . "readtext")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
@ -38682,14 +38721,14 @@ and formatted text files with additional meta-data, such including @code{.csv},
(define-public r-lwgeom (define-public r-lwgeom
(package (package
(name "r-lwgeom") (name "r-lwgeom")
(version "0.2-13") (version "0.2-14")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "lwgeom" version)) (uri (cran-uri "lwgeom" version))
(sha256 (sha256
(base32 (base32
"0rqw2nhac832b9v2hdz6wwc51iykh86x5qrq0azlibr9q242i0ph")))) "174jpsri9xpr9zb5hvzqhbhnajqw3aa38ajy1skl7ky8vgvnrnr6"))))
(properties `((upstream-name . "lwgeom"))) (properties `((upstream-name . "lwgeom")))
(build-system r-build-system) (build-system r-build-system)
(inputs (inputs
@ -38787,14 +38826,14 @@ supply the workflow to create thematic maps. This package also facilitates
(define-public r-rtweet (define-public r-rtweet
(package (package
(name "r-rtweet") (name "r-rtweet")
(version "1.2.1") (version "2.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "rtweet" version)) (uri (cran-uri "rtweet" version))
(sha256 (sha256
(base32 (base32
"18ynravc5vz7ywm1n7ww48gx06dndcishl6lq8nqajxsjwiphq3r")))) "1w41a1a5mgg06gvs468vrg9pax2nrnkiqhwllxmkk0i7s15gvi42"))))
(properties `((upstream-name . "rtweet"))) (properties `((upstream-name . "rtweet")))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs

1469
gnu/packages/crates-apple.scm 100644
View File

File diff suppressed because it is too large Load Diff

5859
gnu/packages/crates-crypto.scm 100644
View File

File diff suppressed because it is too large Load Diff

2772
gnu/packages/crates-graphics.scm
View File

File diff suppressed because it is too large Load Diff

862
gnu/packages/crates-gtk.scm
View File

File diff suppressed because it is too large Load Diff

33358
gnu/packages/crates-io.scm
View File

File diff suppressed because it is too large Load Diff

1714
gnu/packages/crates-tls.scm 100644
View File

File diff suppressed because it is too large Load Diff

4163
gnu/packages/crates-vcs.scm 100644
View File

File diff suppressed because it is too large Load Diff

5654
gnu/packages/crates-web.scm 100644
View File

File diff suppressed because it is too large Load Diff

2523
gnu/packages/crates-windows.scm 100644
View File

File diff suppressed because it is too large Load Diff

1
gnu/packages/crypto.scm
View File

@ -53,6 +53,7 @@
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cpp) #:use-module (gnu packages cpp)
#:use-module (gnu packages crates-crypto)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages cryptsetup) #:use-module (gnu packages cryptsetup)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)

54
gnu/packages/databases.scm
View File

@ -1480,6 +1480,56 @@ PostgreSQL extension, providing automatic partitioning across time and space
(partitioning key), as well as full SQL support.") (partitioning key), as well as full SQL support.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public pgvector
(package
(name "pgvector")
(version "0.6.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pgvector/pgvector")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"19zcjrlmyj7gfbn8prh014yq50iy4dg97pirsm7idxsr829vwyc5"))))
(build-system gnu-build-system)
(arguments
(list
;; Do not use -march=native
#:make-flags
'(list "OPTFLAGS=")
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
(replace 'install
(lambda _
(let ((extension (string-append #$output "/share/extension"))
(lib (string-append #$output "/lib"))
(headers (string-append #$output "/include/server/extension/vector")))
(for-each mkdir-p (list extension lib headers))
(install-file "vector.so" lib)
(chmod (string-append lib "/vector.so") #o755)
(install-file "vector.control" extension)
(for-each (lambda (file)
(install-file file extension))
(find-files "sql" "\\.sql$"))
(install-file "src/vector.h" headers)))))))
(inputs (list postgresql))
(home-page "https://github.com/pgvector/pgvector")
(synopsis "Vector similarity search for Postgres")
(description
"This package provides a vector similarity search extension for Postgres.
Store your vectors with the rest of your data. It supports:
@itemize
@item exact and approximate nearest neighbor search;
@item L2 distance, inner product, and cosine distance;
@item any language with a Postgres client.
@end itemize
")
(license (license:x11-style "file://COPYRIGHT"))))
(define-public pgloader (define-public pgloader
(package (package
(name "pgloader") (name "pgloader")
@ -4461,7 +4511,7 @@ the SQL language using a syntax that reflects the resulting query.")
(define-public apache-arrow (define-public apache-arrow
(package (package
(name "apache-arrow") (name "apache-arrow")
(version "14.0.0") (version "14.0.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4471,7 +4521,7 @@ the SQL language using a syntax that reflects the resulting query.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"08x01jcibmx03g9p0sjikp3dyynw6is6gyn0m3cy1gwkpkwk2ad2")))) "1idw58vs8r6g6xy2qkhccgc79hwx4r5rr4bhd6ilxx56fwq9hkn2"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list (list

4
gnu/packages/diffoscope.scm
View File

@ -74,7 +74,7 @@
(define-public diffoscope (define-public diffoscope
(package (package
(name "diffoscope") (name "diffoscope")
(version "256") (version "258")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -83,7 +83,7 @@
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1sdg314a3hp2kv492130p8w7j8mlhymij7h2rndm4q7gqrshp6jf")))) (base32 "1wppshi18lyrgxxi8j06ij0qi31zdgqwjj6bycsyvipkc1cj6xhp"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list (list

25
gnu/packages/dns.scm
View File

@ -21,6 +21,7 @@
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu> ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -293,7 +294,7 @@ prompt the user with the option to go with insecure DNS only.")
(define-public dnsmasq (define-public dnsmasq
(package (package
(name "dnsmasq") (name "dnsmasq")
(version "2.89") (version "2.90")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -301,7 +302,7 @@ prompt the user with the option to go with insecure DNS only.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"02dnxfnman38armn3sw56w80f9wb2vgm3qgm15crs2yg8q1j7g82")))) "1r09l537vi867hlpv6vl7nvqhscvq1kf04m896bfrgrpv2dk0l4f"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
@ -336,23 +337,23 @@ and BOOTP/TFTP for network booting of diskless machines.")
;; When updating, check whether isc-dhcp's bundled copy should be as well. ;; When updating, check whether isc-dhcp's bundled copy should be as well.
;; The BIND release notes are available here: ;; The BIND release notes are available here:
;; https://www.isc.org/bind/ ;; https://www.isc.org/bind/
(version "9.16.38") (version "9.19.21")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ftp.isc.org/isc/bind9/" version (uri (string-append "https://ftp.isc.org/isc/bind9/" version
"/bind-" version ".tar.xz")) "/bind-" version ".tar.xz"))
(sha256 (sha256
(base32 "03y52iyc2g63lkk9x2vaizpr0jv27g1z6mcxnjw8m8l4kaflrx4d")) (base32 "133f1aq8acaz9z03cl0gcrj4pq0hqm6c3sm4hz67d37phndsjs1b"))))
(patches
(search-patches "bind-re-add-attr-constructor-priority.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs `("out" "utils")) (outputs `("out" "utils"))
(inputs (inputs
;; It would be nice to add GeoIP and gssapi once there are packages. ;; It would be nice to add GeoIP and gssapi once there are packages.
(list libcap (list libcap
liburcu
libuv libuv
libxml2 libxml2
`(,nghttp2 "lib")
openssl openssl
p11-kit p11-kit
python python
@ -635,14 +636,14 @@ BIND and djbdns---whilst using relatively little memory.")
(define-public unbound (define-public unbound
(package (package
(name "unbound") (name "unbound")
(version "1.17.1") (version "1.19.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.unbound.net/downloads/unbound-" (uri (string-append "https://www.unbound.net/downloads/unbound-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "1x55f5aqlzynpy24ryf1rsmdy8m8iyi19n7k03k889g1rk78ah7f")))) (base32 "1ad34jxprygjp7g84q1bgmvcc114f2mgyhfwk9rs0inq7mpmf7dw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "python")) (outputs '("out" "python"))
(native-inputs (native-inputs
@ -844,7 +845,7 @@ Extensions} (DNSSEC).")
(define-public knot (define-public knot
(package (package
(name "knot") (name "knot")
(version "3.3.2") (version "3.3.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -853,7 +854,7 @@ Extensions} (DNSSEC).")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "17zdpk6wf0cf90dp4cls35si8ywjsqjrmgssw2gmb1y0zfyp19vq")) (base32 "0w7drq0pj94d43qn9wmzxab34mjhxj9x84rixbswc270ywh6d9pr"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -983,14 +984,14 @@ synthesis, and on-the-fly re-configuration.")
(define-public knot-resolver (define-public knot-resolver
(package (package
(name "knot-resolver") (name "knot-resolver")
(version "5.5.3") (version "5.7.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://secure.nic.cz/files/knot-resolver/" (uri (string-append "https://secure.nic.cz/files/knot-resolver/"
"knot-resolver-" version ".tar.xz")) "knot-resolver-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0bgdbx66dsfik3sdqi4g2imddalqc1p41n444xk7s8vxig35g3x3")))) "18n3jh17d22xmzpg8syw2dm85vv7jchdc4hzk5x78lqxqqav856s"))))
(build-system meson-build-system) (build-system meson-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments

97
gnu/packages/emacs-xyz.scm
View File

@ -368,6 +368,35 @@
"This package allows using Ace jump to a candidate in Helm window.") "This package allows using Ace jump to a candidate in Helm window.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-activities
(package
(name "emacs-activities")
(version "0.5.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://elpa.gnu.org/packages/activities-" version ".tar"))
(sha256
(base32 "0ng9sgajcpal881s3kavkmz0fc38f2h207hpqj62cf14z7bsk0zk"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-persist))
(home-page "https://github.com/alphapapa/activities.el")
(synopsis "Save/restore sets of windows, tabs/frames, and their buffers")
(description
"Inspired by Genera's and KDE's concepts of \"activities\", this library
allows the user to select an \"activity\", the loading of which restores a
window configuration into a @code{tab-bar} tab or frame, along with the
buffers shown in each window. Saving an activity saves the state for later
restoration. Switching away from an activity saves the last-used state for
later switching back to, while still allowing the activity's initial or
default state to be restored on demand. Resuming an activity loads the
last-used state, or the initial/default state when a universal argument is
provided. The implementation uses the bookmark system to save buffers
states–that is, any major mode that supports the bookmark system is
compatible.")
(license license:gpl3+)))
(define-public emacs-bookmark-plus (define-public emacs-bookmark-plus
(package (package
(name "emacs-bookmark-plus") (name "emacs-bookmark-plus")
@ -1378,6 +1407,30 @@ some utility functions, and commands using that infrastructure.")
its mode line.") its mode line.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public emacs-project-tab-groups
(let ((commit "2658405d5f3c539fbd9ccf95297a016a2c91816a")
(revision "1"))
(package
(name "emacs-project-tab-groups")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fritzgrabo/project-tab-groups.git")
(commit commit)))
(sha256
(base32 "1zg9kxyjz942ib9lii0in67hwqil2xlz78vjm1qqypw3zaivhh7p"))))
(build-system emacs-build-system)
(home-page "https://github.com/fritzgrabo/project-tab-groups")
(synopsis "Support a \"one tab group per project\" workflow")
(description "This package provides a global minor mode that enhances the
Emacs built-in @code{project.el} library to support keeping projects isolated
in named tab groups. This package automates the steps you’d otherwise need to
do manually if you wanted to keep the buffers of a project neatly isolated in
separate, named tab groups.")
(license license:gpl3+))))
(define-public emacs-golden-ratio (define-public emacs-golden-ratio
(let ((commit "375c9f287dfad68829582c1e0a67d0c18119dab9") (let ((commit "375c9f287dfad68829582c1e0a67d0c18119dab9")
(revision "0")) (revision "0"))
@ -9224,6 +9277,40 @@ tupfiles, such as rule definitions, user-defined variables, macros, flags, bin
variables, and so on. The mode also allows you to execute Tup commands.") variables, and so on. The mode also allows you to execute Tup commands.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-combobulate
(let ((commit "c7e4670a3047c0b58dff3746577a5c8e5832cfba")
(revision "1"))
(package
(name "emacs-combobulate")
(version (git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mickeynp/combobulate")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "063w2sm0c7xhg3ml31xp870azb0sv7z689lnbnjnbl3rfdy4kg50"))))
(build-system emacs-build-system)
(propagated-inputs
(list tree-sitter-javascript
tree-sitter-python
tree-sitter-typescript))
(native-inputs
(list python-minimal))
(home-page "https://www.masteringemacs.org/article/combobulate-structured-movement-editing-treesitter")
(synopsis "Structured editing and navigation in Emacs with tree-sitter")
(description
"Combobulate is a package that adds structured editing and movement to
a wide range of programming languages. Unlike most programming major modes
that use error-prone imperative code and regular expressions to determine
what's what in your code, Combobulate uses Emacs 29's tree-sitter library.
Tree-sitter maintains a concrete syntax tree of your code; it gives
Combobulate absolute clarity of all aspects of your code, enabling more
correct movement and editing than you would otherwise have.")
(license license:gpl3+))))
(define-public emacs-compat (define-public emacs-compat
(package (package
(name "emacs-compat") (name "emacs-compat")
@ -34620,11 +34707,11 @@ other @code{helm-type-file} sources such as @code{helm-locate}.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-telega-server (define-public emacs-telega-server
(let ((commit "e8d9459ef725ed8fb60479b5fccadae1e4eac87a") (let ((commit "d1cf1ffe289a18f366b7f3b64f827f0d0755947a")
(revision "0")) (revision "0"))
(package (package
(name "emacs-telega-server") (name "emacs-telega-server")
(version (git-version "0.8.240" revision commit)) (version (git-version "0.8.250" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -34632,7 +34719,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.")
(url "https://github.com/zevlg/telega.el") (url "https://github.com/zevlg/telega.el")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 "18f6i2w0iial2wi60vkqck30c0m4p2nj0bzd2x9p4il27dwv5hwq")) (base32 "0s1w4zb252d70n05dbsv2rnlfsg53paklafqxasl566nnzbi0d2q"))
(file-name (git-file-name "emacs-telega" version)) (file-name (git-file-name "emacs-telega" version))
(patches (patches
(search-patches "emacs-telega-path-placeholder.patch" (search-patches "emacs-telega-path-placeholder.patch"
@ -39315,7 +39402,7 @@ navigate through it.")
;; There is no proper release. ;; There is no proper release.
;; The base version is extracted from the README.org. ;; The base version is extracted from the README.org.
(let ((revision "0") (let ((revision "0")
(commit "0b78f4e33b994612fcb305b3cf6d3b1e3b62cea7")) (commit "eafc9828f54dddd594887bb28a7249cf1584230c"))
(package (package
(name "emacs-project-x") (name "emacs-project-x")
(version (git-version "0.1.6" revision commit)) (version (git-version "0.1.6" revision commit))
@ -39328,7 +39415,7 @@ navigate through it.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1xxzxxm0jila5s9sfay6ywj2j8pyz4wwcrycvnrrzh0vxcsgzf9s")))) (base32 "141zym1libs14bpqv27ln8f6csxgy67pgcn1l3f44p15g1rc8mhr"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://github.com/karthink/project-x") (home-page "https://github.com/karthink/project-x")
(synopsis "Enhancement to Emacs built-in Project library") (synopsis "Enhancement to Emacs built-in Project library")

4
gnu/packages/engineering.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015-2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015-2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016, 2018, 2020-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2018, 2020-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2016-2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016-2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis <theodoros@foradis.org>
@ -3272,6 +3272,8 @@ program that can perform mesh processing tasks in batch mode, without a GUI.")
(guix build utils)) (guix build utils))
#:configure-flags #:configure-flags
#~(list "--disable-static" #~(list "--disable-static"
(string-append "--with-vimdir=" #$output
"/share/vim/vimfiles/pack/guix/start/poke")
(string-append "--with-lispdir=" (string-append "--with-lispdir="
(emacs:elpa-directory #$output))))) (emacs:elpa-directory #$output)))))
(home-page "https://www.gnu.org/software/poke/#documentation") (home-page "https://www.gnu.org/software/poke/#documentation")

16
gnu/packages/finance.scm
View File

@ -36,6 +36,7 @@
;;; Copyright © 2023 Skylar Hill <stellarskylark@posteo.net> ;;; Copyright © 2023 Skylar Hill <stellarskylark@posteo.net>
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
;;; Copyright © 2023 Attila Lendvai <attila@lendvai.name> ;;; Copyright © 2023 Attila Lendvai <attila@lendvai.name>
;;; Copyright © 2024 Saku Laesvuori <saku@laesvuori.fi>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1308,7 +1309,7 @@ agent.")
(define-public kitsas (define-public kitsas
(package (package
(name "kitsas") (name "kitsas")
(version "4.0.3") (version "5.4.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1317,17 +1318,24 @@ agent.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0hrbsqqm6v2pmjq17s7i4akjgclz3d051mg02vcykq80xgxvbkgf")))) "16zkfpl5d9ia202fqg5vrhjqdw0g6wp044ih6n7nz2hbxj9y3m1z"))))
(build-system qt-build-system) (build-system qt-build-system)
(inputs (list qtbase-5 libzip poppler-qt5 qtsvg-5)) (inputs (list libzip qtsvg qtwebengine qt5compat))
(arguments (arguments
(list #:tests? #f ;XXX: some tests fail and others segfault (list #:tests? #f ; tests do not even build with Qt6 anymore
#:test-target "check" #:test-target "check"
#:qtbase qtbase ; use Qt6
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* _ (lambda* _
(invoke "qmake" "kitsasproject.pro" "CONFIG+=release"))) (invoke "qmake" "kitsasproject.pro" "CONFIG+=release")))
;; The tests are not maintained and some don't even build
(add-before 'configure 'disable-broken-tests
(lambda _
(substitute* "kitsasproject.pro"
((" *(unittest|testit).*") "")
(("\\\\") ""))))
(replace 'install (replace 'install
(lambda* _ (lambda* _
(install-file "kitsas/kitsas" (install-file "kitsas/kitsas"

56
gnu/packages/fonts.scm
View File

@ -59,6 +59,7 @@
;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2023 chris <chris@bumblehead.com> ;;; Copyright © 2023 chris <chris@bumblehead.com>
;;; Copyright © 2023, 2024 Luis Felipe López Acevedo <sirgazil@zoho.com> ;;; Copyright © 2023, 2024 Luis Felipe López Acevedo <sirgazil@zoho.com>
;;; Copyright © 2024 Christina O'Donnell <cdo@mutix.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -2680,6 +2681,61 @@ It comes in seven weights and Roman, Italic and Oblique styles.")
(home-page "https://rubjo.github.io/victor-mono/") (home-page "https://rubjo.github.io/victor-mono/")
(license license:expat))) (license license:expat)))
(define-public font-dongle
(let ((commit "f7127c4d2450e1cad20254ec692591347e2fc260")
(revision "1"))
(package
(name "font-dongle")
(version (git-version "0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/yangheeryu/Dongle")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1gwrjv468bqfa3nxh01vprk7rp24cnhk3zlkrv5mzqcbcdf96nqp"))))
(build-system font-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'install 'build
(lambda _
(begin
(chdir "sources")
(invoke "unzip" "Dongle.zip")
(chdir "..")
(invoke "python3" "build.py")))))))
(native-inputs
(list python
python-glyphslib
python-fonttools
python-ufolib2
python-ufo2ft
zip))
(synopsis
"Rounded sans-serif typeface, supporting Hangeul and Latin glyphs")
(description
"Dongle(동글) is a rounded sans-serif typeface for display. It is a
modular Hangeul with the de-square frame, creating a playful and rhythmic
movement. The name, Dongle comes from a Korean onomatopoeia, meaning 'rounded
or curved shape (with adorable impression)’.
Dongle was originally designed as a 'Jamo (consonant and vowel in Hangeul)
typing module' for the author's student project. Later it revised into
‘syllabic module’ to be released to the public. As the character size varies
according to the syllable structure, Dongle typeface is much smaller compared
to other square frame Korean typefaces. Therefore, it is better to adjust the
font size visually to your liking, rather than relying on the point size of
the editing program.
It is designed especially for Hangeul typography, but it also includes Latin
alphabet as a part of KS X 1001. This typeface has a light, regular, and bold
weight.")
(home-page "https://github.com/yangheeryu/Dongle")
(license license:silofl1.1))))
(define-public font-meera-inimai (define-public font-meera-inimai
(package (package
(name "font-meera-inimai") (name "font-meera-inimai")

4
gnu/packages/freedesktop.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2015-2017, 2019, 2021-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015-2017, 2019, 2021-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2017, 2018, 2019, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017, 2018, 2019, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2016, 2017, 2019, 2021-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019, 2021-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org>
@ -3111,7 +3111,7 @@ for xdg-desktop-portal that is using Qt/KF5.")
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/share/doc/" ,name))))))) "/share/doc/" ,name)))))))
(native-inputs (native-inputs
(list cmake pkg-config)) (list cmake-minimal pkg-config))
(inputs (list elogind (inputs (list elogind
bash-minimal bash-minimal
grim grim

18
gnu/packages/gdb.scm
View File

@ -145,25 +145,25 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
(properties `((hidden? . #t))) (properties `((hidden? . #t)))
(license gpl3+))) (license gpl3+)))
(define-public gdb-12 (define-public gdb-14
(package (package
(inherit gdb/pinned) (inherit gdb/pinned)
(version "12.1") (version "14.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/gdb/gdb-" (uri (string-append "mirror://gnu/gdb/gdb-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1vczsqcbh5y0gx7qrclpna0qzx26sk7lra6y8qzxam1biyzr65qf")))) "106v7rj72km56mb2ssjsyjfix3yn4f3wqr7lpzy52d0lfq9gavfn"))))
(properties '()))) (properties '())))
(define-public gdb (define-public gdb
;; The "default" version. ;; The "default" version.
gdb-12) gdb-14)
(define-public gdb-multiarch (define-public gdb-multiarch
(package/inherit gdb-12 (package/inherit gdb-14
(name "gdb-multiarch") (name "gdb-multiarch")
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -172,17 +172,17 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
"--enable-interwork" "--enable-interwork"
"--enable-languages=c,c++" "--enable-languages=c,c++"
"--disable-nls") "--disable-nls")
,@(package-arguments gdb-12))) ,@(package-arguments gdb-14)))
(synopsis "The GNU debugger (with all architectures enabled)"))) (synopsis "The GNU debugger (with all architectures enabled)")))
(define-public gdb-minimal (define-public gdb-minimal
(package/inherit gdb-12 (package/inherit gdb-14
(name "gdb-minimal") (name "gdb-minimal")
(inputs (fold alist-delete (package-inputs gdb) (inputs (fold alist-delete (package-inputs gdb)
'("libxml2" "ncurses" "python-wrapper" "source-highlight"))))) '("libxml2" "ncurses" "python-wrapper" "source-highlight")))))
(define-public avr-gdb (define-public avr-gdb
(package/inherit gdb-12 (package/inherit gdb-14
(name "avr-gdb") (name "avr-gdb")
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -191,7 +191,7 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
"--enable-languages=c,c++" "--enable-languages=c,c++"
"--with-system-readline" "--with-system-readline"
"--enable-source-highlight") "--enable-source-highlight")
,@(package-arguments gdb-12))) ,@(package-arguments gdb-14)))
(synopsis "The GNU Debugger for AVR") (synopsis "The GNU Debugger for AVR")
(description (description
"GDB is the GNU debugger. With it, you can monitor what a program is "GDB is the GNU debugger. With it, you can monitor what a program is

9
gnu/packages/geo.scm
View File

@ -1676,7 +1676,7 @@ based on the Osmium library.")
(define-public osm2pgsql (define-public osm2pgsql
(package (package
(name "osm2pgsql") (name "osm2pgsql")
(version "1.9.2") (version "1.11.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1685,7 +1685,7 @@ based on the Osmium library.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"198qcgl42pb8lk1bn41ncp8hc9gcg9k2p0ny42vak019w5l6jcj7")) "135vqahlcrhwa3b9hfgbiqkzbbsjd4i79fp41cd0rp4zarcpi47p"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled libraries. ;; Remove bundled libraries.
@ -1693,20 +1693,21 @@ based on the Osmium library.")
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:tests? #f ;tests fail because we need to setup a database (list #:tests? #f ;tests fail because we need to setup a database
#:configure-flags #~(list "-DUSE_PROJ_LIB=4" ;use API version 4 #:configure-flags #~(list "-DUSE_PROJ_LIB=6" ;use API version 6
"-DWITH_LUAJIT=ON" "-DWITH_LUAJIT=ON"
"-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_LIBOSMIUM=ON"
"-DEXTERNAL_PROTOZERO=ON" "-DEXTERNAL_PROTOZERO=ON"
"-DEXTERNAL_FMT=ON"))) "-DEXTERNAL_FMT=ON")))
(inputs (list boost (inputs (list boost
bzip2 bzip2
cli11
expat expat
fmt-8 fmt-8
libosmium libosmium
luajit luajit
nlohmann-json nlohmann-json
postgresql postgresql
proj-7 proj
protozero protozero
zlib)) zlib))
(native-inputs (list pandoc python python-argparse-manpage)) (native-inputs (list pandoc python python-argparse-manpage))

13
gnu/packages/gnome.scm
View File

@ -243,6 +243,7 @@
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix platform)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (ice-9 match) #:use-module (ice-9 match)
@ -3604,12 +3605,12 @@ for dealing with different structured file formats.")
;; In lieu of #:make-flags ;; In lieu of #:make-flags
(setenv "CC" #$(cc-for-target)) (setenv "CC" #$(cc-for-target))
(setenv "PKG_CONFIG" #$(pkg-config-for-target)) (setenv "PKG_CONFIG" #$(pkg-config-for-target))
(when #$(%current-target-system) #$@(if (%current-target-system)
(setenv "RUST_TARGET" #~((setenv "RUST_TARGET"
(string-replace #$(platform-rust-target
#$(%current-target-system) (lookup-platform-by-target
"-unknown-linux-gnu" (%current-target-system)))))
(string-index #$(%current-target-system) #\-)))) #~())
;; Something about the build environment resists building ;; Something about the build environment resists building
;; successfully with the '--locked' flag. ;; successfully with the '--locked' flag.
(substitute* '("Makefile.am" "Makefile.in") (substitute* '("Makefile.am" "Makefile.in")

12
gnu/packages/gnucash.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@ -66,14 +66,14 @@
;; directory. ;; directory.
(package (package
(name "gnucash") (name "gnucash")
(version "5.3") (version "5.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
version "/gnucash-" version ".tar.bz2")) version "/gnucash-" version ".tar.bz2"))
(sha256 (sha256
(base32 "0npilq0spalpg1ma956j7vlbn0yc5f0z5imy4kbyksl5ql4cnn0l")))) (base32 "0fzds1yq298c3rvi07if1bfxff904jbzmsb27wr0ddwjp1xzdnml"))))
(outputs '("out" "doc" "debug" "python")) (outputs '("out" "doc" "debug" "python"))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
@ -214,13 +214,11 @@ installed as well as Yelp, the Gnome help browser.")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
;; The filename for version 5.3 is gnucash-docs-5.2.tar.gz, not
;; gnucash-docs-5.3.tar.gz.
(uri (string-append (uri (string-append
"mirror://sourceforge/gnucash/gnucash%20%28stable%29/" "mirror://sourceforge/gnucash/gnucash%20%28stable%29/"
version "/gnucash-docs-5.2" revision ".tar.gz")) version "/gnucash-docs-" version revision ".tar.gz"))
(sha256 (sha256
(base32 "16xlxwdgc0w4cg9kxg4w2f1y974cb16wq2c9icq5qrh3nj0nbsxr")))) (base32 "1ay8jzxrsb9qmbx0v12kqdjk6l3j7cafgxswa92yynihv5ahymlk"))))
(build-system cmake-build-system) (build-system cmake-build-system)
;; These are native-inputs because they are only required for building the ;; These are native-inputs because they are only required for building the
;; documentation. ;; documentation.

12
gnu/packages/golang.scm
View File

@ -2238,7 +2238,7 @@ TrueType font files in your system's user and system font directories.")
(define-public go-github-com-signintech-gopdf (define-public go-github-com-signintech-gopdf
(package (package
(name "go-github-com-signintech-gopdf") (name "go-github-com-signintech-gopdf")
(version "0.18.0") (version "0.22.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2247,10 +2247,16 @@ TrueType font files in your system's user and system font directories.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1jf8a896qh871mdr1i7f0fdpqki5pkk1sp6p5dq404zqxpd7lq5l")))) "1h6cslvid5v8fiymydj4irrzi8f91knsx8rgbzp2b8favclhwxxg"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
'(#:import-path "github.com/signintech/gopdf")) (list
#:import-path "github.com/signintech/gopdf"
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'remove-examples
(lambda* (#:key import-path #:allow-other-keys)
(delete-file-recursively
(string-append "src/" import-path "/examples")))))))
(propagated-inputs (list go-github-com-pkg-errors (propagated-inputs (list go-github-com-pkg-errors
go-github-com-phpdave11-gofpdi)) go-github-com-phpdave11-gofpdi))
(home-page "https://github.com/signintech/gopdf") (home-page "https://github.com/signintech/gopdf")

7
gnu/packages/gps.scm
View File

@ -48,6 +48,7 @@
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages serialization)
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml))
@ -140,7 +141,7 @@ between two other data points.")
(define-public gama (define-public gama
(package (package
(name "gama") (name "gama")
(version "2.28") (version "2.29")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -148,7 +149,7 @@ between two other data points.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"06kblr43yxkn5y77nigwy42r81cmi5pxz3kp50z271vvj3h3zisx")) "04dlh1pdaiq059ssrxa4yn24iqgjrzy2mq7s9n1pgrzlzz3a63y0"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -157,7 +158,7 @@ between two other data points.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:parallel-tests? #f)) ; race condition (arguments '(#:parallel-tests? #f)) ; race condition
(native-inputs (native-inputs
(list libxml2)) (list libxml2 yaml-cpp))
(inputs (inputs
(list expat sqlite)) (list expat sqlite))
(home-page "https://www.gnu.org/software/gama/") (home-page "https://www.gnu.org/software/gama/")

4
gnu/packages/graph.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2017-2024 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017-2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018, 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2021, 2022, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2020 Alexander Krotov <krotov@iitp.ru> ;;; Copyright © 2020 Alexander Krotov <krotov@iitp.ru>
;;; Copyright © 2020 Pierre Langlois <pierre.langlos@gmx.com> ;;; Copyright © 2020 Pierre Langlois <pierre.langlos@gmx.com>
@ -833,6 +833,8 @@ transformed into common image formats for display or printing.")
(guix build python-build-system)) (guix build python-build-system))
#:modules (,@%gnu-build-system-modules #:modules (,@%gnu-build-system-modules
((guix build python-build-system) #:select (site-packages))) ((guix build python-build-system) #:select (site-packages)))
;; The build process peaks around 4GB/RAM per core.
#:parallel-build? #f
#:configure-flags #:configure-flags
(list (string-append "--with-boost=" (list (string-append "--with-boost="
(assoc-ref %build-inputs "boost")) (assoc-ref %build-inputs "boost"))

15
gnu/packages/gstreamer.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2017, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2022-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@ -800,13 +800,18 @@ model to base your own plug-in on, here it is.")
;; The 'elements_curlhttpsrc' test sometimes times out. ;; The 'elements_curlhttpsrc' test sometimes times out.
((".*'elements/curlhttpsrc\\.c'.*") "") ((".*'elements/curlhttpsrc\\.c'.*") "")
;; TODO: Figure out why this test fails on riscv64-linux.
#$@(if (target-riscv64?)
`((("'elements/viewfinderbin\\.c'\\].*],")
"'elements/viewfinderbin.c'], true, ],"))
'())
;; This test is flaky on at least some architectures. ;; This test is flaky on at least some architectures.
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244 ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
#$@(if (target-riscv64?) #$@(if (member (%current-system)
'("aarch64-linux" "riscv64-linux"))
`((("'elements/camerabin\\.c'\\].*],") `((("'elements/camerabin\\.c'\\].*],")
"'elements/camerabin.c'], true, ],") "'elements/camerabin.c'], true, ],"))
(("'elements/viewfinderbin\\.c'\\].*],")
"'elements/viewfinderbin.c'], true, ],"))
'()) '())
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412 ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412

12
gnu/packages/guile.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2014 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2016, 2018 David Thompson <davet@gnu.org> ;;; Copyright © 2014, 2016, 2018 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2017, 2018 Mark H Weaver <mhw@netris.org>
@ -830,7 +830,7 @@ type system, elevating types to first-class status.")
(define-public guile-git (define-public guile-git
(package (package
(name "guile-git") (name "guile-git")
(version "0.5.2") (version "0.6.0")
(home-page "https://gitlab.com/guile-git/guile-git.git") (home-page "https://gitlab.com/guile-git/guile-git.git")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -840,9 +840,7 @@ type system, elevating types to first-class status.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"11a51acibwi2hpaygmrpn6nwbr4lqalc87ihrgj3mhz6swbsk9n7")) "0a3765chjas1dmkl0qc75y6l3hsss6n2awi82jkwzjyfslrlcrgq"))))
(patches (search-patches
"guile-git-adjust-for-libgit2-1.2.0.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings `(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
@ -871,9 +869,7 @@ type system, elevating types to first-class status.")
(native-inputs (native-inputs
(list pkg-config autoconf automake texinfo guile-3.0 guile-bytestructures)) (list pkg-config autoconf automake texinfo guile-3.0 guile-bytestructures))
(inputs (inputs
;; libgit2@1.4.3 ‘fixed’ a git CVE it never shared, breaking Guix. Use (list guile-3.0 libgit2-1.7))
;; 1.3 for now; see <https://issues.guix.gnu.org/55399> for alternatives.
(list guile-3.0 libgit2-1.3))
(propagated-inputs (propagated-inputs
(list guile-bytestructures)) (list guile-bytestructures))
(synopsis "Guile bindings for libgit2") (synopsis "Guile bindings for libgit2")

22
gnu/packages/ibus.scm
View File

@ -12,6 +12,7 @@
;;; Copyright © 2021 Taiju HIGASHI <higashi@taiju.info> ;;; Copyright © 2021 Taiju HIGASHI <higashi@taiju.info>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com> ;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -454,7 +455,7 @@ Japanese language input in most graphical applications.")
(define-public librime (define-public librime
(package (package
(name "librime") (name "librime")
(version "1.7.3") (version "1.10.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -464,25 +465,8 @@ Japanese language input in most graphical applications.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0pqk0i3zcii3fx5laj9qzbgd58jvq6wn31j76w4zix2i4b1lqcqv")) "0p4ybmn2syhf30vwzrd6ms77xadhl2lh7d2apq2m1yzmy42mdydm"))))
(patches (search-patches "librime-fix-build-with-gcc10.patch"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "thirdparty/src")
(delete-file-recursively "thirdparty/bin")
(delete-file-recursively "thirdparty/include/X11")
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda _
(substitute* "CMakeLists.txt"
(("include_directories\\($\\{PROJECT_SOURCE_DIR\\}/thirdparty/include\\)") "")
(("link_directories\\($\\{PROJECT_SOURCE_DIR\\}/thirdparty/lib\\)") ""))
#t)))))
(inputs (inputs
(list boost (list boost
capnproto capnproto

34
gnu/packages/linux.scm
View File

@ -497,7 +497,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "mainline" kernel. ;; The current "mainline" kernel.
(define-public linux-libre-6.7-version "6.7.5") (define-public linux-libre-6.7-version "6.7.6")
(define-public linux-libre-6.7-gnu-revision "gnu") (define-public linux-libre-6.7-gnu-revision "gnu")
(define deblob-scripts-6.7 (define deblob-scripts-6.7
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -507,7 +507,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "1vb2pd0wdfl9p5qi8hj1i5xg1p4pyrp01iqhap9xbb2yai4l80j5"))) (base32 "1vb2pd0wdfl9p5qi8hj1i5xg1p4pyrp01iqhap9xbb2yai4l80j5")))
(define-public linux-libre-6.7-pristine-source (define-public linux-libre-6.7-pristine-source
(let ((version linux-libre-6.7-version) (let ((version linux-libre-6.7-version)
(hash (base32 "1zrralagnv9yr8qdg7lc05735691dbh92mgwfyxrq5xqc504dxi9"))) (hash (base32 "1lrp7pwnxnqyy8c2l4n4nz997039gbnssrfm8ss8kl3h2c7fr2g4")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-6.7))) deblob-scripts-6.7)))
@ -515,7 +515,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernels. That is, the most recently released major ;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream. ;; versions that are still supported upstream.
(define-public linux-libre-6.6-version "6.6.17") (define-public linux-libre-6.6-version "6.6.18")
(define-public linux-libre-6.6-gnu-revision "gnu") (define-public linux-libre-6.6-gnu-revision "gnu")
(define deblob-scripts-6.6 (define deblob-scripts-6.6
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -525,7 +525,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0kavbby960k7wg355p3hjb9v1c4gnk8dv3lkfhpz44ayhv7kihg5"))) (base32 "0kavbby960k7wg355p3hjb9v1c4gnk8dv3lkfhpz44ayhv7kihg5")))
(define-public linux-libre-6.6-pristine-source (define-public linux-libre-6.6-pristine-source
(let ((version linux-libre-6.6-version) (let ((version linux-libre-6.6-version)
(hash (base32 "0si20m9ckir826jg40bh7sh4kwlp610rnc3gwsgs4nm7dfcm0xpf"))) (hash (base32 "07cv97l5jiakmmv35n0ganvqfr0590b02f3qb617qkx1zg2xhhsf")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-6.6))) deblob-scripts-6.6)))
@ -533,22 +533,22 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The "longterm" kernels — the older releases with long-term upstream support. ;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines: ;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html> ;; <https://www.kernel.org/category/releases.html>
(define-public linux-libre-6.1-version "6.1.78") (define-public linux-libre-6.1-version "6.1.79")
(define-public linux-libre-6.1-gnu-revision "gnu") (define-public linux-libre-6.1-gnu-revision "gnu")
(define deblob-scripts-6.1 (define deblob-scripts-6.1
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
linux-libre-6.1-version linux-libre-6.1-version
linux-libre-6.1-gnu-revision linux-libre-6.1-gnu-revision
(base32 "1sf80f2i4vf888xjcn84ymn4w5ynn30ib9033zwmv7f09yvfhapy") (base32 "1sf80f2i4vf888xjcn84ymn4w5ynn30ib9033zwmv7f09yvfhapy")
(base32 "1jg2v1nxd6i5x536vmd1l14xhpzrcimpmjfipb1zkrwil102y25f"))) (base32 "0vghx43lf7madaihsm279qnw8fsmgwq6p7r39r2m645mvap8mjxw")))
(define-public linux-libre-6.1-pristine-source (define-public linux-libre-6.1-pristine-source
(let ((version linux-libre-6.1-version) (let ((version linux-libre-6.1-version)
(hash (base32 "12fn23m2xwdlv6gr1s8872lk8mvigqkblvlhr54nh8rik2b6n835"))) (hash (base32 "16xkd0hcslqlcf55d4ivzhf1fkhfs5yy0m9arbax8pmm5yi9r97s")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-6.1))) deblob-scripts-6.1)))
(define-public linux-libre-5.15-version "5.15.148") (define-public linux-libre-5.15-version "5.15.149")
(define-public linux-libre-5.15-gnu-revision "gnu") (define-public linux-libre-5.15-gnu-revision "gnu")
(define deblob-scripts-5.15 (define deblob-scripts-5.15
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -558,12 +558,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "14pw0yl0yxdgcdp01rpi91ylil9irwzxfq04kfvn3gg2abaq37bn"))) (base32 "14pw0yl0yxdgcdp01rpi91ylil9irwzxfq04kfvn3gg2abaq37bn")))
(define-public linux-libre-5.15-pristine-source (define-public linux-libre-5.15-pristine-source
(let ((version linux-libre-5.15-version) (let ((version linux-libre-5.15-version)
(hash (base32 "1n75lrck581mppx84cds1a1l5vj05cdkp8ahpry7dx6rgz4pb1f4"))) (hash (base32 "1c01fnaghj55mkgsgddznq1zq4mswsa05rz00kmh1d3y6sd8115x")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.15))) deblob-scripts-5.15)))
(define-public linux-libre-5.10-version "5.10.209") (define-public linux-libre-5.10-version "5.10.210")
(define-public linux-libre-5.10-gnu-revision "gnu1") (define-public linux-libre-5.10-gnu-revision "gnu1")
(define deblob-scripts-5.10 (define deblob-scripts-5.10
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -573,12 +573,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "12csh2zyjrqzgqcv799gv8h4xaw1irxh2zqddn4jqp5p7psx4j5k"))) (base32 "12csh2zyjrqzgqcv799gv8h4xaw1irxh2zqddn4jqp5p7psx4j5k")))
(define-public linux-libre-5.10-pristine-source (define-public linux-libre-5.10-pristine-source
(let ((version linux-libre-5.10-version) (let ((version linux-libre-5.10-version)
(hash (base32 "1mc8rssk5aypgb58jz6i2bbflfr6qh1kgqpam0k8fqvwcjnjzqj4"))) (hash (base32 "0vggj3a71awc1w803cdzrnkn88rxr7l1xh9mmdcw9hzxj1d3r9jf")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.10))) deblob-scripts-5.10)))
(define-public linux-libre-5.4-version "5.4.268") (define-public linux-libre-5.4-version "5.4.269")
(define-public linux-libre-5.4-gnu-revision "gnu1") (define-public linux-libre-5.4-gnu-revision "gnu1")
(define deblob-scripts-5.4 (define deblob-scripts-5.4
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -588,12 +588,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0x0xg0fcykpd117x3q0gim8jilhx922ashhckjvafxv2gk2zzjhj"))) (base32 "0x0xg0fcykpd117x3q0gim8jilhx922ashhckjvafxv2gk2zzjhj")))
(define-public linux-libre-5.4-pristine-source (define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version) (let ((version linux-libre-5.4-version)
(hash (base32 "081695lgkdwlrp6gpp6pyflgh76zax1w52shys4s9zjnrfkarj5g"))) (hash (base32 "1kqqm4hpif3jy2ycnb0dfjgzyn18vqhm1i5q7d7rkisks33bwm7z")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-5.4))) deblob-scripts-5.4)))
(define-public linux-libre-4.19-version "4.19.306") (define-public linux-libre-4.19-version "4.19.307")
(define-public linux-libre-4.19-gnu-revision "gnu1") (define-public linux-libre-4.19-gnu-revision "gnu1")
(define deblob-scripts-4.19 (define deblob-scripts-4.19
(linux-libre-deblob-scripts (linux-libre-deblob-scripts
@ -603,7 +603,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(base32 "0fgkp3v7qgqpn7l1987xcwwlrmwsbscqnxfv06p8nkavrhymrv3c"))) (base32 "0fgkp3v7qgqpn7l1987xcwwlrmwsbscqnxfv06p8nkavrhymrv3c")))
(define-public linux-libre-4.19-pristine-source (define-public linux-libre-4.19-pristine-source
(let ((version linux-libre-4.19-version) (let ((version linux-libre-4.19-version)
(hash (base32 "06dy270xw4frnrc9p2qjh8chgp02fr5ll5g2b0lx9xqzlq7y86xr"))) (hash (base32 "0lp3fc7sqy48vpcl2g0n1bz7i1hp9k0nlz3i1xfh9l056ihzzvl3")))
(make-linux-libre-source version (make-linux-libre-source version
(%upstream-linux-source version hash) (%upstream-linux-source version hash)
deblob-scripts-4.19))) deblob-scripts-4.19)))
@ -9444,7 +9444,7 @@ types and interfaces and translates so that the X server can use them.")
(define-public pipewire (define-public pipewire
(package (package
(name "pipewire") (name "pipewire")
(version "1.0.0") (version "1.0.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -9453,7 +9453,7 @@ types and interfaces and translates so that the X server can use them.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0a8wvsnbgqanp2vjdpkaxpny0k17hz720rd20zdi00s9xjbcrycr")))) "10psfk260pqgi375d5q80yyzy2a1jabs3cgvrd0w18sdwi1knp21"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list

4
gnu/packages/lisp-xyz.scm
View File

@ -3487,7 +3487,7 @@ also be supported.")
(define-public sbcl-ironclad (define-public sbcl-ironclad
(package (package
(name "sbcl-ironclad") (name "sbcl-ironclad")
(version "0.59") (version "0.60")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3495,7 +3495,7 @@ also be supported.")
(url "https://github.com/sharplispers/ironclad/") (url "https://github.com/sharplispers/ironclad/")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "02abwy59v9hfdl2ya4h6l2hc1xrnvqlxzg9vlk87wmi92azpa8v9")) (base32 "122ldxiddkscb3li5wjrppr7vyn77znyjfgs8pbflrskzyxlabdd"))
(file-name (git-file-name "cl-ironclad" version)))) (file-name (git-file-name "cl-ironclad" version))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(native-inputs (native-inputs

12
gnu/packages/mail.scm
View File

@ -8,7 +8,7 @@
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 Al McElrath <hello@yrns.org> ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari <leo@famulari.name>
@ -4217,7 +4217,15 @@ related tools to process winmail.dat files.")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1hfbngwdavdhw5ghnadmi0djg2yrr0wrkv15jdd9wcqh9h6mxy8z")))) (base32 "1hfbngwdavdhw5ghnadmi0djg2yrr0wrkv15jdd9wcqh9h6mxy8z"))
(snippet
#~(begin (use-modules (guix build utils))
;; Don't try to redefine loff_t.
(substitute* "utils.c"
(("typedef off_t loff_t;")
(string-append "#ifdef __APPLE__\n"
"typedef off_t loff_t;\n"
"#endif\n")))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list libgit2)) (list libgit2))

16
gnu/packages/maths.scm
View File

@ -1286,7 +1286,7 @@ in the terminal or with an external viewer.")
(define-public giza (define-public giza
(package (package
(name "giza") (name "giza")
(version "1.3.2") (version "1.4.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1294,7 +1294,7 @@ in the terminal or with an external viewer.")
(url "https://github.com/danieljprice/giza") (url "https://github.com/danieljprice/giza")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "1clklh3nzgwrwg80h3k5x65gdymbvcc84c44nql7m4bv9b8rqfsq")) (base32 "17h8hkhcqlvgryyp5n206fbqpals2vbnjy4f6f1zwj9jiblgi5mj"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -3488,8 +3488,20 @@ September 2004}")
'("configure.log" "make.log" "gmake.log" '("configure.log" "make.log" "gmake.log"
"test.log" "error.log" "RDict.db" "test.log" "error.log" "RDict.db"
"PETScBuildInternal.cmake" "PETScBuildInternal.cmake"
"configure-hash"
;; Once installed, should uninstall with Guix ;; Once installed, should uninstall with Guix
"uninstall.py"))))) "uninstall.py")))))
(add-after 'clean-install 'clear-reference-to-compiler
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Do not retain a reference to GCC and other build only inputs.
(let ((out (assoc-ref outputs "out")))
(substitute* (string-append out "/lib/petsc/conf/petscvariables")
(("([[:graph:]]+)/bin/gcc") "gcc")
(("([[:graph:]]+)/bin/g\\+\\+") "g++")
(("([[:graph:]]+)/bin/make") "make")
(("([[:graph:]]+)/bin/diff") "diff")
(("([[:graph:]]+)/bin/sed") "sed")
(("([[:graph:]]+)/bin/gfortran") "gfortran")))))
(add-after 'install 'move-examples (add-after 'install 'move-examples
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))

4
gnu/packages/parallel.scm
View File

@ -64,14 +64,14 @@
(define-public parallel (define-public parallel
(package (package
(name "parallel") (name "parallel")
(version "20240122") (version "20240222")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/parallel/parallel-" (uri (string-append "mirror://gnu/parallel/parallel-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 "17s4bdywswgrib6zzj2wcmzf792aw85rcavbn6vdf734np5qi5l5")) (base32 "0ml5xicx4lwg2irhl38pdysmq1rmgxcn3m7pjci653r3grm9p87b"))
(snippet (snippet
'(begin '(begin
(use-modules (guix build utils)) (use-modules (guix build utils))

77
gnu/packages/password-utils.scm
View File

@ -24,7 +24,7 @@
;;; Copyright © 2018, 2019, 2020 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018, 2019, 2020 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk> ;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
;;; Copyright © 2019,2022 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2019,2022 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020, 2024 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Jean-Baptiste Note <jean-baptiste.note@m4x.org> ;;; Copyright © 2020 Jean-Baptiste Note <jean-baptiste.note@m4x.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
@ -39,6 +39,7 @@
;;; Copyright © 2022 ( <paren@disroot.org> ;;; Copyright © 2022 ( <paren@disroot.org>
;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Christian Miller <christian.miller@dadoes.de>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1460,20 +1461,19 @@ HTTP.")
(define-public bruteforce-luks (define-public bruteforce-luks
(package (package
(name "bruteforce-luks") (name "bruteforce-luks")
(version "1.4.0") (version "1.4.1")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/glv2/bruteforce-luks/releases/download/" (uri (git-reference
version (url "https://github.com/glv2/bruteforce-luks")
"/bruteforce-luks-" (commit version)))
version (file-name (git-file-name name version))
".tar.lz"))
(sha256 (sha256
(base32 "0yawrlbbklhmvwr99wm7li3r0d5kxvpkwf33a12rji7z0ya5p340")))) (base32 "1fhvm7ykqv2anny6zavd4iwh6gq5rp1r27p3zhn78sd3y34xhkmp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list lzip)) (list autoconf automake))
(inputs (inputs
(list cryptsetup)) (list cryptsetup))
(synopsis "LUKS encrypted volume cracker") (synopsis "LUKS encrypted volume cracker")
@ -1484,6 +1484,32 @@ try every password contained in a file.")
(home-page "https://github.com/glv2/bruteforce-luks") (home-page "https://github.com/glv2/bruteforce-luks")
(license license:gpl3+))) (license license:gpl3+)))
(define-public bruteforce-salted-openssl
(package
(name "bruteforce-salted-openssl")
(version "1.5.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/glv2/bruteforce-salted-openssl")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "00w1szj04jb63rh7sq1spc50013jgmz2nwm8k552i9ir8h4phw45"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake))
(inputs
(list openssl))
(synopsis "Bruteforce cracker for openssl encrypted files")
(description
"This is a cracker for openssl encrypted files. It can be used either in
exhaustive mode to try every password given a charset or in dictionary mode to
try every password contained in a file.")
(home-page "https://github.com/glv2/bruteforce-salted-openssl")
(license license:gpl3+)))
(define-public makepasswd (define-public makepasswd
(let ((commit "3545d57d3a589a392d7eb0df36a5286785345c9e") (let ((commit "3545d57d3a589a392d7eb0df36a5286785345c9e")
(revision "1")) (revision "1"))
@ -1562,6 +1588,37 @@ therefore you don't need to manage more key or secret. Moreover, you can ask
pass-tomb to automatically close your store after a given time.") pass-tomb to automatically close your store after a given time.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public pass-coffin
(package
(name "pass-coffin")
(version "1.2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ayushnix/pass-coffin")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1486ikwsdjsj74qf949vk47r8mfp2mbbdc3scs8786nnnkhzc89n"))))
(build-system gnu-build-system)
(arguments
(list
#:tests? #f ;No tests
#:make-flags #~(list (string-append "PREFIX="
#$output)
(string-append "BASHCOMPDIR="
#$output "/etc/bash_completion.d"))
#:phases #~(modify-phases %standard-phases
(delete 'configure))))
(inputs (list password-store tar))
(home-page "https://github.com/ayushnix/pass-coffin")
(synopsis "Pass extension to keep the tree of passwords encrypted")
(description
"Pass-coffin is a pass extension that hides the password store
data inside a GPG encrypted file, which we'll call a coffin.")
(license license:gpl3)))
(define-public xkcdpass (define-public xkcdpass
(package (package
(name "xkcdpass") (name "xkcdpass")

57
gnu/packages/patches/bind-re-add-attr-constructor-priority.patch
View File

@ -1,57 +0,0 @@
From 6361de07a35f2e9dc1d7201d6b26ca31da93ee69 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 9 Dec 2021 01:07:32 +0100
Subject: [PATCH] Revert "Remove priority from attribute
constructor/destructor"
This reverts commit 0340df46ec5897636dd071bc8b5c4272cfa7d7be. It works
around an irrelevant operating system and breaks compilation on Guix:
mem.c:873: fatal error: RUNTIME_CHECK(((pthread_mutex_lock(((&contextslock))) == 0) ? 0 : 34) == 0) failed
/gnu/store/…-bash-minimal-5.0.16/bin/bash: line 1: 13768 Aborted ./${fuzzer}
Let's simply revert it for now---there are securities at stake!
---
lib/isc/include/isc/util.h | 8 ++++----
lib/isc/lib.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index f0f7f85fa4..64c26587ac 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -49,11 +49,11 @@
#endif /* __GNUC__ */
#if HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR && HAVE_FUNC_ATTRIBUTE_DESTRUCTOR
-#define ISC_CONSTRUCTOR __attribute__((constructor))
-#define ISC_DESTRUCTOR __attribute__((destructor))
+#define ISC_CONSTRUCTOR(priority) __attribute__((constructor(priority)))
+#define ISC_DESTRUCTOR(priority) __attribute__((destructor(priority)))
#elif WIN32
-#define ISC_CONSTRUCTOR
-#define ISC_DESTRUCTOR
+#define ISC_CONSTRUCTOR(priority)
+#define ISC_DESTRUCTOR(priority)
#endif
/*%
diff --git a/lib/isc/lib.c b/lib/isc/lib.c
index f3576b2659..2a167fec21 100644
--- a/lib/isc/lib.c
+++ b/lib/isc/lib.c
@@ -35,9 +35,9 @@ isc_lib_register(void) {
}
void
-isc__initialize(void) ISC_CONSTRUCTOR;
+isc__initialize(void) ISC_CONSTRUCTOR(101);
void
-isc__shutdown(void) ISC_DESTRUCTOR;
+isc__shutdown(void) ISC_DESTRUCTOR(101);
void
isc__initialize(void) {
--
2.34.0

78
gnu/packages/patches/guile-git-adjust-for-libgit2-1.2.0.patch
View File

@ -1,78 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 107e6ca..20e9019 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,7 @@ dnl Guile-Git --- GNU Guile bindings of libgit2
dnl Copyright © 2016-2018 Erik Edrosa <erik.edrosa@gmail.com>
dnl Copyright © 2017, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
dnl Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
+dnl Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
dnl
dnl This file is part of Guile-Git.
dnl
@@ -43,15 +44,20 @@ AS_IF([test "x$LIBGIT2_LIBDIR" = "x"], [
])
AC_SUBST([LIBGIT2_LIBDIR])
+dnl Does the 'git_remote_callbacks' struct have a 'remote_ready' field?
+dnl It was added in 1.2.0, obsoleting 'resolve_url'.
+AC_CHECK_MEMBER([git_remote_callbacks.remote_ready],
+ [HAVE_REMOTE_CALLBACKS_REMOTE_READY="#true"],
+ [HAVE_REMOTE_CALLBACKS_REMOTE_READY="#false"],
+ [[#include <git2.h>]])
+AC_SUBST([HAVE_REMOTE_CALLBACKS_REMOTE_READY])
+
dnl Does the 'git_remote_callbacks' struct have a 'resolve_url' field?
dnl It's missing in libgit2 0.28.5, added in 1.0.
-AC_CHECK_MEMBER([git_remote_callbacks.resolve_url], [], [],
+AC_CHECK_MEMBER([git_remote_callbacks.resolve_url],
+ [HAVE_REMOTE_CALLBACKS_RESOLVE_URL="#true"],
+ [HAVE_REMOTE_CALLBACKS_RESOLVE_URL="#false"],
[[#include <git2.h>]])
-if test "x$ac_cv_member_git_remote_callbacks_resolve_url" = "xyes"; then
- HAVE_REMOTE_CALLBACKS_RESOLVE_URL="#true"
-else
- HAVE_REMOTE_CALLBACKS_RESOLVE_URL="#false"
-fi
AC_SUBST([HAVE_REMOTE_CALLBACKS_RESOLVE_URL])
dnl Those binaries are required for ssh authentication tests.
diff --git a/git/configuration.scm.in b/git/configuration.scm.in
index c45f698..64c4360 100644
--- a/git/configuration.scm.in
+++ b/git/configuration.scm.in
@@ -19,11 +19,17 @@
(define-module (git configuration)
#:export (%libgit2
+ %have-remote-callbacks-remote-ready?
%have-remote-callbacks-resolve-url?))
(define %libgit2
"@LIBGIT2_LIBDIR@/libgit2")
+(define %have-remote-callbacks-remote-ready?
+ ;; True if the 'git_remote_callbacks' struct has a
+ ;; 'remote_ready' field.
+ @HAVE_REMOTE_CALLBACKS_REMOTE_READY@)
+
(define %have-remote-callbacks-resolve-url?
;; True if the 'git_remote_callbacks' struct has a 'resolve_url' field.
@HAVE_REMOTE_CALLBACKS_RESOLVE_URL@)
diff --git a/git/structs.scm b/git/structs.scm
index ca51728..be3d050 100644
--- a/git/structs.scm
+++ b/git/structs.scm
@@ -637,6 +637,12 @@ type to 'specified for this to take effect."
(push-update-reference ,(bs:pointer uint8))
(push-negotiation ,(bs:pointer uint8))
(transport ,(bs:pointer uint8))
+
+ ;; Added in libgit2 1.2.0.
+ ,@(if %have-remote-callbacks-remote-ready?
+ `((remote-ready ,(bs:pointer uint8)))
+ '())
+
(payload ,(bs:pointer uint8))
;; libgit2 1.0 added this field, which is missing from 0.28.5,

20
gnu/packages/patches/i3status-rust-enable-unstable-features.patch
View File

@ -1,20 +0,0 @@
From 3006390c0058f06c255d9850327163aebcdc3b40 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 11 Oct 2021 22:35:39 +0200
Subject: [PATCH] Enable unstable features.
diff --git a/src/main.rs b/src/main.rs
index d9e964b..820e22e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,6 @@
+#![feature(bool_to_option)]
+#![feature(clamp)]
+
#[macro_use]
mod de;
#[macro_use]
--
2.33.0

41
gnu/packages/patches/librime-fix-build-with-gcc10.patch
View File

@ -1,41 +0,0 @@
From: Felix Gruber <felgru@posteo.net>
Date: Mon, 6 Sep 2021 19:38:17 +0200
Subject: [PATCH] Add missing <cmath> includes
Fix a build failure with GCC 10 that manifests like this:
------
/tmp/guix-build-librime-1.7.3.drv-0/source/src/rime/gear/script_translator.cc: In member function ‘void rime::ScriptTranslation::PrepareCandidate()’:
/tmp/guix-build-librime-1.7.3.drv-0/source/src/rime/gear/script_translator.cc:490:23: error: ‘exp’ was not declared in this scope
490 | cand->set_quality(exp(entry->weight) +
| ^~~
/tmp/guix-build-librime-1.7.3.drv-0/source/src/rime/gear/script_translator.cc:504:23: error: ‘exp’ was not declared in this scope
504 | cand->set_quality(exp(entry->weight) +
| ^~~
make[2]: *** [src/CMakeFiles/rime.dir/build.make:1241: src/CMakeFiles/rime.dir/rime/gear/script_translator.cc.o] Error 1
------
diff --git a/src/rime/gear/script_translator.cc b/src/rime/gear/script_translator.cc
index 4a45f05..515c8db 100644
--- a/src/rime/gear/script_translator.cc
+++ b/src/rime/gear/script_translator.cc
@@ -7,6 +7,7 @@
// 2011-07-10 GONG Chen <chen.sst@gmail.com>
//
#include <algorithm>
+#include <cmath>
#include <stack>
#include <boost/algorithm/string/join.hpp>
#include <boost/range/adaptor/reversed.hpp>
diff --git a/src/rime/gear/table_translator.cc b/src/rime/gear/table_translator.cc
index 162ac02..dbea76a 100644
--- a/src/rime/gear/table_translator.cc
+++ b/src/rime/gear/table_translator.cc
@@ -4,6 +4,7 @@
//
// 2011-07-10 GONG Chen <chen.sst@gmail.com>
//
+#include <cmath>
#include <boost/algorithm/string.hpp>
#include <boost/range/adaptor/reversed.hpp>
#include <utf8.h>

20
gnu/packages/patches/maturin-no-cross-compile.patch
View File

@ -2,27 +2,27 @@ Remove dependencies on xwin and zig. We're not offering cross-compilation
options using these crates. options using these crates.
diff --git a/Cargo.toml b/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml
index 6cbdca3..22ea5ef 100644 index 6704e46..ff126a9 100644
--- a/Cargo.toml --- a/Cargo.toml
+++ b/Cargo.toml +++ b/Cargo.toml
@@ -76,16 +76,6 @@ version = "0.1.4" @@ -83,16 +83,6 @@ version = "0.1.16"
[dependencies.cargo-options] [dependencies.cargo-options]
version = "0.6.0" version = "0.7.2"
-[dependencies.cargo-xwin] -[dependencies.cargo-xwin]
-version = "0.14.3" -version = "0.16.2"
-optional = true -optional = true
-default-features = false -default-features = false
- -
-[dependencies.cargo-zigbuild] -[dependencies.cargo-zigbuild]
-version = "0.16.10" -version = "0.18.0"
-optional = true -optional = true
-default-features = false -default-features = false
- -
[dependencies.cargo_metadata] [dependencies.cargo_metadata]
version = "0.15.3" version = "0.18.0"
@@ -310,8 +300,6 @@ version = "4.3.0" @@ -321,8 +311,6 @@ version = "5.0.0"
[features] [features]
cli-completion = ["dep:clap_complete_command"] cli-completion = ["dep:clap_complete_command"]
cross-compile = [ cross-compile = [
@ -31,7 +31,7 @@ index 6cbdca3..22ea5ef 100644
] ]
default = [ default = [
"full", "full",
@@ -330,7 +318,6 @@ log = ["tracing-subscriber"] @@ -341,7 +329,6 @@ log = ["tracing-subscriber"]
native-tls = [ native-tls = [
"dep:native-tls", "dep:native-tls",
"ureq?/native-tls", "ureq?/native-tls",
@ -39,7 +39,7 @@ index 6cbdca3..22ea5ef 100644
"dep:rustls-pemfile", "dep:rustls-pemfile",
] ]
password-storage = [ password-storage = [
@@ -340,7 +327,6 @@ password-storage = [ @@ -351,7 +338,6 @@ password-storage = [
rustls = [ rustls = [
"dep:rustls", "dep:rustls",
"ureq?/tls", "ureq?/tls",
@ -47,7 +47,7 @@ index 6cbdca3..22ea5ef 100644
"dep:rustls-pemfile", "dep:rustls-pemfile",
] ]
scaffolding = [ scaffolding = [
@@ -358,5 +344,3 @@ upload = [ @@ -369,5 +355,3 @@ upload = [
"wild", "wild",
"dep:dirs", "dep:dirs",
] ]

19
gnu/packages/patches/python-telingo-fix-comparison.patch
View File

@ -1,19 +0,0 @@
Index: source/telingo/transformers/head.py
===================================================================
--- source.orig/telingo/transformers/head.py
+++ source/telingo/transformers/head.py
@@ -564,10 +564,12 @@ class HeadTransformer:
cond = []
diff = _ast.BinaryOperation(loc, _ast.BinaryOperator.Minus, param, shift)
if lhs.ast_type != _ast.ASTType.SymbolicTerm or lhs.symbol.type != _clingo.SymbolType.Number or lhs.symbol.number > 0:
- cond.append(_ast.Literal(loc, _ast.Sign.NoSign, _ast.Comparison(_ast.ComparisonOperator.LessEqual, lhs, diff)))
+ cond.append(_ast.Literal(loc, _ast.Sign.NoSign,
+ _ast.Comparison(lhs, [_ast.Guard(_ast.ComparisonOperator.LessEqual, diff)])))
if rhs.ast_type != _ast.ASTType.SymbolicTerm or rhs.symbol.type != _clingo.SymbolType.Supremum:
- cond.append(_ast.Literal(loc, _ast.Sign.NoSign, _ast.Comparison(_ast.ComparisonOperator.LessEqual, diff, rhs)))
+ cond.append(_ast.Literal(loc, _ast.Sign.NoSign,
+ _ast.Comparison(diff, [_ast.Guard(_ast.ComparisonOperator.LessEqual, rhs)])))
elems.extend([_ast.ConditionalLiteral(loc, _ast.Literal(loc, _ast.Sign.NoSign, head), cond) for head in heads])

33
gnu/packages/patches/rust-cargo-edit-remove-ureq.patch 100644
View File

@ -0,0 +1,33 @@
This is modeled after the upstream commit which removes ureq as a dependency.
diff --git a/Cargo.toml b/Cargo.toml
index 5a787e1..27171c7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -201,26 +201,3 @@ test-external-apis = []
upgrade = ["cli"]
vendored-libgit2 = ["git2/vendored-libgit2"]
vendored-openssl = ["git2/vendored-openssl"]
-
-[target."cfg(any(target_arch = \"x86_64\", target_arch = \"arm\", target_arch = \"x86\", target_arch = \"aarch64\"))".dependencies.ureq]
-version = "2.7.1"
-features = [
- "tls",
- "json",
- "socks",
- "socks-proxy",
-]
-default-features = false
-
-[target."cfg(not(any(target_arch = \"x86_64\", target_arch = \"arm\", target_arch = \"x86\", target_arch = \"aarch64\")))".dependencies.native-tls]
-version = "^0.2"
-
-[target."cfg(not(any(target_arch = \"x86_64\", target_arch = \"arm\", target_arch = \"x86\", target_arch = \"aarch64\")))".dependencies.ureq]
-version = "2.7.1"
-features = [
- "native-tls",
- "json",
- "socks",
- "socks-proxy",
-]
-default-features = false

2293
gnu/packages/patches/rust-ring-0.16-missing-files.patch
View File

File diff suppressed because it is too large Load Diff

54
gnu/packages/patches/rust-ring-0.16-test-files.patch
View File

@ -1,54 +0,0 @@
This file exists in the upstream repository at the commit which
corresponds to the ring-0.16.20 release, but was excluded from the
release tarball.
---
tests/ed25519_verify_tests.txt | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 tests/ed25519_verify_tests.txt
diff --git a/tests/ed25519_verify_tests.txt b/tests/ed25519_verify_tests.txt
new file mode 100644
index 0000000..74c94b3
--- /dev/null
+++ b/tests/ed25519_verify_tests.txt
@@ -0,0 +1,34 @@
+# BoringSSL TEST(Ed25519Test Malleability)
+
+# Control; S is in range.
+MESSAGE = 54657374
+SIG = 7c38e026f29e14aabd059a0f2db8b0cd783040609a8be684db12f82a27774ab07a9155711ecfaf7f99f277bad0c6ae7e39d4eef676573336a5c51eb6f946b30d
+PUB = 7d4d0e7f6153a69b6242b522abbee685fda4420f8834b108c3bdae369ef549fa
+Result = P
+
+# Same as above, but with the order L added to S so it is out of range.
+# BoringSSL commit 472ba2c2dd52d06a657a63b7fbf02732a6649d21
+MESSAGE = 54657374
+SIG = 7c38e026f29e14aabd059a0f2db8b0cd783040609a8be684db12f82a27774ab067654bce3832c2d76f8f6f5dafc08d9339d4eef676573336a5c51eb6f946b31d
+PUB = 7d4d0e7f6153a69b6242b522abbee685fda4420f8834b108c3bdae369ef549fa
+Result = F
+
+
+# BoringSSL commit 3094902fcdc2db2cc832fa854b9a6a8be383926c
+MESSAGE = 124e583f8b8eca58bb29c271b41d36986bbc45541f8e51f9cb0133eca447601e
+SIG = dac119d6ca87fc59ae611c157048f4d4fc932a149dbe20ec6effd1436abf83ea05c7df0fef06147241259113909bc71bd3c53ba4464ffcad3c0968f2ffffff0f
+PUB = 100fdf47fb94f1536a4f7c3fda27383fa03375a8f527c537e6f1703c47f94f86
+Result = P
+
+# Control. Same key as above; same message and signature as below, except S is in range.
+PUB = 100fdf47fb94f1536a4f7c3fda27383fa03375a8f527c537e6f1703c47f94f86
+MESSAGE = 6a0bc2b0057cedfc0fa2e3f7f7d39279b30f454a69dfd1117c758d86b19d85e0
+SIG = 0971f86d2c9c78582524a103cb9cf949522ae528f8054dc20107d999be673ff4f58ac9d20ec563133cabc6230b1db8625f8446639ede46ad4df4053000000000
+Result = P
+
+# Same key as above, but S is out of range.
+# BoringSSL commit 472ba2c2dd52d06a657a63b7fbf02732a6649d21
+PUB = 100fdf47fb94f1536a4f7c3fda27383fa03375a8f527c537e6f1703c47f94f86
+MESSAGE = 6a0bc2b0057cedfc0fa2e3f7f7d39279b30f454a69dfd1117c758d86b19d85e0
+SIG = 0971f86d2c9c78582524a103cb9cf949522ae528f8054dc20107d999be673ff4e25ebf2f2928766b1248bec6e91697775f8446639ede46ad4df4053000000010
+Result = F
--
Efraim Flashner <efraim@flashner.co.il> רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

496
gnu/packages/patches/rust-ring-0.17-ring-core.patch 100644
View File

@ -0,0 +1,496 @@
These two files are needed to finish generating the files for windows
and were generated using 'RING_PREGENERATE_ASM=1 cargo build
--target-dir=target/pregenerate_asm'. Included here so we don't need to
add cargo to the computed-source.
---
.../ring_core_generated/prefix_symbols_asm.h | 236 ++++++++++++++++++
.../prefix_symbols_nasm.inc | 236 ++++++++++++++++++
2 files changed, 472 insertions(+)
create mode 100644 pregenerated/tmp/ring_core_generated/prefix_symbols_asm.h
create mode 100644 pregenerated/tmp/ring_core_generated/prefix_symbols_nasm.inc
diff --git a/pregenerated/tmp/ring_core_generated/prefix_symbols_asm.h b/pregenerated/tmp/ring_core_generated/prefix_symbols_asm.h
new file mode 100644
index 000000000..1cd766400
--- /dev/null
+++ b/pregenerated/tmp/ring_core_generated/prefix_symbols_asm.h
@@ -0,0 +1,236 @@
+
+#ifndef ring_core_generated_PREFIX_SYMBOLS_ASM_H
+#define ring_core_generated_PREFIX_SYMBOLS_ASM_H
+
+#if defined(__APPLE__)
+#define _ecp_nistz256_point_double _p256_point_double
+#define _ecp_nistz256_point_add _p256_point_add
+#define _ecp_nistz256_point_add_affine _p256_point_add_affine
+#define _ecp_nistz256_ord_mul_mont _p256_scalar_mul_mont
+#define _ecp_nistz256_ord_sqr_mont _p256_scalar_sqr_rep_mont
+#define _ecp_nistz256_mul_mont _p256_mul_mont
+#define _ecp_nistz256_sqr_mont _p256_sqr_mont
+#define _CRYPTO_memcmp _ring_core_0_17_7_CRYPTO_memcmp
+#define _CRYPTO_poly1305_finish _ring_core_0_17_7_CRYPTO_poly1305_finish
+#define _CRYPTO_poly1305_finish_neon _ring_core_0_17_7_CRYPTO_poly1305_finish_neon
+#define _CRYPTO_poly1305_init _ring_core_0_17_7_CRYPTO_poly1305_init
+#define _CRYPTO_poly1305_init_neon _ring_core_0_17_7_CRYPTO_poly1305_init_neon
+#define _CRYPTO_poly1305_update _ring_core_0_17_7_CRYPTO_poly1305_update
+#define _CRYPTO_poly1305_update_neon _ring_core_0_17_7_CRYPTO_poly1305_update_neon
+#define _ChaCha20_ctr32 _ring_core_0_17_7_ChaCha20_ctr32
+#define _LIMBS_add_mod _ring_core_0_17_7_LIMBS_add_mod
+#define _LIMBS_are_even _ring_core_0_17_7_LIMBS_are_even
+#define _LIMBS_are_zero _ring_core_0_17_7_LIMBS_are_zero
+#define _LIMBS_equal _ring_core_0_17_7_LIMBS_equal
+#define _LIMBS_equal_limb _ring_core_0_17_7_LIMBS_equal_limb
+#define _LIMBS_less_than _ring_core_0_17_7_LIMBS_less_than
+#define _LIMBS_less_than_limb _ring_core_0_17_7_LIMBS_less_than_limb
+#define _LIMBS_reduce_once _ring_core_0_17_7_LIMBS_reduce_once
+#define _LIMBS_select_512_32 _ring_core_0_17_7_LIMBS_select_512_32
+#define _LIMBS_shl_mod _ring_core_0_17_7_LIMBS_shl_mod
+#define _LIMBS_sub_mod _ring_core_0_17_7_LIMBS_sub_mod
+#define _LIMBS_window5_split_window _ring_core_0_17_7_LIMBS_window5_split_window
+#define _LIMBS_window5_unsplit_window _ring_core_0_17_7_LIMBS_window5_unsplit_window
+#define _LIMB_shr _ring_core_0_17_7_LIMB_shr
+#define _OPENSSL_armcap_P _ring_core_0_17_7_OPENSSL_armcap_P
+#define _OPENSSL_cpuid_setup _ring_core_0_17_7_OPENSSL_cpuid_setup
+#define _OPENSSL_ia32cap_P _ring_core_0_17_7_OPENSSL_ia32cap_P
+#define _aes_hw_ctr32_encrypt_blocks _ring_core_0_17_7_aes_hw_ctr32_encrypt_blocks
+#define _aes_hw_encrypt _ring_core_0_17_7_aes_hw_encrypt
+#define _aes_hw_set_encrypt_key _ring_core_0_17_7_aes_hw_set_encrypt_key
+#define _aes_nohw_ctr32_encrypt_blocks _ring_core_0_17_7_aes_nohw_ctr32_encrypt_blocks
+#define _aes_nohw_encrypt _ring_core_0_17_7_aes_nohw_encrypt
+#define _aes_nohw_set_encrypt_key _ring_core_0_17_7_aes_nohw_set_encrypt_key
+#define _aesni_gcm_decrypt _ring_core_0_17_7_aesni_gcm_decrypt
+#define _aesni_gcm_encrypt _ring_core_0_17_7_aesni_gcm_encrypt
+#define _bn_from_montgomery_in_place _ring_core_0_17_7_bn_from_montgomery_in_place
+#define _bn_gather5 _ring_core_0_17_7_bn_gather5
+#define _bn_mul_mont _ring_core_0_17_7_bn_mul_mont
+#define _bn_mul_mont_gather5 _ring_core_0_17_7_bn_mul_mont_gather5
+#define _bn_neg_inv_mod_r_u64 _ring_core_0_17_7_bn_neg_inv_mod_r_u64
+#define _bn_power5 _ring_core_0_17_7_bn_power5
+#define _bn_scatter5 _ring_core_0_17_7_bn_scatter5
+#define _bn_sqr8x_internal _ring_core_0_17_7_bn_sqr8x_internal
+#define _bn_sqrx8x_internal _ring_core_0_17_7_bn_sqrx8x_internal
+#define _bsaes_ctr32_encrypt_blocks _ring_core_0_17_7_bsaes_ctr32_encrypt_blocks
+#define _bssl_constant_time_test_conditional_memcpy _ring_core_0_17_7_bssl_constant_time_test_conditional_memcpy
+#define _bssl_constant_time_test_conditional_memxor _ring_core_0_17_7_bssl_constant_time_test_conditional_memxor
+#define _bssl_constant_time_test_main _ring_core_0_17_7_bssl_constant_time_test_main
+#define _chacha20_poly1305_open _ring_core_0_17_7_chacha20_poly1305_open
+#define _chacha20_poly1305_seal _ring_core_0_17_7_chacha20_poly1305_seal
+#define _fiat_curve25519_adx_mul _ring_core_0_17_7_fiat_curve25519_adx_mul
+#define _fiat_curve25519_adx_square _ring_core_0_17_7_fiat_curve25519_adx_square
+#define _gcm_ghash_avx _ring_core_0_17_7_gcm_ghash_avx
+#define _gcm_ghash_clmul _ring_core_0_17_7_gcm_ghash_clmul
+#define _gcm_ghash_neon _ring_core_0_17_7_gcm_ghash_neon
+#define _gcm_gmult_clmul _ring_core_0_17_7_gcm_gmult_clmul
+#define _gcm_gmult_neon _ring_core_0_17_7_gcm_gmult_neon
+#define _gcm_init_avx _ring_core_0_17_7_gcm_init_avx
+#define _gcm_init_clmul _ring_core_0_17_7_gcm_init_clmul
+#define _gcm_init_neon _ring_core_0_17_7_gcm_init_neon
+#define _k25519Precomp _ring_core_0_17_7_k25519Precomp
+#define _limbs_mul_add_limb _ring_core_0_17_7_limbs_mul_add_limb
+#define _little_endian_bytes_from_scalar _ring_core_0_17_7_little_endian_bytes_from_scalar
+#define _ecp_nistz256_neg _ring_core_0_17_7_ecp_nistz256_neg
+#define _ecp_nistz256_select_w5 _ring_core_0_17_7_ecp_nistz256_select_w5
+#define _ecp_nistz256_select_w7 _ring_core_0_17_7_ecp_nistz256_select_w7
+#define _p256_mul_mont _ring_core_0_17_7_p256_mul_mont
+#define _p256_point_add _ring_core_0_17_7_p256_point_add
+#define _p256_point_add_affine _ring_core_0_17_7_p256_point_add_affine
+#define _p256_point_double _ring_core_0_17_7_p256_point_double
+#define _p256_point_mul _ring_core_0_17_7_p256_point_mul
+#define _p256_point_mul_base _ring_core_0_17_7_p256_point_mul_base
+#define _p256_point_mul_base_vartime _ring_core_0_17_7_p256_point_mul_base_vartime
+#define _p256_scalar_mul_mont _ring_core_0_17_7_p256_scalar_mul_mont
+#define _p256_scalar_sqr_rep_mont _ring_core_0_17_7_p256_scalar_sqr_rep_mont
+#define _p256_sqr_mont _ring_core_0_17_7_p256_sqr_mont
+#define _p384_elem_div_by_2 _ring_core_0_17_7_p384_elem_div_by_2
+#define _p384_elem_mul_mont _ring_core_0_17_7_p384_elem_mul_mont
+#define _p384_elem_neg _ring_core_0_17_7_p384_elem_neg
+#define _p384_elem_sub _ring_core_0_17_7_p384_elem_sub
+#define _p384_point_add _ring_core_0_17_7_p384_point_add
+#define _p384_point_double _ring_core_0_17_7_p384_point_double
+#define _p384_point_mul _ring_core_0_17_7_p384_point_mul
+#define _p384_scalar_mul_mont _ring_core_0_17_7_p384_scalar_mul_mont
+#define _openssl_poly1305_neon2_addmulmod _ring_core_0_17_7_openssl_poly1305_neon2_addmulmod
+#define _openssl_poly1305_neon2_blocks _ring_core_0_17_7_openssl_poly1305_neon2_blocks
+#define _sha256_block_data_order _ring_core_0_17_7_sha256_block_data_order
+#define _sha512_block_data_order _ring_core_0_17_7_sha512_block_data_order
+#define _vpaes_ctr32_encrypt_blocks _ring_core_0_17_7_vpaes_ctr32_encrypt_blocks
+#define _vpaes_encrypt _ring_core_0_17_7_vpaes_encrypt
+#define _vpaes_encrypt_key_to_bsaes _ring_core_0_17_7_vpaes_encrypt_key_to_bsaes
+#define _vpaes_set_encrypt_key _ring_core_0_17_7_vpaes_set_encrypt_key
+#define _x25519_NEON _ring_core_0_17_7_x25519_NEON
+#define _x25519_fe_invert _ring_core_0_17_7_x25519_fe_invert
+#define _x25519_fe_isnegative _ring_core_0_17_7_x25519_fe_isnegative
+#define _x25519_fe_mul_ttt _ring_core_0_17_7_x25519_fe_mul_ttt
+#define _x25519_fe_neg _ring_core_0_17_7_x25519_fe_neg
+#define _x25519_fe_tobytes _ring_core_0_17_7_x25519_fe_tobytes
+#define _x25519_ge_double_scalarmult_vartime _ring_core_0_17_7_x25519_ge_double_scalarmult_vartime
+#define _x25519_ge_frombytes_vartime _ring_core_0_17_7_x25519_ge_frombytes_vartime
+#define _x25519_ge_scalarmult_base _ring_core_0_17_7_x25519_ge_scalarmult_base
+#define _x25519_ge_scalarmult_base_adx _ring_core_0_17_7_x25519_ge_scalarmult_base_adx
+#define _x25519_public_from_private_generic_masked _ring_core_0_17_7_x25519_public_from_private_generic_masked
+#define _x25519_sc_mask _ring_core_0_17_7_x25519_sc_mask
+#define _x25519_sc_muladd _ring_core_0_17_7_x25519_sc_muladd
+#define _x25519_sc_reduce _ring_core_0_17_7_x25519_sc_reduce
+#define _x25519_scalar_mult_adx _ring_core_0_17_7_x25519_scalar_mult_adx
+#define _x25519_scalar_mult_generic_masked _ring_core_0_17_7_x25519_scalar_mult_generic_masked
+
+#else
+#define ecp_nistz256_point_double p256_point_double
+#define ecp_nistz256_point_add p256_point_add
+#define ecp_nistz256_point_add_affine p256_point_add_affine
+#define ecp_nistz256_ord_mul_mont p256_scalar_mul_mont
+#define ecp_nistz256_ord_sqr_mont p256_scalar_sqr_rep_mont
+#define ecp_nistz256_mul_mont p256_mul_mont
+#define ecp_nistz256_sqr_mont p256_sqr_mont
+#define CRYPTO_memcmp ring_core_0_17_7_CRYPTO_memcmp
+#define CRYPTO_poly1305_finish ring_core_0_17_7_CRYPTO_poly1305_finish
+#define CRYPTO_poly1305_finish_neon ring_core_0_17_7_CRYPTO_poly1305_finish_neon
+#define CRYPTO_poly1305_init ring_core_0_17_7_CRYPTO_poly1305_init
+#define CRYPTO_poly1305_init_neon ring_core_0_17_7_CRYPTO_poly1305_init_neon
+#define CRYPTO_poly1305_update ring_core_0_17_7_CRYPTO_poly1305_update
+#define CRYPTO_poly1305_update_neon ring_core_0_17_7_CRYPTO_poly1305_update_neon
+#define ChaCha20_ctr32 ring_core_0_17_7_ChaCha20_ctr32
+#define LIMBS_add_mod ring_core_0_17_7_LIMBS_add_mod
+#define LIMBS_are_even ring_core_0_17_7_LIMBS_are_even
+#define LIMBS_are_zero ring_core_0_17_7_LIMBS_are_zero
+#define LIMBS_equal ring_core_0_17_7_LIMBS_equal
+#define LIMBS_equal_limb ring_core_0_17_7_LIMBS_equal_limb
+#define LIMBS_less_than ring_core_0_17_7_LIMBS_less_than
+#define LIMBS_less_than_limb ring_core_0_17_7_LIMBS_less_than_limb
+#define LIMBS_reduce_once ring_core_0_17_7_LIMBS_reduce_once
+#define LIMBS_select_512_32 ring_core_0_17_7_LIMBS_select_512_32
+#define LIMBS_shl_mod ring_core_0_17_7_LIMBS_shl_mod
+#define LIMBS_sub_mod ring_core_0_17_7_LIMBS_sub_mod
+#define LIMBS_window5_split_window ring_core_0_17_7_LIMBS_window5_split_window
+#define LIMBS_window5_unsplit_window ring_core_0_17_7_LIMBS_window5_unsplit_window
+#define LIMB_shr ring_core_0_17_7_LIMB_shr
+#define OPENSSL_armcap_P ring_core_0_17_7_OPENSSL_armcap_P
+#define OPENSSL_cpuid_setup ring_core_0_17_7_OPENSSL_cpuid_setup
+#define OPENSSL_ia32cap_P ring_core_0_17_7_OPENSSL_ia32cap_P
+#define aes_hw_ctr32_encrypt_blocks ring_core_0_17_7_aes_hw_ctr32_encrypt_blocks
+#define aes_hw_encrypt ring_core_0_17_7_aes_hw_encrypt
+#define aes_hw_set_encrypt_key ring_core_0_17_7_aes_hw_set_encrypt_key
+#define aes_nohw_ctr32_encrypt_blocks ring_core_0_17_7_aes_nohw_ctr32_encrypt_blocks
+#define aes_nohw_encrypt ring_core_0_17_7_aes_nohw_encrypt
+#define aes_nohw_set_encrypt_key ring_core_0_17_7_aes_nohw_set_encrypt_key
+#define aesni_gcm_decrypt ring_core_0_17_7_aesni_gcm_decrypt
+#define aesni_gcm_encrypt ring_core_0_17_7_aesni_gcm_encrypt
+#define bn_from_montgomery_in_place ring_core_0_17_7_bn_from_montgomery_in_place
+#define bn_gather5 ring_core_0_17_7_bn_gather5
+#define bn_mul_mont ring_core_0_17_7_bn_mul_mont
+#define bn_mul_mont_gather5 ring_core_0_17_7_bn_mul_mont_gather5
+#define bn_neg_inv_mod_r_u64 ring_core_0_17_7_bn_neg_inv_mod_r_u64
+#define bn_power5 ring_core_0_17_7_bn_power5
+#define bn_scatter5 ring_core_0_17_7_bn_scatter5
+#define bn_sqr8x_internal ring_core_0_17_7_bn_sqr8x_internal
+#define bn_sqrx8x_internal ring_core_0_17_7_bn_sqrx8x_internal
+#define bsaes_ctr32_encrypt_blocks ring_core_0_17_7_bsaes_ctr32_encrypt_blocks
+#define bssl_constant_time_test_conditional_memcpy ring_core_0_17_7_bssl_constant_time_test_conditional_memcpy
+#define bssl_constant_time_test_conditional_memxor ring_core_0_17_7_bssl_constant_time_test_conditional_memxor
+#define bssl_constant_time_test_main ring_core_0_17_7_bssl_constant_time_test_main
+#define chacha20_poly1305_open ring_core_0_17_7_chacha20_poly1305_open
+#define chacha20_poly1305_seal ring_core_0_17_7_chacha20_poly1305_seal
+#define fiat_curve25519_adx_mul ring_core_0_17_7_fiat_curve25519_adx_mul
+#define fiat_curve25519_adx_square ring_core_0_17_7_fiat_curve25519_adx_square
+#define gcm_ghash_avx ring_core_0_17_7_gcm_ghash_avx
+#define gcm_ghash_clmul ring_core_0_17_7_gcm_ghash_clmul
+#define gcm_ghash_neon ring_core_0_17_7_gcm_ghash_neon
+#define gcm_gmult_clmul ring_core_0_17_7_gcm_gmult_clmul
+#define gcm_gmult_neon ring_core_0_17_7_gcm_gmult_neon
+#define gcm_init_avx ring_core_0_17_7_gcm_init_avx
+#define gcm_init_clmul ring_core_0_17_7_gcm_init_clmul
+#define gcm_init_neon ring_core_0_17_7_gcm_init_neon
+#define k25519Precomp ring_core_0_17_7_k25519Precomp
+#define limbs_mul_add_limb ring_core_0_17_7_limbs_mul_add_limb
+#define little_endian_bytes_from_scalar ring_core_0_17_7_little_endian_bytes_from_scalar
+#define ecp_nistz256_neg ring_core_0_17_7_ecp_nistz256_neg
+#define ecp_nistz256_select_w5 ring_core_0_17_7_ecp_nistz256_select_w5
+#define ecp_nistz256_select_w7 ring_core_0_17_7_ecp_nistz256_select_w7
+#define p256_mul_mont ring_core_0_17_7_p256_mul_mont
+#define p256_point_add ring_core_0_17_7_p256_point_add
+#define p256_point_add_affine ring_core_0_17_7_p256_point_add_affine
+#define p256_point_double ring_core_0_17_7_p256_point_double
+#define p256_point_mul ring_core_0_17_7_p256_point_mul
+#define p256_point_mul_base ring_core_0_17_7_p256_point_mul_base
+#define p256_point_mul_base_vartime ring_core_0_17_7_p256_point_mul_base_vartime
+#define p256_scalar_mul_mont ring_core_0_17_7_p256_scalar_mul_mont
+#define p256_scalar_sqr_rep_mont ring_core_0_17_7_p256_scalar_sqr_rep_mont
+#define p256_sqr_mont ring_core_0_17_7_p256_sqr_mont
+#define p384_elem_div_by_2 ring_core_0_17_7_p384_elem_div_by_2
+#define p384_elem_mul_mont ring_core_0_17_7_p384_elem_mul_mont
+#define p384_elem_neg ring_core_0_17_7_p384_elem_neg
+#define p384_elem_sub ring_core_0_17_7_p384_elem_sub
+#define p384_point_add ring_core_0_17_7_p384_point_add
+#define p384_point_double ring_core_0_17_7_p384_point_double
+#define p384_point_mul ring_core_0_17_7_p384_point_mul
+#define p384_scalar_mul_mont ring_core_0_17_7_p384_scalar_mul_mont
+#define openssl_poly1305_neon2_addmulmod ring_core_0_17_7_openssl_poly1305_neon2_addmulmod
+#define openssl_poly1305_neon2_blocks ring_core_0_17_7_openssl_poly1305_neon2_blocks
+#define sha256_block_data_order ring_core_0_17_7_sha256_block_data_order
+#define sha512_block_data_order ring_core_0_17_7_sha512_block_data_order
+#define vpaes_ctr32_encrypt_blocks ring_core_0_17_7_vpaes_ctr32_encrypt_blocks
+#define vpaes_encrypt ring_core_0_17_7_vpaes_encrypt
+#define vpaes_encrypt_key_to_bsaes ring_core_0_17_7_vpaes_encrypt_key_to_bsaes
+#define vpaes_set_encrypt_key ring_core_0_17_7_vpaes_set_encrypt_key
+#define x25519_NEON ring_core_0_17_7_x25519_NEON
+#define x25519_fe_invert ring_core_0_17_7_x25519_fe_invert
+#define x25519_fe_isnegative ring_core_0_17_7_x25519_fe_isnegative
+#define x25519_fe_mul_ttt ring_core_0_17_7_x25519_fe_mul_ttt
+#define x25519_fe_neg ring_core_0_17_7_x25519_fe_neg
+#define x25519_fe_tobytes ring_core_0_17_7_x25519_fe_tobytes
+#define x25519_ge_double_scalarmult_vartime ring_core_0_17_7_x25519_ge_double_scalarmult_vartime
+#define x25519_ge_frombytes_vartime ring_core_0_17_7_x25519_ge_frombytes_vartime
+#define x25519_ge_scalarmult_base ring_core_0_17_7_x25519_ge_scalarmult_base
+#define x25519_ge_scalarmult_base_adx ring_core_0_17_7_x25519_ge_scalarmult_base_adx
+#define x25519_public_from_private_generic_masked ring_core_0_17_7_x25519_public_from_private_generic_masked
+#define x25519_sc_mask ring_core_0_17_7_x25519_sc_mask
+#define x25519_sc_muladd ring_core_0_17_7_x25519_sc_muladd
+#define x25519_sc_reduce ring_core_0_17_7_x25519_sc_reduce
+#define x25519_scalar_mult_adx ring_core_0_17_7_x25519_scalar_mult_adx
+#define x25519_scalar_mult_generic_masked ring_core_0_17_7_x25519_scalar_mult_generic_masked
+
+#endif
+#endif
diff --git a/pregenerated/tmp/ring_core_generated/prefix_symbols_nasm.inc b/pregenerated/tmp/ring_core_generated/prefix_symbols_nasm.inc
new file mode 100644
index 000000000..65ce0cfaa
--- /dev/null
+++ b/pregenerated/tmp/ring_core_generated/prefix_symbols_nasm.inc
@@ -0,0 +1,236 @@
+
+%ifndef ring_core_generated_PREFIX_SYMBOLS_NASM_INC
+%define ring_core_generated_PREFIX_SYMBOLS_NASM_INC
+
+%ifidn __OUTPUT_FORMAT__,win32
+%define _ecp_nistz256_point_double _p256_point_double
+%define _ecp_nistz256_point_add _p256_point_add
+%define _ecp_nistz256_point_add_affine _p256_point_add_affine
+%define _ecp_nistz256_ord_mul_mont _p256_scalar_mul_mont
+%define _ecp_nistz256_ord_sqr_mont _p256_scalar_sqr_rep_mont
+%define _ecp_nistz256_mul_mont _p256_mul_mont
+%define _ecp_nistz256_sqr_mont _p256_sqr_mont
+%define _CRYPTO_memcmp _ring_core_0_17_7_CRYPTO_memcmp
+%define _CRYPTO_poly1305_finish _ring_core_0_17_7_CRYPTO_poly1305_finish
+%define _CRYPTO_poly1305_finish_neon _ring_core_0_17_7_CRYPTO_poly1305_finish_neon
+%define _CRYPTO_poly1305_init _ring_core_0_17_7_CRYPTO_poly1305_init
+%define _CRYPTO_poly1305_init_neon _ring_core_0_17_7_CRYPTO_poly1305_init_neon
+%define _CRYPTO_poly1305_update _ring_core_0_17_7_CRYPTO_poly1305_update
+%define _CRYPTO_poly1305_update_neon _ring_core_0_17_7_CRYPTO_poly1305_update_neon
+%define _ChaCha20_ctr32 _ring_core_0_17_7_ChaCha20_ctr32
+%define _LIMBS_add_mod _ring_core_0_17_7_LIMBS_add_mod
+%define _LIMBS_are_even _ring_core_0_17_7_LIMBS_are_even
+%define _LIMBS_are_zero _ring_core_0_17_7_LIMBS_are_zero
+%define _LIMBS_equal _ring_core_0_17_7_LIMBS_equal
+%define _LIMBS_equal_limb _ring_core_0_17_7_LIMBS_equal_limb
+%define _LIMBS_less_than _ring_core_0_17_7_LIMBS_less_than
+%define _LIMBS_less_than_limb _ring_core_0_17_7_LIMBS_less_than_limb
+%define _LIMBS_reduce_once _ring_core_0_17_7_LIMBS_reduce_once
+%define _LIMBS_select_512_32 _ring_core_0_17_7_LIMBS_select_512_32
+%define _LIMBS_shl_mod _ring_core_0_17_7_LIMBS_shl_mod
+%define _LIMBS_sub_mod _ring_core_0_17_7_LIMBS_sub_mod
+%define _LIMBS_window5_split_window _ring_core_0_17_7_LIMBS_window5_split_window
+%define _LIMBS_window5_unsplit_window _ring_core_0_17_7_LIMBS_window5_unsplit_window
+%define _LIMB_shr _ring_core_0_17_7_LIMB_shr
+%define _OPENSSL_armcap_P _ring_core_0_17_7_OPENSSL_armcap_P
+%define _OPENSSL_cpuid_setup _ring_core_0_17_7_OPENSSL_cpuid_setup
+%define _OPENSSL_ia32cap_P _ring_core_0_17_7_OPENSSL_ia32cap_P
+%define _aes_hw_ctr32_encrypt_blocks _ring_core_0_17_7_aes_hw_ctr32_encrypt_blocks
+%define _aes_hw_encrypt _ring_core_0_17_7_aes_hw_encrypt
+%define _aes_hw_set_encrypt_key _ring_core_0_17_7_aes_hw_set_encrypt_key
+%define _aes_nohw_ctr32_encrypt_blocks _ring_core_0_17_7_aes_nohw_ctr32_encrypt_blocks
+%define _aes_nohw_encrypt _ring_core_0_17_7_aes_nohw_encrypt
+%define _aes_nohw_set_encrypt_key _ring_core_0_17_7_aes_nohw_set_encrypt_key
+%define _aesni_gcm_decrypt _ring_core_0_17_7_aesni_gcm_decrypt
+%define _aesni_gcm_encrypt _ring_core_0_17_7_aesni_gcm_encrypt
+%define _bn_from_montgomery_in_place _ring_core_0_17_7_bn_from_montgomery_in_place
+%define _bn_gather5 _ring_core_0_17_7_bn_gather5
+%define _bn_mul_mont _ring_core_0_17_7_bn_mul_mont
+%define _bn_mul_mont_gather5 _ring_core_0_17_7_bn_mul_mont_gather5
+%define _bn_neg_inv_mod_r_u64 _ring_core_0_17_7_bn_neg_inv_mod_r_u64
+%define _bn_power5 _ring_core_0_17_7_bn_power5
+%define _bn_scatter5 _ring_core_0_17_7_bn_scatter5
+%define _bn_sqr8x_internal _ring_core_0_17_7_bn_sqr8x_internal
+%define _bn_sqrx8x_internal _ring_core_0_17_7_bn_sqrx8x_internal
+%define _bsaes_ctr32_encrypt_blocks _ring_core_0_17_7_bsaes_ctr32_encrypt_blocks
+%define _bssl_constant_time_test_conditional_memcpy _ring_core_0_17_7_bssl_constant_time_test_conditional_memcpy
+%define _bssl_constant_time_test_conditional_memxor _ring_core_0_17_7_bssl_constant_time_test_conditional_memxor
+%define _bssl_constant_time_test_main _ring_core_0_17_7_bssl_constant_time_test_main
+%define _chacha20_poly1305_open _ring_core_0_17_7_chacha20_poly1305_open
+%define _chacha20_poly1305_seal _ring_core_0_17_7_chacha20_poly1305_seal
+%define _fiat_curve25519_adx_mul _ring_core_0_17_7_fiat_curve25519_adx_mul
+%define _fiat_curve25519_adx_square _ring_core_0_17_7_fiat_curve25519_adx_square
+%define _gcm_ghash_avx _ring_core_0_17_7_gcm_ghash_avx
+%define _gcm_ghash_clmul _ring_core_0_17_7_gcm_ghash_clmul
+%define _gcm_ghash_neon _ring_core_0_17_7_gcm_ghash_neon
+%define _gcm_gmult_clmul _ring_core_0_17_7_gcm_gmult_clmul
+%define _gcm_gmult_neon _ring_core_0_17_7_gcm_gmult_neon
+%define _gcm_init_avx _ring_core_0_17_7_gcm_init_avx
+%define _gcm_init_clmul _ring_core_0_17_7_gcm_init_clmul
+%define _gcm_init_neon _ring_core_0_17_7_gcm_init_neon
+%define _k25519Precomp _ring_core_0_17_7_k25519Precomp
+%define _limbs_mul_add_limb _ring_core_0_17_7_limbs_mul_add_limb
+%define _little_endian_bytes_from_scalar _ring_core_0_17_7_little_endian_bytes_from_scalar
+%define _ecp_nistz256_neg _ring_core_0_17_7_ecp_nistz256_neg
+%define _ecp_nistz256_select_w5 _ring_core_0_17_7_ecp_nistz256_select_w5
+%define _ecp_nistz256_select_w7 _ring_core_0_17_7_ecp_nistz256_select_w7
+%define _p256_mul_mont _ring_core_0_17_7_p256_mul_mont
+%define _p256_point_add _ring_core_0_17_7_p256_point_add
+%define _p256_point_add_affine _ring_core_0_17_7_p256_point_add_affine
+%define _p256_point_double _ring_core_0_17_7_p256_point_double
+%define _p256_point_mul _ring_core_0_17_7_p256_point_mul
+%define _p256_point_mul_base _ring_core_0_17_7_p256_point_mul_base
+%define _p256_point_mul_base_vartime _ring_core_0_17_7_p256_point_mul_base_vartime
+%define _p256_scalar_mul_mont _ring_core_0_17_7_p256_scalar_mul_mont
+%define _p256_scalar_sqr_rep_mont _ring_core_0_17_7_p256_scalar_sqr_rep_mont
+%define _p256_sqr_mont _ring_core_0_17_7_p256_sqr_mont
+%define _p384_elem_div_by_2 _ring_core_0_17_7_p384_elem_div_by_2
+%define _p384_elem_mul_mont _ring_core_0_17_7_p384_elem_mul_mont
+%define _p384_elem_neg _ring_core_0_17_7_p384_elem_neg
+%define _p384_elem_sub _ring_core_0_17_7_p384_elem_sub
+%define _p384_point_add _ring_core_0_17_7_p384_point_add
+%define _p384_point_double _ring_core_0_17_7_p384_point_double
+%define _p384_point_mul _ring_core_0_17_7_p384_point_mul
+%define _p384_scalar_mul_mont _ring_core_0_17_7_p384_scalar_mul_mont
+%define _openssl_poly1305_neon2_addmulmod _ring_core_0_17_7_openssl_poly1305_neon2_addmulmod
+%define _openssl_poly1305_neon2_blocks _ring_core_0_17_7_openssl_poly1305_neon2_blocks
+%define _sha256_block_data_order _ring_core_0_17_7_sha256_block_data_order
+%define _sha512_block_data_order _ring_core_0_17_7_sha512_block_data_order
+%define _vpaes_ctr32_encrypt_blocks _ring_core_0_17_7_vpaes_ctr32_encrypt_blocks
+%define _vpaes_encrypt _ring_core_0_17_7_vpaes_encrypt
+%define _vpaes_encrypt_key_to_bsaes _ring_core_0_17_7_vpaes_encrypt_key_to_bsaes
+%define _vpaes_set_encrypt_key _ring_core_0_17_7_vpaes_set_encrypt_key
+%define _x25519_NEON _ring_core_0_17_7_x25519_NEON
+%define _x25519_fe_invert _ring_core_0_17_7_x25519_fe_invert
+%define _x25519_fe_isnegative _ring_core_0_17_7_x25519_fe_isnegative
+%define _x25519_fe_mul_ttt _ring_core_0_17_7_x25519_fe_mul_ttt
+%define _x25519_fe_neg _ring_core_0_17_7_x25519_fe_neg
+%define _x25519_fe_tobytes _ring_core_0_17_7_x25519_fe_tobytes
+%define _x25519_ge_double_scalarmult_vartime _ring_core_0_17_7_x25519_ge_double_scalarmult_vartime
+%define _x25519_ge_frombytes_vartime _ring_core_0_17_7_x25519_ge_frombytes_vartime
+%define _x25519_ge_scalarmult_base _ring_core_0_17_7_x25519_ge_scalarmult_base
+%define _x25519_ge_scalarmult_base_adx _ring_core_0_17_7_x25519_ge_scalarmult_base_adx
+%define _x25519_public_from_private_generic_masked _ring_core_0_17_7_x25519_public_from_private_generic_masked
+%define _x25519_sc_mask _ring_core_0_17_7_x25519_sc_mask
+%define _x25519_sc_muladd _ring_core_0_17_7_x25519_sc_muladd
+%define _x25519_sc_reduce _ring_core_0_17_7_x25519_sc_reduce
+%define _x25519_scalar_mult_adx _ring_core_0_17_7_x25519_scalar_mult_adx
+%define _x25519_scalar_mult_generic_masked _ring_core_0_17_7_x25519_scalar_mult_generic_masked
+
+%else
+%define ecp_nistz256_point_double p256_point_double
+%define ecp_nistz256_point_add p256_point_add
+%define ecp_nistz256_point_add_affine p256_point_add_affine
+%define ecp_nistz256_ord_mul_mont p256_scalar_mul_mont
+%define ecp_nistz256_ord_sqr_mont p256_scalar_sqr_rep_mont
+%define ecp_nistz256_mul_mont p256_mul_mont
+%define ecp_nistz256_sqr_mont p256_sqr_mont
+%define CRYPTO_memcmp ring_core_0_17_7_CRYPTO_memcmp
+%define CRYPTO_poly1305_finish ring_core_0_17_7_CRYPTO_poly1305_finish
+%define CRYPTO_poly1305_finish_neon ring_core_0_17_7_CRYPTO_poly1305_finish_neon
+%define CRYPTO_poly1305_init ring_core_0_17_7_CRYPTO_poly1305_init
+%define CRYPTO_poly1305_init_neon ring_core_0_17_7_CRYPTO_poly1305_init_neon
+%define CRYPTO_poly1305_update ring_core_0_17_7_CRYPTO_poly1305_update
+%define CRYPTO_poly1305_update_neon ring_core_0_17_7_CRYPTO_poly1305_update_neon
+%define ChaCha20_ctr32 ring_core_0_17_7_ChaCha20_ctr32
+%define LIMBS_add_mod ring_core_0_17_7_LIMBS_add_mod
+%define LIMBS_are_even ring_core_0_17_7_LIMBS_are_even
+%define LIMBS_are_zero ring_core_0_17_7_LIMBS_are_zero
+%define LIMBS_equal ring_core_0_17_7_LIMBS_equal
+%define LIMBS_equal_limb ring_core_0_17_7_LIMBS_equal_limb
+%define LIMBS_less_than ring_core_0_17_7_LIMBS_less_than
+%define LIMBS_less_than_limb ring_core_0_17_7_LIMBS_less_than_limb
+%define LIMBS_reduce_once ring_core_0_17_7_LIMBS_reduce_once
+%define LIMBS_select_512_32 ring_core_0_17_7_LIMBS_select_512_32
+%define LIMBS_shl_mod ring_core_0_17_7_LIMBS_shl_mod
+%define LIMBS_sub_mod ring_core_0_17_7_LIMBS_sub_mod
+%define LIMBS_window5_split_window ring_core_0_17_7_LIMBS_window5_split_window
+%define LIMBS_window5_unsplit_window ring_core_0_17_7_LIMBS_window5_unsplit_window
+%define LIMB_shr ring_core_0_17_7_LIMB_shr
+%define OPENSSL_armcap_P ring_core_0_17_7_OPENSSL_armcap_P
+%define OPENSSL_cpuid_setup ring_core_0_17_7_OPENSSL_cpuid_setup
+%define OPENSSL_ia32cap_P ring_core_0_17_7_OPENSSL_ia32cap_P
+%define aes_hw_ctr32_encrypt_blocks ring_core_0_17_7_aes_hw_ctr32_encrypt_blocks
+%define aes_hw_encrypt ring_core_0_17_7_aes_hw_encrypt
+%define aes_hw_set_encrypt_key ring_core_0_17_7_aes_hw_set_encrypt_key
+%define aes_nohw_ctr32_encrypt_blocks ring_core_0_17_7_aes_nohw_ctr32_encrypt_blocks
+%define aes_nohw_encrypt ring_core_0_17_7_aes_nohw_encrypt
+%define aes_nohw_set_encrypt_key ring_core_0_17_7_aes_nohw_set_encrypt_key
+%define aesni_gcm_decrypt ring_core_0_17_7_aesni_gcm_decrypt
+%define aesni_gcm_encrypt ring_core_0_17_7_aesni_gcm_encrypt
+%define bn_from_montgomery_in_place ring_core_0_17_7_bn_from_montgomery_in_place
+%define bn_gather5 ring_core_0_17_7_bn_gather5
+%define bn_mul_mont ring_core_0_17_7_bn_mul_mont
+%define bn_mul_mont_gather5 ring_core_0_17_7_bn_mul_mont_gather5
+%define bn_neg_inv_mod_r_u64 ring_core_0_17_7_bn_neg_inv_mod_r_u64
+%define bn_power5 ring_core_0_17_7_bn_power5
+%define bn_scatter5 ring_core_0_17_7_bn_scatter5
+%define bn_sqr8x_internal ring_core_0_17_7_bn_sqr8x_internal
+%define bn_sqrx8x_internal ring_core_0_17_7_bn_sqrx8x_internal
+%define bsaes_ctr32_encrypt_blocks ring_core_0_17_7_bsaes_ctr32_encrypt_blocks
+%define bssl_constant_time_test_conditional_memcpy ring_core_0_17_7_bssl_constant_time_test_conditional_memcpy
+%define bssl_constant_time_test_conditional_memxor ring_core_0_17_7_bssl_constant_time_test_conditional_memxor
+%define bssl_constant_time_test_main ring_core_0_17_7_bssl_constant_time_test_main
+%define chacha20_poly1305_open ring_core_0_17_7_chacha20_poly1305_open
+%define chacha20_poly1305_seal ring_core_0_17_7_chacha20_poly1305_seal
+%define fiat_curve25519_adx_mul ring_core_0_17_7_fiat_curve25519_adx_mul
+%define fiat_curve25519_adx_square ring_core_0_17_7_fiat_curve25519_adx_square
+%define gcm_ghash_avx ring_core_0_17_7_gcm_ghash_avx
+%define gcm_ghash_clmul ring_core_0_17_7_gcm_ghash_clmul
+%define gcm_ghash_neon ring_core_0_17_7_gcm_ghash_neon
+%define gcm_gmult_clmul ring_core_0_17_7_gcm_gmult_clmul
+%define gcm_gmult_neon ring_core_0_17_7_gcm_gmult_neon
+%define gcm_init_avx ring_core_0_17_7_gcm_init_avx
+%define gcm_init_clmul ring_core_0_17_7_gcm_init_clmul
+%define gcm_init_neon ring_core_0_17_7_gcm_init_neon
+%define k25519Precomp ring_core_0_17_7_k25519Precomp
+%define limbs_mul_add_limb ring_core_0_17_7_limbs_mul_add_limb
+%define little_endian_bytes_from_scalar ring_core_0_17_7_little_endian_bytes_from_scalar
+%define ecp_nistz256_neg ring_core_0_17_7_ecp_nistz256_neg
+%define ecp_nistz256_select_w5 ring_core_0_17_7_ecp_nistz256_select_w5
+%define ecp_nistz256_select_w7 ring_core_0_17_7_ecp_nistz256_select_w7
+%define p256_mul_mont ring_core_0_17_7_p256_mul_mont
+%define p256_point_add ring_core_0_17_7_p256_point_add
+%define p256_point_add_affine ring_core_0_17_7_p256_point_add_affine
+%define p256_point_double ring_core_0_17_7_p256_point_double
+%define p256_point_mul ring_core_0_17_7_p256_point_mul
+%define p256_point_mul_base ring_core_0_17_7_p256_point_mul_base
+%define p256_point_mul_base_vartime ring_core_0_17_7_p256_point_mul_base_vartime
+%define p256_scalar_mul_mont ring_core_0_17_7_p256_scalar_mul_mont
+%define p256_scalar_sqr_rep_mont ring_core_0_17_7_p256_scalar_sqr_rep_mont
+%define p256_sqr_mont ring_core_0_17_7_p256_sqr_mont
+%define p384_elem_div_by_2 ring_core_0_17_7_p384_elem_div_by_2
+%define p384_elem_mul_mont ring_core_0_17_7_p384_elem_mul_mont
+%define p384_elem_neg ring_core_0_17_7_p384_elem_neg
+%define p384_elem_sub ring_core_0_17_7_p384_elem_sub
+%define p384_point_add ring_core_0_17_7_p384_point_add
+%define p384_point_double ring_core_0_17_7_p384_point_double
+%define p384_point_mul ring_core_0_17_7_p384_point_mul
+%define p384_scalar_mul_mont ring_core_0_17_7_p384_scalar_mul_mont
+%define openssl_poly1305_neon2_addmulmod ring_core_0_17_7_openssl_poly1305_neon2_addmulmod
+%define openssl_poly1305_neon2_blocks ring_core_0_17_7_openssl_poly1305_neon2_blocks
+%define sha256_block_data_order ring_core_0_17_7_sha256_block_data_order
+%define sha512_block_data_order ring_core_0_17_7_sha512_block_data_order
+%define vpaes_ctr32_encrypt_blocks ring_core_0_17_7_vpaes_ctr32_encrypt_blocks
+%define vpaes_encrypt ring_core_0_17_7_vpaes_encrypt
+%define vpaes_encrypt_key_to_bsaes ring_core_0_17_7_vpaes_encrypt_key_to_bsaes
+%define vpaes_set_encrypt_key ring_core_0_17_7_vpaes_set_encrypt_key
+%define x25519_NEON ring_core_0_17_7_x25519_NEON
+%define x25519_fe_invert ring_core_0_17_7_x25519_fe_invert
+%define x25519_fe_isnegative ring_core_0_17_7_x25519_fe_isnegative
+%define x25519_fe_mul_ttt ring_core_0_17_7_x25519_fe_mul_ttt
+%define x25519_fe_neg ring_core_0_17_7_x25519_fe_neg
+%define x25519_fe_tobytes ring_core_0_17_7_x25519_fe_tobytes
+%define x25519_ge_double_scalarmult_vartime ring_core_0_17_7_x25519_ge_double_scalarmult_vartime
+%define x25519_ge_frombytes_vartime ring_core_0_17_7_x25519_ge_frombytes_vartime
+%define x25519_ge_scalarmult_base ring_core_0_17_7_x25519_ge_scalarmult_base
+%define x25519_ge_scalarmult_base_adx ring_core_0_17_7_x25519_ge_scalarmult_base_adx
+%define x25519_public_from_private_generic_masked ring_core_0_17_7_x25519_public_from_private_generic_masked
+%define x25519_sc_mask ring_core_0_17_7_x25519_sc_mask
+%define x25519_sc_muladd ring_core_0_17_7_x25519_sc_muladd
+%define x25519_sc_reduce ring_core_0_17_7_x25519_sc_reduce
+%define x25519_scalar_mult_adx ring_core_0_17_7_x25519_scalar_mult_adx
+%define x25519_scalar_mult_generic_masked ring_core_0_17_7_x25519_scalar_mult_generic_masked
+
+%endif
+%endif

16
gnu/packages/patches/rust-rspec-1-remove-clippy.patch 100644
View File

@ -0,0 +1,16 @@
Remove the dependency on clippy
diff --git a/Cargo.toml b/Cargo.toml
index 177cb80..7260c34 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,9 +39,6 @@ version = "1.5"
[dependencies.time]
version = "0.2"
-[build-dependencies.clippy]
-version = "0.0.153"
-optional = true
[features]
default = []

132
gnu/packages/patches/rust-trash-2-update-windows.patch 100644
View File

@ -0,0 +1,132 @@
This patch is taken from upstream so we can use an already packaged
version of the windows crate.
diff --git a/Cargo.toml b/Cargo.toml
index 2c28dfe..6b61771 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -87,9 +87,8 @@ version = "0.2.7"
version = "1.0.0"
[target."cfg(windows)".dependencies.windows]
-version = "0.37.0"
+version = "0.44.0"
features = [
- "alloc",
"Win32_Foundation",
"Win32_System_Com_StructuredStorage",
"Win32_UI_Shell_PropertiesSystem",
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 894a78c..c17fc02 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -44,7 +44,7 @@ once_cell = "1.7.2"
once_cell = "1.7.2"
[target.'cfg(windows)'.dependencies]
-windows = { version = "0.37.0", features = [ "alloc",
+windows = { version = "0.44.0", features = [
"Win32_Foundation",
"Win32_System_Com_StructuredStorage",
"Win32_UI_Shell_PropertiesSystem",
diff --git a/src/windows.rs b/src/windows.rs
index c1379d3..3f4426b 100644
--- a/src/windows.rs
+++ b/src/windows.rs
@@ -1,7 +1,6 @@
use crate::{Error, TrashContext, TrashItem};
use std::{
- ffi::{OsStr, OsString},
- mem::MaybeUninit,
+ ffi::{c_void, OsStr, OsString},
os::windows::{ffi::OsStrExt, prelude::*},
path::PathBuf,
};
@@ -66,7 +65,7 @@ impl TrashContext {
let shi: IShellItem =
SHCreateItemFromParsingName(PCWSTR(wide_path_slice.as_ptr()), None)?;
- pfo.DeleteItem(shi, None)?;
+ pfo.DeleteItem(&shi, None)?;
}
pfo.PerformOperations()?;
Ok(())
@@ -78,28 +77,18 @@ pub fn list() -> Result<Vec<TrashItem>, Error> {
ensure_com_initialized();
unsafe {
let mut item_vec = Vec::new();
- let mut recycle_bin = MaybeUninit::<Option<IShellItem>>::uninit();
- SHGetKnownFolderItem(
- &FOLDERID_RecycleBinFolder,
- KF_FLAG_DEFAULT,
- HANDLE::default(),
- &IShellItem::IID,
- recycle_bin.as_mut_ptr() as _,
- )?;
-
- let recycle_bin = recycle_bin.assume_init().ok_or(Error::Unknown {
- description: "SHGetKnownFolderItem gave NULL for FOLDERID_RecycleBinFolder".into(),
- })?;
+ let recycle_bin: IShellItem =
+ SHGetKnownFolderItem(&FOLDERID_RecycleBinFolder, KF_FLAG_DEFAULT, HANDLE::default())?;
let pesi: IEnumShellItems = recycle_bin.BindToHandler(None, &BHID_EnumItems)?;
- let mut fetched: u32 = 0;
loop {
+ let mut fetched_count: u32 = 0;
let mut arr = [None];
- pesi.Next(&mut arr, &mut fetched)?;
+ pesi.Next(&mut arr, Some(&mut fetched_count as *mut u32))?;
- if fetched == 0 {
+ if fetched_count == 0 {
break;
}
@@ -145,7 +134,7 @@ where
at_least_one = true;
let id_as_wide: Vec<u16> = item.id.encode_wide().chain(std::iter::once(0)).collect();
let parsing_name = PCWSTR(id_as_wide.as_ptr());
- let trash_item: IShellItem = SHCreateItemFromParsingName(&parsing_name, None)?;
+ let trash_item: IShellItem = SHCreateItemFromParsingName(parsing_name, None)?;
pfo.DeleteItem(&trash_item, None)?;
}
if at_least_one {
@@ -181,7 +170,7 @@ where
for item in items.iter() {
let id_as_wide: Vec<u16> = item.id.encode_wide().chain(std::iter::once(0)).collect();
let parsing_name = PCWSTR(id_as_wide.as_ptr());
- let trash_item: IShellItem = SHCreateItemFromParsingName(&parsing_name, None)?;
+ let trash_item: IShellItem = SHCreateItemFromParsingName(parsing_name, None)?;
let parent_path_wide: Vec<_> =
item.original_parent.as_os_str().encode_wide().chain(std::iter::once(0)).collect();
let orig_folder_shi: IShellItem =
@@ -191,7 +180,7 @@ where
.chain(std::iter::once(0))
.collect();
- pfo.MoveItem(trash_item, orig_folder_shi, PCWSTR(name_wstr.as_ptr()), None)?;
+ pfo.MoveItem(&trash_item, &orig_folder_shi, PCWSTR(name_wstr.as_ptr()), None)?;
}
if !items.is_empty() {
pfo.PerformOperations()?;
@@ -203,7 +192,7 @@ where
unsafe fn get_display_name(psi: &IShellItem, sigdnname: SIGDN) -> Result<OsString, Error> {
let name = psi.GetDisplayName(sigdnname)?;
let result = wstr_to_os_string(name);
- CoTaskMemFree(name.0 as _);
+ CoTaskMemFree(Some(name.0 as *const c_void));
Ok(result)
}
@@ -257,7 +246,7 @@ impl CoInitializer {
if cfg!(feature = "coinit_speed_over_memory") {
init_mode |= COINIT_SPEED_OVER_MEMORY;
}
- let hr = unsafe { CoInitializeEx(std::ptr::null_mut(), init_mode) };
+ let hr = unsafe { CoInitializeEx(None, init_mode) };
if hr.is_err() {
panic!("Call to CoInitializeEx failed. HRESULT: {:?}. Consider using `trash` with the feature `coinit_multithreaded`", hr);
}

235
gnu/packages/patches/rustc-1.54.0-src.patch
View File

@ -28,52 +28,112 @@
rustc_data_structures::static_assert_size!(ForeignItemKind, 72); rustc_data_structures::static_assert_size!(ForeignItemKind, 72);
impl From<ForeignItemKind> for ItemKind { impl From<ForeignItemKind> for ItemKind {
--- compiler/rustc_hir/src/hir.rs --- compiler/rustc_hir/src/hir.rs
+++ compiler/rustc_hir/src/hir.rs +++ compiler/rustc_hir/src/hir.rs
@@ -3050,3 +3050,3 @@ @@ -3048,7 +3048,7 @@ impl<'hir> Node<'hir> {
}
// Some nodes are used a lot. Make sure they don't unintentionally get bigger. // Some nodes are used a lot. Make sure they don't unintentionally get bigger.
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] -#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(not(rust_compiler="mrustc"),target_arch = "x86_64", target_pointer_width = "64"))] +#[cfg(all(not(rust_compiler="mrustc"),target_arch = "x86_64", target_pointer_width = "64"))]
mod size_asserts { mod size_asserts {
rustc_data_structures::static_assert_size!(super::Block<'static>, 48);
rustc_data_structures::static_assert_size!(super::Expr<'static>, 64);
--- compiler/rustc_middle/src/mir/interpret/error.rs --- compiler/rustc_middle/src/mir/interpret/error.rs
+++ compiler/rustc_middle/src/mir/interpret/error.rs +++ compiler/rustc_middle/src/mir/interpret/error.rs
@@ -452,2 +452,2 @@ @@ -449,7 +449,7 @@ impl dyn MachineStopType {
}
}
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] -#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(not(rust_compiler="mrustc"), target_arch = "x86_64", target_pointer_width = "64"))] +#[cfg(all(not(rust_compiler="mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
static_assert_size!(InterpError<'_>, 64); static_assert_size!(InterpError<'_>, 64);
pub enum InterpError<'tcx> {
--- compiler/rustc_middle/src/mir/mod.rs --- compiler/rustc_middle/src/mir/mod.rs
+++ compiler/rustc_middle/src/mir/mod.rs +++ compiler/rustc_middle/src/mir/mod.rs
@@ -2203,2 +2203,2 @@ @@ -2200,7 +2200,7 @@ pub enum AggregateKind<'tcx> {
Generator(DefId, SubstsRef<'tcx>, hir::Movability),
}
-#[cfg(target_arch = "x86_64")] -#[cfg(target_arch = "x86_64")]
+#[cfg(all(not(rust_compiler="mrustc"), target_arch = "x86_64"))] +#[cfg(all(not(rust_compiler="mrustc"), target_arch = "x86_64"))]
static_assert_size!(AggregateKind<'_>, 48); static_assert_size!(AggregateKind<'_>, 48);
#[derive(Copy, Clone, Debug, PartialEq, PartialOrd, Eq, TyEncodable, TyDecodable, Hash, HashStable)]
--- compiler/rustc_middle/src/thir.rs --- compiler/rustc_middle/src/thir.rs
+++ compiler/rustc_middle/src/thir.rs +++ compiler/rustc_middle/src/thir.rs
@@ -147,2 +147,2 @@ @@ -144,7 +144,7 @@ pub enum StmtKind<'tcx> {
}
// `Expr` is used a lot. Make sure it doesn't unintentionally get bigger.
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] -#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(not(rust_compiler="mrustc"), target_arch = "x86_64", target_pointer_width = "64"))] +#[cfg(all(not(rust_compiler="mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
rustc_data_structures::static_assert_size!(Expr<'_>, 144); rustc_data_structures::static_assert_size!(Expr<'_>, 144);
--- compiler/rustc_mir/src/interpret/place.rs
+++ compiler/rustc_mir/src/interpret/place.rs /// The Thir trait implementor lowers their expressions (`&'tcx H::Expr`)
@@ -91,2 +91,2 @@
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
rustc_data_structures::static_assert_size!(Place, 64);
@@ -100,2 +100,2 @@
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
rustc_data_structures::static_assert_size!(PlaceTy<'_>, 80);
--- compiler/rustc_mir/src/interpret/operand.rs --- compiler/rustc_mir/src/interpret/operand.rs
+++ compiler/rustc_mir/src/interpret/operand.rs +++ compiler/rustc_mir/src/interpret/operand.rs
@@ -35,2 +35,2 @@ @@ -32,7 +32,7 @@ pub enum Immediate<Tag = ()> {
ScalarPair(ScalarMaybeUninit<Tag>, ScalarMaybeUninit<Tag>),
}
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] -#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))] +#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
rustc_data_structures::static_assert_size!(Immediate, 56); rustc_data_structures::static_assert_size!(Immediate, 56);
@@ -90,2 +90,2 @@
impl<Tag> From<ScalarMaybeUninit<Tag>> for Immediate<Tag> {
@@ -87,7 +87,7 @@ pub struct ImmTy<'tcx, Tag = ()> {
pub layout: TyAndLayout<'tcx>,
}
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] -#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))] +#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
rustc_data_structures::static_assert_size!(ImmTy<'_>, 72); rustc_data_structures::static_assert_size!(ImmTy<'_>, 72);
impl<Tag: Copy> std::fmt::Display for ImmTy<'tcx, Tag> {
--- compiler/rustc_mir/src/interpret/place.rs
+++ compiler/rustc_mir/src/interpret/place.rs
@@ -88,7 +88,7 @@ pub enum Place<Tag = ()> {
Local { frame: usize, local: mir::Local },
}
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
rustc_data_structures::static_assert_size!(Place, 64);
#[derive(Copy, Clone, Debug)]
@@ -97,7 +97,7 @@ pub struct PlaceTy<'tcx, Tag = ()> {
pub layout: TyAndLayout<'tcx>,
}
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(not(rust_compiler = "mrustc"), target_arch = "x86_64", target_pointer_width = "64"))]
rustc_data_structures::static_assert_size!(PlaceTy<'_>, 80);
impl<'tcx, Tag> std::ops::Deref for PlaceTy<'tcx, Tag> {
#
# Disable std_detect's detection logic (use the same logic as miri)
#
--- library/stdarch/crates/std_detect/src/detect/mod.rs
+++ library/stdarch/crates/std_detect/src/detect/mod.rs
@@ -86,7 +86,7 @@ mod bit;
mod cache;
cfg_if! {
- if #[cfg(miri)] {
+ if #[cfg(any(miri, rust_compiler = "mrustc"))] {
// When running under miri all target-features that are not enabled at
// compile-time are reported as disabled at run-time.
//
# #
# Disable crc32fast's use of stdarch # Disable crc32fast's use of stdarch
# #
@ -88,19 +148,145 @@
))] { ))] {
# #
# Disable std_detect's detection logic (use the same logic as miri) # Backport which is required to support arm64 on macOS 12
# See: https://github.com/alexcrichton/curl-rust/commit/0aea09c428b9bc2bcf46da0fc33959fe3f03c74a
# #
--- library/stdarch/crates/std_detect/src/detect/mod.rs --- vendor/curl/src/lib.rs
+++ library/stdarch/crates/std_detect/src/detect/mod.rs +++ vendor/curl/src/lib.rs
@@ -88,2 +88,2 @@ @@ -82,6 +82,9 @@ pub mod easy;
cfg_if! { pub mod multi;
- if #[cfg(miri)] { mod panic;
+ if #[cfg(any(miri, rust_compiler = "mrustc"))] {
+#[cfg(test)]
+static INITIALIZED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
+
/// Initializes the underlying libcurl library.
///
/// The underlying libcurl library must be initialized before use, and must be
@@ -102,46 +105,62 @@ pub fn init() {
/// Used to prevent concurrent or duplicate initialization.
static INIT: Once = Once::new();
- /// An exported constructor function. On supported platforms, this will be
- /// invoked automatically before the program's `main` is called.
- #[cfg_attr(
- any(target_os = "linux", target_os = "freebsd", target_os = "android"),
- link_section = ".init_array"
- )]
- #[cfg_attr(target_os = "macos", link_section = "__DATA,__mod_init_func")]
- #[cfg_attr(target_os = "windows", link_section = ".CRT$XCU")]
- static INIT_CTOR: extern "C" fn() = init_inner;
+ INIT.call_once(|| {
+ #[cfg(need_openssl_init)]
+ openssl_probe::init_ssl_cert_env_vars();
+ #[cfg(need_openssl_init)]
+ openssl_sys::init();
+
+ unsafe {
+ assert_eq!(curl_sys::curl_global_init(curl_sys::CURL_GLOBAL_ALL), 0);
+ }
+
+ #[cfg(test)]
+ {
+ INITIALIZED.store(true, std::sync::atomic::Ordering::SeqCst);
+ }
+
+ // Note that we explicitly don't schedule a call to
+ // `curl_global_cleanup`. The documentation for that function says
+ //
+ // > You must not call it when any other thread in the program (i.e. a
+ // > thread sharing the same memory) is running. This doesn't just mean
+ // > no other thread that is using libcurl.
+ //
+ // We can't ever be sure of that, so unfortunately we can't call the
+ // function.
+ });
+}
+/// An exported constructor function. On supported platforms, this will be
+/// invoked automatically before the program's `main` is called. This is done
+/// for the convenience of library users since otherwise the thread-safety rules
+/// around initialization can be difficult to fulfill.
+///
+/// This is a hidden public item to ensure the symbol isn't optimized away by a
+/// rustc/LLVM bug: https://github.com/rust-lang/rust/issues/47384. As long as
+/// any item in this module is used by the final binary (which `init` will be)
+/// then this symbol should be preserved.
+#[used]
+#[doc(hidden)]
+#[cfg_attr(
+ any(target_os = "linux", target_os = "freebsd", target_os = "android"),
+ link_section = ".init_array"
+)]
+#[cfg_attr(target_os = "macos", link_section = "__DATA,__mod_init_func")]
+#[cfg_attr(target_os = "windows", link_section = ".CRT$XCU")]
+pub static INIT_CTOR: extern "C" fn() = {
/// This is the body of our constructor function.
#[cfg_attr(
any(target_os = "linux", target_os = "android"),
link_section = ".text.startup"
)]
- extern "C" fn init_inner() {
- INIT.call_once(|| {
- #[cfg(need_openssl_init)]
- openssl_sys::init();
-
- unsafe {
- assert_eq!(curl_sys::curl_global_init(curl_sys::CURL_GLOBAL_ALL), 0);
- }
-
- // Note that we explicitly don't schedule a call to
- // `curl_global_cleanup`. The documentation for that function says
- //
- // > You must not call it when any other thread in the program (i.e.
- // > a thread sharing the same memory) is running. This doesn't just
- // > mean no other thread that is using libcurl.
- //
- // We can't ever be sure of that, so unfortunately we can't call the
- // function.
- });
+ extern "C" fn init_ctor() {
+ init();
}
- // We invoke our init function through our static to ensure the symbol isn't
- // optimized away by a bug: https://github.com/rust-lang/rust/issues/47384
- INIT_CTOR();
-}
+ init_ctor
+};
unsafe fn opt_str<'a>(ptr: *const libc::c_char) -> Option<&'a str> {
if ptr.is_null() {
@@ -158,3 +177,20 @@ fn cvt(r: curl_sys::CURLcode) -> Result<(), Error> {
Err(Error::new(r))
}
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ #[cfg(any(
+ target_os = "linux",
+ target_os = "macos",
+ target_os = "windows",
+ target_os = "freebsd",
+ target_os = "android"
+ ))]
+ fn is_initialized_before_main() {
+ assert!(INITIALIZED.load(std::sync::atomic::Ordering::SeqCst));
+ }
+}
# PPV-Lite also needs to know that we're pretending to be miri # PPV-Lite also needs to know that we're pretending to be miri
--- vendor/ppv-lite86/src/lib.rs --- vendor/ppv-lite86/src/lib.rs
+++ vendor/ppv-lite86/src/lib.rs +++ vendor/ppv-lite86/src/lib.rs
@@ -12,9 +12,9 @@ @@ -9,14 +9,14 @@ mod soft;
mod types;
pub use self::types::*;
-#[cfg(all(feature = "simd", target_arch = "x86_64", not(miri)))] -#[cfg(all(feature = "simd", target_arch = "x86_64", not(miri)))]
+#[cfg(all(feature = "simd", target_arch = "x86_64", not(miri), not(rust_compiler = "mrustc")))] +#[cfg(all(feature = "simd", target_arch = "x86_64", not(miri), not(rust_compiler = "mrustc")))]
pub mod x86_64; pub mod x86_64;
@ -115,3 +301,4 @@
+#[cfg(any(miri, rust_compiler = "mrustc", not(all(feature = "simd", any(target_arch = "x86_64")))))] +#[cfg(any(miri, rust_compiler = "mrustc", not(all(feature = "simd", any(target_arch = "x86_64")))))]
use self::generic as arch; use self::generic as arch;
pub use self::arch::{vec128_storage, vec256_storage, vec512_storage};

55
gnu/packages/potassco.scm
View File

@ -32,6 +32,7 @@
#:use-module (guix build-system emacs) #:use-module (guix build-system emacs)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system pyproject) #:use-module (guix build-system pyproject)
#:use-module (gnu packages bison)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages cpp) #:use-module (gnu packages cpp)
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
@ -42,12 +43,13 @@
#:use-module (gnu packages python-build) #:use-module (gnu packages python-build)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages re2c)
#:use-module (gnu packages sphinx)) #:use-module (gnu packages sphinx))
(define-public libpotassco (define-public libpotassco
;; No public release, update together with clasp ;; No public release, update together with clasp
(let ((revision "1") (let ((revision "2")
(commit "2f9fb7ca2c202f1b47643aa414054f2f4f9c1821")) (commit "69b677f026c53d5a0a794db17691a1eb8bce8c6b"))
(package (package
(name "libpotassco") (name "libpotassco")
(version (git-version "0.0" revision commit)) (version (git-version "0.0" revision commit))
@ -65,7 +67,7 @@
(("\"catch.hpp\"") "<catch/catch.hpp>")))) (("\"catch.hpp\"") "<catch/catch.hpp>"))))
(sha256 (sha256
(base32 (base32
"1c32f9gqclf7qx07lpx8wd720vfhkjqhzc6nyy8mjmgwpmb3iyyn")))) "1c69njg30dha1zy6j17gghjg3lgambz0pipxkgxadmrkvsb20z2k"))))
(arguments (arguments
`(#:configure-flags '("-DLIB_POTASSCO_BUILD_TESTS=on" `(#:configure-flags '("-DLIB_POTASSCO_BUILD_TESTS=on"
"-DLIB_POTASSCO_INSTALL_LIB=on" "-DLIB_POTASSCO_INSTALL_LIB=on"
@ -103,7 +105,7 @@ between aspif and smodels format or to a human-readable text format.")
(define-public clasp (define-public clasp
(package (package
(name "clasp") (name "clasp")
(version "3.3.9") (version "3.3.10")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -112,7 +114,7 @@ between aspif and smodels format or to a human-readable text format.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"163ps9zq7xppqy9hj5qnw6z5lcjnm4xf5fwjsavpia5ynm3hngcw")))) "0qap7rar8a5mkqz28n2hnvr4cfv5x0rh4zs3wdp919dw4d034chr"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags '("-DCLASP_BUILD_TESTS=on" `(#:configure-flags '("-DCLASP_BUILD_TESTS=on"
@ -146,7 +148,7 @@ satisfiability checking (SAT).")
(define-public clingo (define-public clingo
(package (package
(name "clingo") (name "clingo")
(version "5.6.2") (version "5.7.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -157,10 +159,11 @@ satisfiability checking (SAT).")
(snippet (snippet
#~(begin #~(begin
(delete-file-recursively "clasp") (delete-file-recursively "clasp")
(delete-file-recursively "libgringo/gen")
(delete-file-recursively "third_party"))) (delete-file-recursively "third_party")))
(sha256 (sha256
(base32 (base32
"19s59ndcm2yj0kxlikfxnx2bmp6b7n31wq1zvwc7hyk37rqarwys")))) "1mxl3gwx55sf2ifcb92mfy989c50yqpnq0d0r2mxdqr0riy40hjb"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list (list
@ -184,6 +187,7 @@ satisfiability checking (SAT).")
"find_package(mpark_variant)\n" "find_package(mpark_variant)\n"
"find_package(tsl-sparse-map)\n" "find_package(tsl-sparse-map)\n"
"find_package(tsl-ordered-map)\n" "find_package(tsl-ordered-map)\n"
"find_package(wide-integer)\n"
"find_package(Catch2 3 REQUIRED)"))) "find_package(Catch2 3 REQUIRED)")))
(substitute* "libclingo/CMakeLists.txt" (substitute* "libclingo/CMakeLists.txt"
(("\"cmake/Clingo\"") "\"cmake/clingo\"") (("\"cmake/Clingo\"") "\"cmake/clingo\"")
@ -191,7 +195,8 @@ satisfiability checking (SAT).")
(("ClingoConfigVersion\\.cmake") (("ClingoConfigVersion\\.cmake")
"clingo-config-version.cmake")) "clingo-config-version.cmake"))
(substitute* "libgringo/CMakeLists.txt" (substitute* "libgringo/CMakeLists.txt"
(("mpark::variant") "mpark_variant")) (("mpark::variant") "mpark_variant")
(("math::wide_integer") "wide-integer::wide-integer"))
(substitute* "cmake/ClingoConfig.cmake.in" (substitute* "cmake/ClingoConfig.cmake.in"
(("find_package\\(Clasp") "find_package(clasp")) (("find_package\\(Clasp") "find_package(clasp"))
(rename-file "cmake/ClingoConfig.cmake.in" (rename-file "cmake/ClingoConfig.cmake.in"
@ -212,12 +217,14 @@ satisfiability checking (SAT).")
"propagator" "propgator-sequence-mining" "propagator" "propgator-sequence-mining"
"symbol" "visitor")))))))))) "symbol" "visitor"))))))))))
(inputs (list catch2-3 clasp libpotassco)) (inputs (list catch2-3 clasp libpotassco))
(native-inputs (list mpark-variant (native-inputs (list bison re2c
mpark-variant
pkg-config pkg-config
tl-optional tl-optional
tsl-hopscotch-map tsl-hopscotch-map
tsl-ordered-map tsl-ordered-map
tsl-sparse-map)) tsl-sparse-map
wide-integer))
(home-page "https://potassco.org/") (home-page "https://potassco.org/")
(synopsis "Grounder and solver for logic programs") (synopsis "Grounder and solver for logic programs")
(description "Clingo computes answer sets for a given logic program.") (description "Clingo computes answer sets for a given logic program.")
@ -226,7 +233,7 @@ satisfiability checking (SAT).")
(define-public clingo-dl (define-public clingo-dl
(package (package
(name "clingo-dl") (name "clingo-dl")
(version "1.4.0") (version "1.5.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -234,7 +241,7 @@ satisfiability checking (SAT).")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0dncwj63vdm6958vb7355d5j9mdr7hm037j4z82yz6l77jg3sipw")))) (base32 "0vf51pgwgiac801gr6w5pnxb6wa0kacz09ncrcn25w5siz17g4si"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (list #:tests? #f ; no tests (arguments (list #:tests? #f ; no tests
#:configure-flags #~`("-DPYCLINGODL_ENABLE=off"))) #:configure-flags #~`("-DPYCLINGODL_ENABLE=off")))
@ -357,6 +364,9 @@ Lua code.")))
(substitute-keyword-arguments (package-arguments clingo) (substitute-keyword-arguments (package-arguments clingo)
((#:configure-flags flags #~'()) ((#:configure-flags flags #~'())
#~(cons* "-DCLINGO_BUILD_WITH_PYTHON=pip" #~(cons* "-DCLINGO_BUILD_WITH_PYTHON=pip"
(string-append "-DCMAKE_MODULE_PATH="
#$(this-package-native-input "python-scikit-build")
"/lib/cmake/modules")
"-DCLINGO_USE_LIB=yes" "-DCLINGO_USE_LIB=yes"
#$flags)) #$flags))
((#:imported-modules _ '()) ((#:imported-modules _ '())
@ -401,7 +411,11 @@ Python code.")))
(version (package-version clingo-dl)) (version (package-version clingo-dl))
(arguments (arguments
(list (list
#:configure-flags #~'("-DPYCLINGODL_ENABLE=pip") #:configure-flags
#~(list "-DPYCLINGODL_ENABLE=pip"
(string-append "-DCMAKE_MODULE_PATH="
#$(this-package-native-input "python-scikit-build")
"/lib/cmake/modules"))
#:tests? #f #:tests? #f
#:imported-modules `(,@%cmake-build-system-modules #:imported-modules `(,@%cmake-build-system-modules
(guix build python-build-system)) (guix build python-build-system))
@ -423,6 +437,8 @@ Python code.")))
(inputs (modify-inputs (package-inputs clingo-dl) (inputs (modify-inputs (package-inputs clingo-dl)
(prepend python-wrapper))) (prepend python-wrapper)))
(propagated-inputs (list python-clingo python-cffi)) (propagated-inputs (list python-clingo python-cffi))
(native-inputs (modify-inputs (package-native-inputs clingo-dl)
(prepend python-scikit-build)))
(synopsis "Python bindings for clingo-dl") (synopsis "Python bindings for clingo-dl")
(description "This package allows users to add the clingo-dl propagator (description "This package allows users to add the clingo-dl propagator
as a theory to clingo from Python code. It also supports running clingo-dl as a theory to clingo from Python code. It also supports running clingo-dl
@ -431,7 +447,7 @@ directly from the python command line.")))
(define-public python-clorm (define-public python-clorm
(package (package
(name "python-clorm") (name "python-clorm")
(version "1.4.1") (version "1.5.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -440,7 +456,7 @@ directly from the python command line.")))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0jx99y71mrgdicn1da5dwz5nzgvvpabrikff783sg4shbv2cf0b5")))) "1wbxniq60ph7bdaypcaahym7jxmlnm2zhrfmrgrk441i1iaida24"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list #:phases (list #:phases
@ -466,7 +482,7 @@ into Python programs easier.")
(define-public python-plingo (define-public python-plingo
(package (package
(name "python-plingo") (name "python-plingo")
(version "1.0.0") (version "1.1.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -475,7 +491,7 @@ into Python programs easier.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1mp0pdjzwpl7bpba20iwszx9x49gsyl2rhrp7w7xpwjqdjrp23r8")))) "0bdz755c6isp29layvzsw9c4kr12x7b5d8ip37ay3cl4dlq4bid3"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list #:phases (list #:phases
@ -504,17 +520,16 @@ the most probable model as well as finding all models and their probabilities.")
(define-public python-telingo (define-public python-telingo
(package (package
(name "python-telingo") (name "python-telingo")
(version "2.1.1") (version "2.1.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/potassco/telingo") (url "https://github.com/potassco/telingo")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(patches (search-patches "python-telingo-fix-comparison.patch"))
(sha256 (sha256
(base32 (base32
"0g3khxfdzc2hc7dkiyyqhb399h6h21m5wkp6wy8w71n0m32fiy53")))) "1q6hlh4b5hsa4n5agvmfa9rhsxfd2g6kpl4b9kfccwbmf6dh51k6"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(propagated-inputs (list python-clingo)) (propagated-inputs (list python-clingo))
(home-page "https://potassco.org/") (home-page "https://potassco.org/")

4
gnu/packages/python-build.scm
View File

@ -216,13 +216,13 @@ PyPI (pypi.org).")
(define-public python-typing-extensions (define-public python-typing-extensions
(package (package
(name "python-typing-extensions") (name "python-typing-extensions")
(version "4.5.0") (version "4.9.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "typing_extensions" version)) (uri (pypi-uri "typing_extensions" version))
(sha256 (sha256
(base32 (base32
"1jx7ki3sji60v7h2805b2phq9ynsvshj5xiygdh9kmirj6kz9daw")))) "10spkx7xjbxwcsgkqv483c5kn53s042wkrmfr1mdf9vzqf48yir3"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
;; Disable the test suite to keep the dependencies to a minimum. Also, ;; Disable the test suite to keep the dependencies to a minimum. Also,
;; the test suite requires Python's test module, not available in Guix. ;; the test suite requires Python's test module, not available in Guix.

1
gnu/packages/python-crypto.scm
View File

@ -57,6 +57,7 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-tls)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages kerberos) #:use-module (gnu packages kerberos)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)

102
gnu/packages/python-web.scm
View File

@ -39,7 +39,7 @@
;;; Copyright © 2020 Edouard Klein <edk@beaver-labs.com> ;;; Copyright © 2020 Edouard Klein <edk@beaver-labs.com>
;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net> ;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;; Copyright © 2020, 2022 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2020, 2022, 2024 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com> ;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
@ -1319,25 +1319,22 @@ HTTP servers, RESTful APIs, and web services.")
(define-public parfive (define-public parfive
(package (package
(name "parfive") (name "parfive")
(version "2.0.1") (version "2.0.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "parfive" version)) (uri (pypi-uri "parfive" version))
(sha256 (sha256
(base32 (base32
"19dcbb6g56l5s3ih0bhs3p4acgc0gf4zdzpj4w87m69li2nhmgpx")))) "0pf8rzfwxpkn84xzb4v8m1fy3k7kjlh8f9ln4y5xqlnbqpwi30lh"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list #:phases #~(modify-phases %standard-phases (list
(add-before 'check 'disable-test-requiring-network ;; Disable tests requiring network access.
(lambda _ #:test-flags
(substitute* "parfive/tests/test_downloader.py" #~(list "-k" (string-append
(("def test_ftp") "not test_ftp"
"def __off_test_ftp")))) " and not test_ftp_pasv_command"
(replace 'check " and not test_ftp_http"))))
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "python" "-m" "pytest" "-vvv" "parfive")))))))
(propagated-inputs (list python-aiofiles python-aioftp python-aiohttp (propagated-inputs (list python-aiofiles python-aioftp python-aiohttp
python-tqdm)) python-tqdm))
(native-inputs (list python-pytest (native-inputs (list python-pytest
@ -3549,20 +3546,14 @@ adapter for use with the Requests library.")
(define-public python-aioftp (define-public python-aioftp
(package (package
(name "python-aioftp") (name "python-aioftp")
(version "0.21.4") (version "0.22.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "aioftp" version)) (uri (pypi-uri "aioftp" version))
(sha256 (sha256
(base32 (base32
"1f8vql2j2b3ykqyh5bxzsp8x5f2if2c1ya232ld3hz3cc7a2dfr8")))) "0w621mg956m9rn7v39jpwi4gpnpl90pprwl29cp640dahqqv38ms"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vvv")))))))
(native-inputs (list python-async-timeout python-pytest (native-inputs (list python-async-timeout python-pytest
python-pytest-asyncio python-pytest-cov python-pytest-asyncio python-pytest-cov
python-trustme)) python-trustme))
@ -8800,6 +8791,71 @@ Request Forgery} (XSRF) Protection by using the Double Submit Cookie mitigation
pattern.") pattern.")
(license license:expat))) (license license:expat)))
(define-public python-fastapi-pagination-minimal
(package
(name "python-fastapi-pagination-minimal")
(version "0.12.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/uriyyo/fastapi-pagination")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0qkcphjk1qy680v1hkmqbs4p7srvx020wy39b97anrn9dyyi5ah6"))))
(build-system pyproject-build-system)
(arguments
;; Tests depend on python-cassandra,
;; which is not yet packaged in Guix.
`(#:tests? #f))
(native-inputs
(list poetry))
;; These are the only required dependencies,
;; please add all optional dependencies to the
;; full python-fastapi-pagination below.
(propagated-inputs (list python-fastapi
python-pydantic))
(home-page "https://github.com/uriyyo/fastapi-pagination")
(synopsis "FastAPI pagination library")
(description "@code{fastapi-pagination} is a Python library designed to
simplify pagination in FastAPI applications. It provides a set of utility
functions and data models to help you paginate your database queries and
return paginated responses to your clients.")
(license license:expat)))
(define-public python-fastapi-pagination
(package
(inherit python-fastapi-pagination-minimal)
(name "python-fastapi-pagination")
(propagated-inputs
(modify-inputs (package-propagated-inputs
python-fastapi-pagination-minimal)
(prepend python-asyncpg
python-databases
python-django
python-fastapi
python-pydantic
python-sqlalchemy
(package
(inherit python-tortoise-orm)
(arguments
(substitute-keyword-arguments (package-arguments
python-tortoise-orm)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(delete 'sanity-check)))))
(propagated-inputs
(modify-inputs (package-propagated-inputs python-tortoise-orm)
(replace "python-aiosqlite" python-aiosqlite)))))))
(description
(string-append (package-description python-fastapi-pagination-minimal)
"
This package, as opposed to @code{python-fastapi-pagination-minimal}, depends on
all available optional dependencies supported by mainline
@code{fastapi-pagination}."))))
(define-public python-pyactiveresource (define-public python-pyactiveresource
(package (package
(name "python-pyactiveresource") (name "python-pyactiveresource")

201
gnu/packages/python-xyz.scm
View File

@ -14,7 +14,7 @@
;;; Copyright © 2015, 2016, 2017, 2019, 2022 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016, 2017, 2019, 2022 Leo Famulari <leo@famulari.name>
;;; Copyright © 2015, 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2015, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa@gmail.com> ;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa@gmail.com>
;;; Copyright © 2015-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2017, 2020 Kyle Meyer <kyle@kyleam.com> ;;; Copyright © 2015, 2017, 2020 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2015, 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2015, 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
@ -29,7 +29,7 @@
;;; Copyright © 2016-2023 Marius Bakke <marius@gnu.org> ;;; Copyright © 2016-2023 Marius Bakke <marius@gnu.org>
;;; Copyright © 2016, 2017, 2021, 2022 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2016, 2017, 2021, 2022 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2016, 2017, 2019 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2016, 2017, 2019 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2016–2018, 2021–2023 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016–2018, 2021–2024 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2016, 2017, 2018, 2020, 2021 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
@ -181,6 +181,7 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cpp) #:use-module (gnu packages cpp)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-windows)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages dbm) #:use-module (gnu packages dbm)
@ -579,7 +580,13 @@ workspaces.
(method url-fetch) (method url-fetch)
(uri (pypi-uri "databind.core" version)) (uri (pypi-uri "databind.core" version))
(sha256 (sha256
(base32 "130hr19kbzizx9n2q7cwfzfk20ii3cqmqjrzb16psnafll303k2d")))) (base32 "130hr19kbzizx9n2q7cwfzfk20ii3cqmqjrzb16psnafll303k2d"))
(snippet
#~(begin (use-modules (guix build utils))
;; The problem with python-typing-extensions >= 4.7 is only
;; with python-3.7.
(substitute* "pyproject.toml"
((",<4.7.*") "\"\n"))))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
@ -624,7 +631,13 @@ Python dataclasses.")
(method url-fetch) (method url-fetch)
(uri (pypi-uri "databind.json" version)) (uri (pypi-uri "databind.json" version))
(sha256 (sha256
(base32 "1lm864d7arfq0pw64hyc83bwn1z94wjg7a22q1xf0qkjynqs70gg")))) (base32 "1lm864d7arfq0pw64hyc83bwn1z94wjg7a22q1xf0qkjynqs70gg"))
(snippet
#~(begin (use-modules (guix build utils))
;; The problem with python-typing-extensions >= 4.7 is only
;; with python-3.7.
(substitute* "pyproject.toml"
((",<4.7.*") "\"\n"))))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
@ -1103,19 +1116,29 @@ during long operations.")
(define-public python-lunr (define-public python-lunr
(package (package
(name "python-lunr") (name "python-lunr")
(version "0.6.0") (version "0.7.0.post1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (uri
(pypi-uri "lunr" version)) (pypi-uri "lunr" version))
(sha256 (sha256
(base32 "106akalywfmnypzkdrhgz4n4740a8xayspybsw59kq06vz8i2qrc")))) (base32 "1njb23lw619ppidqdzygdrscna4z15n9xjc4cc7yxiskkgsriz00"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments
(list
#:test-flags
'(list "-k" "not TestLanguageSupport"
"--ignore-glob=tests/acceptance_tests/*")))
(native-inputs (native-inputs
(list python-mock python-pytest)) (list python-coverage
python-hatch-fancy-pypi-readme
python-hatchling
python-pytest
python-pytest-timeout
python-tox))
(propagated-inputs (propagated-inputs
(list python-nltk-3.4)) (list python-importlib-metadata python-typing-extensions))
(home-page (home-page
"https://github.com/yeraydiazdiaz/lunr.py") "https://github.com/yeraydiazdiaz/lunr.py")
(synopsis "Full-text search library") (synopsis "Full-text search library")
@ -2560,13 +2583,13 @@ NetCDF files can also be read and modified. Python-HDF4 is a fork of
(define-public python-h5netcdf (define-public python-h5netcdf
(package (package
(name "python-h5netcdf") (name "python-h5netcdf")
(version "1.1.0") (version "1.3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "h5netcdf" version)) (uri (pypi-uri "h5netcdf" version))
(sha256 (sha256
(base32 "0mmzfr6k55zqxxpb64gvdqisak8s1zb2r04yzkmp0wzd7dbknb4k")))) (base32 "1kw3cf01kziwxmb84x0cy6vbpsmqjm0k1dm34i6b4d7bv8kw0wd1"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(native-inputs (native-inputs
(list python-netcdf4 (list python-netcdf4
@ -5147,14 +5170,14 @@ interfaces.")
(define-public python-click (define-public python-click
(package (package
(name "python-click") (name "python-click")
(version "8.1.3") (version "8.1.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "click" version)) (uri (pypi-uri "click" version))
(sha256 (sha256
(base32 (base32
"13kvp8visj5xh9d43brnda6q0kc1s40flxa5cw0p0a9hzf5dr0kn")))) "1pm6khdv88h764scik67jki98xbyj367h591j8hpwy4y8nnm766a"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -6231,6 +6254,30 @@ important tasks for becoming a daemon process:
;; Only setup.py is gpl3+, everything else is apache 2.0 licensed. ;; Only setup.py is gpl3+, everything else is apache 2.0 licensed.
(license (list license:asl2.0 license:gpl3+)))) (license (list license:asl2.0 license:gpl3+))))
(define-public python-annotated-types
(package
(name "python-annotated-types")
(version "0.6.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "annotated_types" version))
(sha256
(base32 "0paaz0i4xqk335ji5w887i2bhgm2krnzr6by4sfgsgz50zl3jcsn"))))
(build-system pyproject-build-system)
(native-inputs
(list python-hatchling
python-pytest))
(propagated-inputs (list python-typing-extensions))
(home-page "https://github.com/annotated-types/annotated-types")
(synopsis "Reusable constraint types to use with typing.Annotated")
(description "This package provides metadata objects which can be used to
represent common constraints such as upper and lower bounds on scalar values and
collection sizes, a Predicate marker for runtime checks, and descriptions of how
we intend these metadata to be interpreted. In some cases, we also note
alternative representations which do not require this package.")
(license license:expat)))
(define-public python-anytree (define-public python-anytree
(package (package
(name "python-anytree") (name "python-anytree")
@ -7389,6 +7436,101 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.")
errors when data is invalid.") errors when data is invalid.")
(license license:expat))) (license license:expat)))
(define-public python-pydantic-2
(package
(inherit python-pydantic)
(name "python-pydantic")
(version "2.5.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pydantic" version))
(sha256
(base32 "0yiz75zp93x6x2czm772cz5pzn00i703irncjwb99c1m4p35gvxk"))))
(build-system pyproject-build-system)
(arguments
(list
#:test-flags #~(list "--ignore=tests/test_docs.py" ; no pytest_examples
;; need python-email-validator >= 2.0.0
"-k not test_fastapi_startup_perf")
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'pre-check
(lambda _
;; Remove the addopts from pyproject.toml, it breaks the 'check phase.
(substitute* "pyproject.toml"
(("'--benchmark") "#'--benchmark")))))))
(native-inputs
(list python-hatchling
python-hatch-fancy-pypi-readme
python-cloudpickle
python-dirty-equals
python-faker
python-pytest
python-pytest-benchmark
python-pytest-mock))
(propagated-inputs
(list python-annotated-types
python-pydantic-core
python-typing-extensions))))
(define-public python-pydantic-core
(package
(name "python-pydantic-core")
(version "2.14.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pydantic_core" version))
(sha256
(base32 "0j79pd6ixapsiwsigsxzmvbrpmdr7f7c4l9sl7xl6a1pjp9w3l0z"))))
(build-system cargo-build-system)
(arguments
(list
#:imported-modules `(,@%cargo-build-system-modules
,@%pyproject-build-system-modules)
#:modules '((guix build cargo-build-system)
((guix build pyproject-build-system) #:prefix py:)
(guix build utils))
#:phases
#~(modify-phases %standard-phases
(add-after 'prepare-python-module 'build-python-module
(assoc-ref py:%standard-phases 'build))
(add-after 'build-python-module 'install-python-module
(assoc-ref py:%standard-phases 'install)))
#:cargo-inputs
`(("rust-ahash" ,rust-ahash-0.8)
("rust-base64" ,rust-base64-0.21)
("rust-enum-dispatch" ,rust-enum-dispatch-0.3)
("rust-idna" ,rust-idna-0.4)
("rust-jiter" ,rust-jiter-0.0.4)
("rust-num-bigint" ,rust-num-bigint-0.4)
("rust-python3-dll-a" ,rust-python3-dll-a-0.2)
("rust-pyo3" ,rust-pyo3-0.20)
("rust-pyo3-build-config" ,rust-pyo3-build-config-0.20)
("rust-regex" ,rust-regex-1)
("rust-strum" ,rust-strum-0.25)
("rust-strum-macros" ,rust-strum-macros-0.25)
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-smallvec" ,rust-smallvec-1)
("rust-speedate" ,rust-speedate-0.13)
("rust-url" ,rust-url-2)
("rust-uuid" ,rust-uuid-1)
("rust-version-check" ,rust-version-check-0.9))
#:cargo-development-inputs
`(("rust-pyo3" ,rust-pyo3-0.20))
#:install-source? #false))
(native-inputs
(list maturin python-wrapper))
(propagated-inputs
(list python-typing-extensions))
(home-page "https://github.com/pydantic/pydantic-core")
(synopsis "Core validation logic for pydantic")
(description "This package provides the core functionality for pydantic
validation and serialization.")
(license license:expat)))
(define-public python-pydantic-cli (define-public python-pydantic-cli
(package (package
(name "python-pydantic-cli") (name "python-pydantic-cli")
@ -17898,17 +18040,17 @@ that deprecated code is eventually removed.")
(define-public python-jmespath (define-public python-jmespath
(package (package
(name "python-jmespath") (name "python-jmespath")
(version "1.0.0") (version "1.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "jmespath" version)) (uri (pypi-uri "jmespath" version))
(sha256 (sha256
(base32 (base32
"0pmzfi230zfgiq2rz896kbb9f7mp0lnrjdl6x1npvxfixn0f5454")))) "1gpdc1f0q5c9scmbw1l9g40jjfk3pxwg91ayvn7xbvvddlh1n9lh"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
(list python-nose)) (list python-pytest))
(synopsis "JSON Matching Expressions") (synopsis "JSON Matching Expressions")
(description "JMESPath (pronounced “james path”) is a Python library that (description "JMESPath (pronounced “james path”) is a Python library that
allows one to declaratively specify how to extract elements from a JSON allows one to declaratively specify how to extract elements from a JSON
@ -21731,20 +21873,6 @@ JSON) codec.")
reasoning, wrappers for natural language processing libraries.") reasoning, wrappers for natural language processing libraries.")
(license license:asl2.0))) (license license:asl2.0)))
;; Versions >=3.5 breaks backward-compatibility,
;; so we keep version 3.4.x around for a while.
(define-public python-nltk-3.4
(package
(inherit python-nltk)
(version "3.4.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "nltk" version ".zip"))
(sha256
(base32 "153x2clrnigs74jdgnn3qmljdjj4gprmvpdvh49i18ls4m8mbm5y"))))
(propagated-inputs (list python-six))))
(define-public python-pymongo (define-public python-pymongo
(package (package
(name "python-pymongo") (name "python-pymongo")
@ -31996,7 +32124,18 @@ and frame grabber interface.")
;; nondeterministically (see: ;; nondeterministically (see:
;; https://github.com/scikit-build/scikit-build/issues/711). ;; https://github.com/scikit-build/scikit-build/issues/711).
"and not test_generator_cleanup " "and not test_generator_cleanup "
"and not test_generator_selection ")))))))) "and not test_generator_selection "
;; … and there's more of them
"and not test_cxx_compiler "
"and not test_fortran_compiler ")))))
(add-after 'install 'install-cmake
(lambda* (#:key outputs #:allow-other-keys)
(let ((lib (string-append (assoc-ref outputs "out")
"/lib/cmake/modules")))
(mkdir-p lib)
(with-directory-excursion "skbuild/resources/cmake"
(for-each (lambda (file) (install-file file lib))
(find-files "." "\\.cmake")))))))))
(native-inputs (native-inputs
(list cmake-minimal (list cmake-minimal
gfortran gfortran

4
gnu/packages/qt.scm
View File

@ -1906,6 +1906,10 @@ compositor libraries.")))
qtbase qtbase
vulkan-headers vulkan-headers
wayland)) wayland))
(native-search-paths
(list (search-path-specification
(variable "QT_PLUGIN_PATH")
(files '("lib/qt6/plugins")))))
(synopsis "Qt Wayland module") (synopsis "Qt Wayland module")
(description "The Qt Wayland module provides the QtWayland client and (description "The Qt Wayland module provides the QtWayland client and
compositor libraries.") compositor libraries.")

1432
gnu/packages/rust-apps.scm
View File

File diff suppressed because it is too large Load Diff

414
gnu/packages/rust.scm
View File

@ -4,7 +4,7 @@
;;; Copyright © 2016 Nikita <nikita@n0.is> ;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org> ;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org>
;;; Copyright © 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2019-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
@ -46,8 +46,7 @@
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gdb) #:use-module (gnu packages gdb)
#:use-module (gnu packages jemalloc) #:use-module (gnu packages libffi)
#:use-module (gnu packages libunwind)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages mingw) #:use-module (gnu packages mingw)
@ -55,15 +54,18 @@
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages ssh) #:use-module (gnu packages ssh)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix build-system cargo) #:use-module (guix build-system cargo)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix search-paths)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix memoization) #:use-module (guix memoization)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix platform)
#:use-module ((guix build utils) #:select (alist-replace)) #:use-module ((guix build utils) #:select (alist-replace))
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix gexp) #:use-module (guix gexp)
@ -101,21 +103,6 @@
(define %cargo-reference-hash (define %cargo-reference-hash
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855") "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
(define* (nix-system->gnu-triplet-for-rust
#:optional (system (%current-system)))
(match system
("x86_64-linux" "x86_64-unknown-linux-gnu")
("i686-linux" "i686-unknown-linux-gnu")
("armhf-linux" "armv7-unknown-linux-gnueabihf")
("aarch64-linux" "aarch64-unknown-linux-gnu")
("mips64el-linux" "mips64el-unknown-linux-gnuabi64")
("riscv64-linux" "riscv64gc-unknown-linux-gnu")
("i586-gnu" "i686-unknown-hurd-gnu")
("i686-gnu" "i686-unknown-hurd-gnu")
("i686-mingw" "i686-pc-windows-gnu")
("x86_64-mingw" "x86_64-pc-windows-gnu")
(_ (nix-system->gnu-triplet system))))
(define* (rust-uri version #:key (dist "static")) (define* (rust-uri version #:key (dist "static"))
(string-append "https://" dist ".rust-lang.org/dist/" (string-append "https://" dist ".rust-lang.org/dist/"
"rustc-" version "-src.tar.gz")) "rustc-" version "-src.tar.gz"))
@ -137,27 +124,28 @@
;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's designed ;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's designed
;;; to be used in source form. ;;; to be used in source form.
(define %mrustc-commit "597593aba86fa2edbea80c6e09f0b1b2a480722d") (define %mrustc-commit "b6754f574f8846eb842feba4ccbeeecb10bdfacc")
(define %mrustc-source (define %mrustc-source
(let* ((version "0.10") (let* ((version "0.10.1")
(commit %mrustc-commit) (commit %mrustc-commit)
(revision "2") (revision "1")
(name "mrustc")) (name "mrustc"))
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/thepowersgang/mrustc") (url "https://github.com/thepowersgang/mrustc")
(commit commit))) (commit (string-append "v" version))))
(file-name (git-file-name name (git-version version revision commit))) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"09rvm3zgx1d86gippl8qzh13m641ynbw9q0zsc90g0h1khd3z3b6")) "0rqiif7rb5hg6ik3i1flldj311f014q4n9z8wb50cs8kspjz32di"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
;; Drastically reduces memory and build time requirements ;; Drastically reduces memory and build time requirements
;; by disabling debug by default. ;; by disabling debug by default.
(substitute* (find-files "." "Makefile") (substitute* (find-files "." "Makefile")
(("LINKFLAGS := -g") "LINKFLAGS :=")
(("-g ") ""))))))) (("-g ") "")))))))
;;; Rust 1.54 is special in that it is built with mrustc, which shortens the ;;; Rust 1.54 is special in that it is built with mrustc, which shortens the
@ -175,7 +163,9 @@
(snippet (snippet
'(begin '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
'("src/llvm-project")) '("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc"))
;; Remove vendored dynamically linked libraries. ;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF ;; find . -not -type d -executable -exec file {} \+ | grep ELF
(delete-file "vendor/vte/vim10m_match") (delete-file "vendor/vte/vim10m_match")
@ -183,23 +173,24 @@
;; Also remove the bundled (mostly Windows) libraries. ;; Also remove the bundled (mostly Windows) libraries.
;; find vendor -not -type d -exec file {} \+ | grep PE32 ;; find vendor -not -type d -exec file {} \+ | grep PE32
(for-each delete-file (for-each delete-file
(find-files "vendor" ".*\\.(a|dll|exe|lib)$")))) (find-files "vendor" "\\.(a|dll|exe|lib)$"))))
(patches (search-patches "rustc-1.54.0-src.patch")) (patches (search-patches "rustc-1.54.0-src.patch"))
(patch-flags '("-p0")))) ;default is -p1 (patch-flags '("-p0")))) ;default is -p1
(outputs '("out" "cargo")) (outputs '("out" "cargo"))
(properties '((hidden? . #t) (properties '((hidden? . #t)
(timeout . 72000) ;20 hours (timeout . 129600) ;36 hours
(max-silent-time . 18000))) ;5 hours (for armel) (max-silent-time . 18000))) ;5 hours (for armel)
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libcurl" ,curl) `(,@(if (or (target-ppc64le?)
(target-riscv64?))
`(("clang" ,clang-13))
`())
("llvm" ,llvm-13) ("llvm" ,llvm-13)
("openssl" ,openssl-1.1) ("openssl" ,openssl-1.1)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("bison" ,bison) `(("pkg-config" ,pkg-config)
("flex" ,flex)
("pkg-config" ,pkg-config)
;; Required for the libstd sources. ;; Required for the libstd sources.
("mrustc-source" ,%mrustc-source))) ("mrustc-source" ,%mrustc-source)))
(arguments (arguments
@ -213,11 +204,14 @@
#:validate-runpath? #f #:validate-runpath? #f
;; Most of the build is single-threaded. This also improves the ;; Most of the build is single-threaded. This also improves the
;; build time on machines with "only" 8GB of RAM. ;; build time on machines with "only" 8GB of RAM.
;; ppc64le regularly sees race conditions between various dependant crates.
#:parallel-build? ,(target-x86-64?) #:parallel-build? ,(target-x86-64?)
#:make-flags #:make-flags
(list ,(string-append "RUSTC_TARGET=" (list ,(string-append "RUSTC_TARGET="
(platform-rust-target
(lookup-platform-by-target-or-system
(or (%current-target-system) (or (%current-target-system)
(nix-system->gnu-triplet-for-rust))) (%current-system)))))
,(string-append "RUSTC_VERSION=" version) ,(string-append "RUSTC_VERSION=" version)
,(string-append "MRUSTC_TARGET_VER=" ,(string-append "MRUSTC_TARGET_VER="
(version-major+minor version)) (version-major+minor version))
@ -228,14 +222,15 @@
"OUTDIR_SUF=") ;do not add version suffix to output dir "OUTDIR_SUF=") ;do not add version suffix to output dir
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-reference-to-cc ,@(if (target-ppc64le?)
;; This prevents errors like 'error: linker `cc` not found' when `((add-after 'unpack 'patch-sources-for-newer-llvm
;; "cc" is not found on PATH. (lambda _
(lambda* (#:key inputs #:allow-other-keys) ;; Adjust some sources for llvm-13, see llvm commit
(let ((gcc (assoc-ref inputs "gcc"))) ;; acce401068e78a8c5dc9e06802111ffad3da763f
(substitute* (find-files "." "^link.rs$") (substitute* (find-files "." "powerpc64le_unknown_linux_gnu.rs")
(("\"cc\".as_ref") (("e-m:e-i64:64-n32:64-v256:256:256-v512:512:512")
(format #f "~s.as_ref" (string-append gcc "/bin/gcc"))))))) "e-m:e-i64:64-n32:64-S128-v256:256:256-v512:512:512")))))
'())
(add-after 'unpack 'setup-mrustc-sources (add-after 'unpack 'setup-mrustc-sources
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(copy-recursively (assoc-ref inputs "mrustc-source") "../mrustc") (copy-recursively (assoc-ref inputs "mrustc-source") "../mrustc")
@ -260,7 +255,9 @@
(string-append "LLVM_CONFIG := " llvm "/bin/llvm-config\n"))) (string-append "LLVM_CONFIG := " llvm "/bin/llvm-config\n")))
(substitute* "minicargo.mk" (substitute* "minicargo.mk"
;; Do not try to fetch sources from the Internet. ;; Do not try to fetch sources from the Internet.
(("@curl.*") "")) (("@curl.*") "")
(("\\$\\(MINICARGO\\) \\$\\(RUSTC_SRC_DL\\)")
"$(MINICARGO)"))
(substitute* "Makefile" (substitute* "Makefile"
;; Patch date and git obtained version information. ;; Patch date and git obtained version information.
((" -D VERSION_GIT_FULLHASH=.*") ((" -D VERSION_GIT_FULLHASH=.*")
@ -272,16 +269,7 @@
" -D VERSION_BUILDTIME=" " -D VERSION_BUILDTIME="
"\"\\\"Thu, 01 Jan 1970 00:00:01 +0000\\\"\"" "\"\\\"Thu, 01 Jan 1970 00:00:01 +0000\\\"\""
" -D VERSION_GIT_ISDIRTY=0\n"))) " -D VERSION_GIT_ISDIRTY=0\n")))
(substitute* "minicargo.mk"
;; Do not try to fetch sources from the Internet.
(("\\$\\(MINICARGO\\) \\$\\(RUSTC_SRC_DL\\)")
"$(MINICARGO)"))
(substitute* "run_rustc/Makefile" (substitute* "run_rustc/Makefile"
(("[$]Vtime ")
"$V ")
;; Unlock the number of parallel jobs for cargo.
(("-j [[:digit:]]+ ")
"")
;; Patch the shebang of a generated wrapper for rustc ;; Patch the shebang of a generated wrapper for rustc
(("#!/bin/sh") (("#!/bin/sh")
(string-append "#!" (which "sh")))) (string-append "#!" (which "sh"))))
@ -289,7 +277,7 @@
(("#!/bin/sh") (("#!/bin/sh")
(string-append "#!" (which "sh")))))))) (string-append "#!" (which "sh"))))))))
(add-after 'patch-generated-file-shebangs 'patch-cargo-checksums (add-after 'patch-generated-file-shebangs 'patch-cargo-checksums
(lambda* _ (lambda _
(substitute* "Cargo.lock" (substitute* "Cargo.lock"
(("(checksum = )\".*\"" all name) (("(checksum = )\".*\"" all name)
(string-append name "\"" ,%cargo-reference-hash "\""))) (string-append name "\"" ,%cargo-reference-hash "\"")))
@ -301,8 +289,12 @@
(setenv "CARGO_HOME" cargo-home)))) (setenv "CARGO_HOME" cargo-home))))
(replace 'configure (replace 'configure
(lambda _ (lambda _
(setenv "CC" "gcc") ,@(if (or (target-ppc64le?)
(setenv "CXX" "g++") (target-riscv64?))
`((setenv "CC" "clang")
(setenv "CXX" "clang++"))
`((setenv "CC" "gcc")
(setenv "CXX" "g++")))
;; The Guix LLVM package installs only shared libraries. ;; The Guix LLVM package installs only shared libraries.
(setenv "LLVM_LINK_SHARED" "1") (setenv "LLVM_LINK_SHARED" "1")
;; rustc still insists on having 'cc' on PATH in some places ;; rustc still insists on having 'cc' on PATH in some places
@ -313,8 +305,7 @@
(delete 'patch-generated-file-shebangs) (delete 'patch-generated-file-shebangs)
(replace 'build (replace 'build
(lambda* (#:key make-flags parallel-build? #:allow-other-keys) (lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(let* ((src-root (getcwd)) (let ((job-count (if parallel-build?
(job-count (if parallel-build?
(parallel-job-count) (parallel-job-count)
1))) 1)))
;; Adapted from: ;; Adapted from:
@ -335,10 +326,20 @@
(display "Building LIBS...\n") (display "Building LIBS...\n")
(apply invoke "make" "-f" "minicargo.mk" "LIBS" make-flags) (apply invoke "make" "-f" "minicargo.mk" "LIBS" make-flags)
;; The psm crate FTBFS on ppc64le with gcc.
(display "Building rustc...\n") (display "Building rustc...\n")
(apply invoke "make" "-f" "minicargo.mk" "output/rustc" (apply invoke "make" "-f" "minicargo.mk" "output/rustc"
make-flags) make-flags)
;; We can to continue the build with gcc after building rustc.
;; librustc_driver.so undefined reference to
;; `llvm::cfg::Update<llvm::BasicBlock*>::dump() const'
,@(if (or (target-ppc64le?)
(target-riscv64?))
`((setenv "CC" "gcc")
(setenv "CXX" "g++"))
`())
(display "Building cargo...\n") (display "Building cargo...\n")
(apply invoke "make" "-f" "minicargo.mk" "output/cargo" (apply invoke "make" "-f" "minicargo.mk" "output/cargo"
make-flags) make-flags)
@ -354,10 +355,12 @@
(rustc (string-append bin "/rustc")) (rustc (string-append bin "/rustc"))
(cargo-bin (string-append cargo "/bin")) (cargo-bin (string-append cargo "/bin"))
(lib (string-append out "/lib")) (lib (string-append out "/lib"))
(gnu-triplet ,(or (%current-target-system) (system-lib-prefix
(nix-system->gnu-triplet-for-rust))) (string-append lib "/rustlib/"
(system-lib-prefix (string-append lib "/rustlib/" ,(platform-rust-target
gnu-triplet "/lib"))) (lookup-platform-by-target-or-system
(or (%current-target-system)
(%current-system)))) "/lib")))
(mkdir-p (dirname rustc)) (mkdir-p (dirname rustc))
(copy-file "run_rustc/output/prefix/bin/rustc_binary" rustc) (copy-file "run_rustc/output/prefix/bin/rustc_binary" rustc)
(wrap-program rustc (wrap-program rustc
@ -374,9 +377,9 @@ safety and thread safety guarantees.")
;; therefore the build process needs 8GB of RAM while building. ;; therefore the build process needs 8GB of RAM while building.
;; It may support i686 soon: ;; It may support i686 soon:
;; <https://github.com/thepowersgang/mrustc/issues/78>. ;; <https://github.com/thepowersgang/mrustc/issues/78>.
;; XXX: The rust bootstrap is currently broken on riscv64, ;; List of systems where rust-bootstrap is explicitly known to build:
;; remove it until this is fixed. (supported-systems '("x86_64-linux" "aarch64-linux"
(supported-systems '("x86_64-linux" "aarch64-linux")) "riscv64-linux" "powerpc64le-linux"))
;; Dual licensed. ;; Dual licensed.
(license (list license:asl2.0 license:expat)))) (license (list license:asl2.0 license:expat))))
@ -395,6 +398,7 @@ safety and thread safety guarantees.")
'(begin '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
'("src/llvm-project" '("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc")) "vendor/tikv-jemalloc-sys/jemalloc"))
;; Remove vendored dynamically linked libraries. ;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF ;; find . -not -type d -executable -exec file {} \+ | grep ELF
@ -403,7 +407,7 @@ safety and thread safety guarantees.")
;; Also remove the bundled (mostly Windows) libraries. ;; Also remove the bundled (mostly Windows) libraries.
;; find vendor -not -type d -exec file {} \+ | grep PE32 ;; find vendor -not -type d -exec file {} \+ | grep PE32
(for-each delete-file (for-each delete-file
(find-files "vendor" ".*\\.(a|dll|exe|lib)$")) (find-files "vendor" "\\.(a|dll|exe|lib)$"))
;; Add support for riscv64-linux. ;; Add support for riscv64-linux.
(substitute* "vendor/tikv-jemallocator/src/lib.rs" (substitute* "vendor/tikv-jemallocator/src/lib.rs"
((" target_arch = \"s390x\"," all) ((" target_arch = \"s390x\"," all)
@ -451,16 +455,7 @@ safety and thread safety guarantees.")
(binutils (assoc-ref inputs "binutils")) (binutils (assoc-ref inputs "binutils"))
(rustc (assoc-ref inputs "rustc-bootstrap")) (rustc (assoc-ref inputs "rustc-bootstrap"))
(cargo (assoc-ref inputs "cargo-bootstrap")) (cargo (assoc-ref inputs "cargo-bootstrap"))
(llvm (assoc-ref inputs "llvm")) (llvm (assoc-ref inputs "llvm")))
(jemalloc (assoc-ref inputs "jemalloc")))
;; The compiler is no longer directly built against jemalloc, but
;; rather via the jemalloc-sys crate (which vendors the jemalloc
;; source). To use jemalloc we must enable linking to it (otherwise
;; it would use the system allocator), and set an environment
;; variable pointing to the compiled jemalloc.
(setenv "JEMALLOC_OVERRIDE"
(search-input-file inputs
"/lib/libjemalloc_pic.a"))
(call-with-output-file "config.toml" (call-with-output-file "config.toml"
(lambda (port) (lambda (port)
(display (string-append " (display (string-append "
@ -477,11 +472,11 @@ prefix = \"" out "\"
sysconfdir = \"etc\" sysconfdir = \"etc\"
[rust] [rust]
debug=false debug=false
jemalloc=true jemalloc=false
default-linker = \"" gcc "/bin/gcc" "\" default-linker = \"" gcc "/bin/gcc" "\"
channel = \"stable\" channel = \"stable\"
rpath = true rpath = true
[target." ,(nix-system->gnu-triplet-for-rust) "] [target." ,(platform-rust-target (lookup-platform-by-system (%current-system))) "]
llvm-config = \"" llvm "/bin/llvm-config" "\" llvm-config = \"" llvm "/bin/llvm-config" "\"
cc = \"" gcc "/bin/gcc" "\" cc = \"" gcc "/bin/gcc" "\"
cxx = \"" gcc "/bin/g++" "\" cxx = \"" gcc "/bin/g++" "\"
@ -502,9 +497,11 @@ ar = \"" binutils "/bin/ar" "\"
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(cargo-out (assoc-ref outputs "cargo")) (cargo-out (assoc-ref outputs "cargo"))
(gnu-triplet ,(or (%current-target-system) (build (string-append "build/"
(nix-system->gnu-triplet-for-rust))) ,(platform-rust-target
(build (string-append "build/" gnu-triplet))) (lookup-platform-by-target-or-system
(or (%current-target-system)
(%current-system)))))))
;; Manually do the installation instead of calling './x.py ;; Manually do the installation instead of calling './x.py
;; install', as that is slow and needlessly rebuilds some ;; install', as that is slow and needlessly rebuilds some
;; things. ;; things.
@ -534,32 +531,18 @@ ar = \"" binutils "/bin/ar" "\"
`("LIBRARY_PATH" ":" `("LIBRARY_PATH" ":"
suffix (,(string-append libc "/lib")))))))))) suffix (,(string-append libc "/lib"))))))))))
(native-inputs (native-inputs
`(("cmake" ,cmake-minimal) `(("pkg-config" ,pkg-config)
("pkg-config" ,pkg-config) ; For "cargo"
("python" ,python-wrapper) ("python" ,python-wrapper)
("rustc-bootstrap" ,rust-bootstrap) ("rustc-bootstrap" ,rust-bootstrap)
("cargo-bootstrap" ,rust-bootstrap "cargo") ("cargo-bootstrap" ,rust-bootstrap "cargo")))
("which" ,which)))
(inputs (inputs
`(("jemalloc" ,jemalloc) `(("llvm" ,llvm-13)
("llvm" ,llvm-13) ("openssl" ,openssl)))
("openssl" ,openssl)
("libssh2" ,libssh2) ; For "cargo"
("libcurl" ,curl))) ; For "cargo"
;; rustc invokes gcc, so we need to set its search paths accordingly. ;; rustc invokes gcc, so we need to set its search paths accordingly.
;; Note: duplicate its value here to cope with circular dependencies among
;; modules (see <https://bugs.gnu.org/31392>).
(native-search-paths (native-search-paths
(list (search-path-specification %gcc-search-paths)
(variable "C_INCLUDE_PATH") ;; Limit this to systems where the final rust compiler builds successfully.
(files '("include"))) (supported-systems '("x86_64-linux" "aarch64-linux" "riscv64-linux"))
(search-path-specification
(variable "CPLUS_INCLUDE_PATH")
(files '("include/c++" "include")))
(search-path-specification
(variable "LIBRARY_PATH")
(files '("lib" "lib64")))))
(supported-systems (delete "i586-gnu" %supported-systems))
(synopsis "Compiler for the Rust programming language") (synopsis "Compiler for the Rust programming language")
(description "Rust is a systems programming language that provides memory (description "Rust is a systems programming language that provides memory
safety and thread safety guarantees.") safety and thread safety guarantees.")
@ -574,14 +557,14 @@ safety and thread safety guarantees.")
(package (package
(inherit base-rust) (inherit base-rust)
(arguments (arguments
(substitute-keyword-arguments (package-arguments base-rust) (substitute-keyword-arguments
((#:validate-runpath? _ #t) (strip-keyword-arguments '(#:validate-runpath?)
#t) (package-arguments base-rust))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(delete 'add-cc-shim-to-path) (delete 'add-cc-shim-to-path)
(add-after 'patch-generated-file-shebangs 'patch-cargo-checksums (add-after 'patch-generated-file-shebangs 'patch-cargo-checksums
(lambda* _ (lambda _
(substitute* "Cargo.lock" (substitute* "Cargo.lock"
(("(checksum = )\".*\"" all name) (("(checksum = )\".*\"" all name)
(string-append name "\"" ,%cargo-reference-hash "\""))) (string-append name "\"" ,%cargo-reference-hash "\"")))
@ -651,6 +634,7 @@ safety and thread safety guarantees.")
'(begin '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
'("src/llvm-project" '("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc")) "vendor/tikv-jemalloc-sys/jemalloc"))
;; Remove vendored dynamically linked libraries. ;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF ;; find . -not -type d -executable -exec file {} \+ | grep ELF
@ -658,7 +642,7 @@ safety and thread safety guarantees.")
(delete-file "vendor/vte/vim10m_table") (delete-file "vendor/vte/vim10m_table")
;; Also remove the bundled (mostly Windows) libraries. ;; Also remove the bundled (mostly Windows) libraries.
(for-each delete-file (for-each delete-file
(find-files "vendor" ".*\\.(a|dll|exe|lib)$"))))))))) (find-files "vendor" "\\.(a|dll|exe|lib)$")))))))))
(define-public rust-1.62 (define-public rust-1.62
(rust-bootstrapped-package (rust-bootstrapped-package
@ -677,6 +661,27 @@ safety and thread safety guarantees.")
(source (source
(origin (origin
(inherit (package-source base-rust)) (inherit (package-source base-rust))
(snippet
'(begin
(for-each delete-file-recursively
'("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc"))
;; ERROR: could not find native static library
;; `rustix_outline_powerpc64`, perhaps an -L flag is missing?
;; Adjust rustix to always build with cc.
(substitute* "src/bootstrap/Cargo.lock"
(("\"errno\",") "\"cc\",\n \"errno\","))
;; Add a dependency on the the 'cc' feature of rustix.
(substitute* "vendor/fd-lock/Cargo.toml"
(("\"fs\"") "\"fs\", \"cc\""))
;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF
(delete-file "vendor/vte/vim10m_match")
(delete-file "vendor/vte/vim10m_table")
;; Also remove the bundled (mostly Windows) libraries.
(for-each delete-file
(find-files "vendor" "\\.(a|dll|exe|lib)$"))))
(patches (search-patches "rust-1.64-fix-riscv64-bootstrap.patch")) (patches (search-patches "rust-1.64-fix-riscv64-bootstrap.patch"))
(patch-flags '("-p1" "--reverse")))) (patch-flags '("-p1" "--reverse"))))
(arguments (arguments
@ -714,6 +719,31 @@ safety and thread safety guarantees.")
rust-1.66 "1.67.1" "0vpzv6rm3w1wbni17ryvcw83k5klhghklylfdza3nnp8blz3sj26"))) rust-1.66 "1.67.1" "0vpzv6rm3w1wbni17ryvcw83k5klhghklylfdza3nnp8blz3sj26")))
(package (package
(inherit base-rust) (inherit base-rust)
(source
(origin
(inherit (package-source base-rust))
(snippet
'(begin
(for-each delete-file-recursively
'("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc"))
;; Adjust rustix to always build with cc.
(substitute* '("Cargo.lock"
"src/bootstrap/Cargo.lock")
(("\"errno\",") "\"cc\",\n \"errno\","))
;; Add a dependency on the the 'cc' feature of rustix.
(substitute* "vendor/fd-lock/Cargo.toml"
(("\"fs\"") "\"fs\", \"cc\""))
(substitute* "vendor/is-terminal/Cargo.toml"
(("\"termios\"") "\"termios\", \"cc\""))
;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF
(delete-file "vendor/vte/vim10m_match")
(delete-file "vendor/vte/vim10m_table")
;; Also remove the bundled (mostly Windows) libraries.
(for-each delete-file
(find-files "vendor" "\\.(a|dll|exe|lib)$"))))))
(inputs (modify-inputs (package-inputs base-rust) (inputs (modify-inputs (package-inputs base-rust)
(replace "llvm" llvm-15)))))) (replace "llvm" llvm-15))))))
@ -735,7 +765,17 @@ safety and thread safety guarantees.")
'(begin '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
'("src/llvm-project" '("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc")) "vendor/tikv-jemalloc-sys/jemalloc"))
;; Adjust rustix to always build with cc.
(substitute* '("Cargo.lock"
"src/bootstrap/Cargo.lock")
(("\"errno\",") "\"cc\",\n \"errno\","))
;; Add a dependency on the the 'cc' feature of rustix.
(substitute* "vendor/fd-lock/Cargo.toml"
(("\"fs\"") "\"fs\", \"cc\""))
(substitute* "vendor/is-terminal/Cargo.toml"
(("\"termios\"") "\"termios\", \"cc\""))
;; Also remove the bundled (mostly Windows) libraries. ;; Also remove the bundled (mostly Windows) libraries.
(for-each delete-file (for-each delete-file
(find-files "vendor" "\\.(a|dll|exe|lib)$"))))))))) (find-files "vendor" "\\.(a|dll|exe|lib)$")))))))))
@ -750,6 +790,22 @@ safety and thread safety guarantees.")
(source (source
(origin (origin
(inherit (package-source base-rust)) (inherit (package-source base-rust))
(snippet
'(begin
(for-each delete-file-recursively
'("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc"))
;; Adjust rustix to always build with cc.
(substitute* "Cargo.lock"
(("\"errno\",") "\"cc\",\n \"errno\","))
;; Add a dependency on the the 'cc' feature of rustix.
(substitute* '("vendor/is-terminal/Cargo.toml"
"vendor/is-terminal-0.4.4/Cargo.toml")
(("\"termios\"") "\"termios\", \"cc\""))
;; Also remove the bundled (mostly Windows) libraries.
(for-each delete-file
(find-files "vendor" "\\.(a|dll|exe|lib)$"))))
;; Rust 1.70 adds the rustix library which depends on the vendored ;; Rust 1.70 adds the rustix library which depends on the vendored
;; fd-lock crate. The fd-lock crate uses Outline assembly which expects ;; fd-lock crate. The fd-lock crate uses Outline assembly which expects
;; a precompiled static library. Enabling the "cc" feature tells the ;; a precompiled static library. Enabling the "cc" feature tells the
@ -763,6 +819,26 @@ safety and thread safety guarantees.")
rust-1.70 "1.71.1" "0bj79syjap1kgpg9pc0r4jxc0zkxwm6phjf3digsfafms580vabg"))) rust-1.70 "1.71.1" "0bj79syjap1kgpg9pc0r4jxc0zkxwm6phjf3digsfafms580vabg")))
(package (package
(inherit base-rust) (inherit base-rust)
(source
(origin
(inherit (package-source base-rust))
(snippet
'(begin
(for-each delete-file-recursively
'("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc"))
;; Adjust rustix to always build with cc.
(substitute* '("Cargo.lock"
"src/tools/cargo/Cargo.lock")
(("\"errno\",") "\"cc\",\n \"errno\","))
;; Add a dependency on the the 'cc' feature of rustix.
(substitute* '("vendor/is-terminal/Cargo.toml"
"vendor/is-terminal-0.4.6/Cargo.toml")
(("\"termios\"") "\"termios\", \"cc\""))
;; Also remove the bundled (mostly Windows) libraries.
(for-each delete-file
(find-files "vendor" "\\.(a|dll|exe|lib)$"))))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments base-rust) (substitute-keyword-arguments (package-arguments base-rust)
((#:phases phases) ((#:phases phases)
@ -789,13 +865,17 @@ safety and thread safety guarantees.")
'(begin '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
'("src/llvm-project" '("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc")) "vendor/tikv-jemalloc-sys/jemalloc"))
;; Remove vendored dynamically linked libraries. ;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF ;; find . -not -type d -executable -exec file {} \+ | grep ELF
;; Also remove the bundled (mostly Windows) libraries. ;; Also remove the bundled (mostly Windows) libraries.
(for-each delete-file (for-each delete-file
(find-files "vendor" "\\.(a|dll|exe|lib)$")) (find-files "vendor" "\\.(a|dll|exe|lib)$"))
;; Adjust rustc_driver to explicitly use rustix with libc backend. ;; Adjust some crates to explicitly use rustix with the libc backend.
(substitute* '("vendor/is-terminal/Cargo.toml"
"vendor/is-terminal-0.4.7/Cargo.toml")
(("\"termios\"") "\"termios\", \"use-libc\""))
(substitute* "compiler/rustc_driver/Cargo.toml" (substitute* "compiler/rustc_driver/Cargo.toml"
(("rustix = \"=0.37.11\"") (("rustix = \"=0.37.11\"")
(string-append "rustix = { version = \"=0.37.11\"," (string-append "rustix = { version = \"=0.37.11\","
@ -813,6 +893,7 @@ safety and thread safety guarantees.")
'(begin '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
'("src/llvm-project" '("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc")) "vendor/tikv-jemalloc-sys/jemalloc"))
;; Remove vendored dynamically linked libraries. ;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF ;; find . -not -type d -executable -exec file {} \+ | grep ELF
@ -824,6 +905,48 @@ safety and thread safety guarantees.")
(("features = \\[\"fs\"" all) (("features = \\[\"fs\"" all)
(string-append all ", \"use-libc\"")))))))))) (string-append all ", \"use-libc\""))))))))))
(define rust-1.74
(let ((base-rust (rust-bootstrapped-package rust-1.73 "1.74.1"
"07930r17dkj3dnsrmilywb6p9i2g2jx56ndfpa2wh8crzhi3xnv7")))
(package
(inherit base-rust)
(source
(origin
(inherit (package-source base-rust))
(snippet
'(begin
(for-each delete-file-recursively
'("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc"))
;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF
;; Also remove the bundled (mostly Windows) libraries.
(for-each delete-file
(find-files "vendor" "\\.(a|dll|exe|lib)$"))
;; Adjust vendored dependency to explicitly use rustix with libc backend.
(substitute* "vendor/tempfile/Cargo.toml"
(("features = \\[\"fs\"" all)
(string-append all ", \"use-libc\"")))))))
(arguments
(if (target-riscv64?)
(substitute-keyword-arguments (package-arguments base-rust)
((#:phases phases)
`(modify-phases ,phases
;; This phase is no longer needed.
(delete 'revert-riscv-pause-instruction))))
(package-arguments base-rust))))))
(define rust-1.75
(let ((base-rust (rust-bootstrapped-package rust-1.74 "1.75.0"
"1260mf3066ki6y55pvr35lnf54am6z96a3ap3hniwd4xpi2rywsv")))
(package
(inherit base-rust)
(source
(origin
(inherit (package-source base-rust))
(patches '()))))))
(define (make-ignore-test-list strs) (define (make-ignore-test-list strs)
"Function to make creating a list to ignore tests a bit easier." "Function to make creating a list to ignore tests a bit easier."
(map (lambda (str) (map (lambda (str)
@ -838,15 +961,47 @@ safety and thread safety guarantees.")
;;; Here we take the latest included Rust, make it public, and re-enable tests ;;; Here we take the latest included Rust, make it public, and re-enable tests
;;; and extra components such as rustfmt. ;;; and extra components such as rustfmt.
(define-public rust (define-public rust
(let ((base-rust rust-1.73)) (let ((base-rust rust-1.75))
(package (package
(inherit base-rust) (inherit base-rust)
(properties (alist-delete 'hidden? (package-properties base-rust))) (properties (alist-delete 'hidden? (package-properties base-rust)))
(outputs (cons* "rust-src" "tools" (package-outputs base-rust))) (outputs (cons* "rust-src" "tools" (package-outputs base-rust)))
(source
(origin
(inherit (package-source base-rust))
(snippet
'(begin
(for-each delete-file-recursively
'("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc"
;; These are referenced by the cargo output
;; so we unbundle them.
"vendor/curl-sys/curl"
"vendor/curl-sys-0.4.63+curl-8.1.2/curl"
"vendor/libffi-sys/libffi"
"vendor/libnghttp2-sys/nghttp2"
"vendor/libz-sys/src/zlib"))
;; Use the packaged nghttp2
(delete-file "vendor/libnghttp2-sys/build.rs")
(with-output-to-file "vendor/libnghttp2-sys/build.rs"
(lambda _
(format #t "fn main() {~@
println!(\"cargo:rustc-link-lib=nghttp2\");~@
}~%")))
;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF
;; Also remove the bundled (mostly Windows) libraries.
(for-each delete-file
(find-files "vendor" "\\.(a|dll|exe|lib)$"))
;; Adjust vendored dependency to explicitly use rustix with libc backend.
(substitute* "vendor/tempfile/Cargo.toml"
(("features = \\[\"fs\"" all)
(string-append all ", \"use-libc\"")))))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments base-rust) (substitute-keyword-arguments
((#:tests? _ #f) (strip-keyword-arguments '(#:tests?)
(not (%current-target-system))) (package-arguments base-rust))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'relax-gdb-auto-load-safe-path (add-after 'unpack 'relax-gdb-auto-load-safe-path
@ -906,6 +1061,19 @@ safety and thread safety guarantees.")
(substitute* "patch.rs" (substitute* "patch.rs"
,@(make-ignore-test-list ,@(make-ignore-test-list
'("fn gitoxide_clones_shallow_old_git_patch")))))) '("fn gitoxide_clones_shallow_old_git_patch"))))))
,@(if (target-riscv64?)
;; Keep this phase separate so it can be adjusted without needing
;; to adjust the skipped tests on other architectures.
`((add-after 'unpack 'disable-tests-broken-on-riscv64
(lambda _
(with-directory-excursion "src/tools/cargo/tests/testsuite"
(substitute* "build.rs"
,@(make-ignore-test-list
'("fn uplift_dwp_of_bin_on_linux")))
(substitute* "cache_lock.rs"
,@(make-ignore-test-list
'("fn multiple_download")))))))
`())
(add-after 'unpack 'disable-tests-broken-on-aarch64 (add-after 'unpack 'disable-tests-broken-on-aarch64
(lambda _ (lambda _
(with-directory-excursion "src/tools/cargo/tests/testsuite/" (with-directory-excursion "src/tools/cargo/tests/testsuite/"
@ -978,7 +1146,7 @@ safety and thread safety guarantees.")
;; different outputs while reusing the shared libraries. ;; different outputs while reusing the shared libraries.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* "src/bootstrap/builder.rs" (substitute* "src/bootstrap/src/core/builder.rs"
((" = rpath.*" all) ((" = rpath.*" all)
(string-append all (string-append all
" " " "
@ -1041,6 +1209,12 @@ safety and thread safety guarantees.")
(mkdir-p (string-append out dest)) (mkdir-p (string-append out dest))
(copy-recursively "library" (string-append out dest "/library")) (copy-recursively "library" (string-append out dest "/library"))
(copy-recursively "src" (string-append out dest "/src"))))) (copy-recursively "src" (string-append out dest "/src")))))
(add-after 'install 'remove-uninstall-script
(lambda* (#:key outputs #:allow-other-keys)
;; This script has no use on Guix
;; and it retains a reference to the host's bash.
(delete-file (string-append (assoc-ref outputs "out")
"/lib/rustlib/uninstall.sh"))))
(add-after 'install-rust-src 'wrap-rust-analyzer (add-after 'install-rust-src 'wrap-rust-analyzer
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "tools") "/bin"))) (let ((bin (string-append (assoc-ref outputs "tools") "/bin")))
@ -1056,6 +1230,9 @@ exec -a \"$0\" \"~a\" \"$@\""
"/lib/rustlib/src/rust/library") "/lib/rustlib/src/rust/library")
(string-append bin "/.rust-analyzer-real")))) (string-append bin "/.rust-analyzer-real"))))
(chmod (string-append bin "/rust-analyzer") #o755)))))))) (chmod (string-append bin "/rust-analyzer") #o755))))))))
(inputs
(modify-inputs (package-inputs base-rust)
(prepend curl libffi `(,nghttp2 "lib") zlib)))
;; Add test inputs. ;; Add test inputs.
(native-inputs (cons* `("gdb" ,gdb/pinned) (native-inputs (cons* `("gdb" ,gdb/pinned)
`("procps" ,procps) `("procps" ,procps)
@ -1109,7 +1286,7 @@ exec -a \"$0\" \"~a\" \"$@\""
(("\\.ceil\\(\\)") "")) (("\\.ceil\\(\\)") ""))
;; gcc doesn't recognize this flag. ;; gcc doesn't recognize this flag.
(substitute* (substitute*
"compiler/rustc_target/src/spec/windows_gnullvm_base.rs" "compiler/rustc_target/src/spec/base/windows_gnullvm.rs"
((", \"--unwindlib=none\"") ""))))) ((", \"--unwindlib=none\"") "")))))
`()) `())
(replace 'set-env (replace 'set-env
@ -1158,7 +1335,7 @@ docs = false
python = \"" (which "python") "\" python = \"" (which "python") "\"
vendor = true vendor = true
submodules = false submodules = false
target = [\"" ,(nix-system->gnu-triplet-for-rust (gnu-triplet->nix-system target)) "\"] target = [\"" ,(platform-rust-target (lookup-platform-by-target target)) "\"]
[install] [install]
prefix = \"" out "\" prefix = \"" out "\"
sysconfdir = \"etc\" sysconfdir = \"etc\"
@ -1167,14 +1344,14 @@ debug = false
jemalloc = false jemalloc = false
default-linker = \"" target-cc "\" default-linker = \"" target-cc "\"
channel = \"stable\" channel = \"stable\"
[target." ,(nix-system->gnu-triplet-for-rust) "] [target." ,(platform-rust-target (lookup-platform-by-system (%current-system))) "]
# These are all native tools # These are all native tools
llvm-config = \"" (search-input-file inputs "/bin/llvm-config") "\" llvm-config = \"" (search-input-file inputs "/bin/llvm-config") "\"
linker = \"" (which "gcc") "\" linker = \"" (which "gcc") "\"
cc = \"" (which "gcc") "\" cc = \"" (which "gcc") "\"
cxx = \"" (which "g++") "\" cxx = \"" (which "g++") "\"
ar = \"" (which "ar") "\" ar = \"" (which "ar") "\"
[target." ,(nix-system->gnu-triplet-for-rust (gnu-triplet->nix-system target)) "] [target." ,(platform-rust-target (lookup-platform-by-target target)) "]
llvm-config = \"" (search-input-file inputs "/bin/llvm-config") "\" llvm-config = \"" (search-input-file inputs "/bin/llvm-config") "\"
linker = \"" target-cc "\" linker = \"" target-cc "\"
cc = \"" target-cc "\" cc = \"" target-cc "\"
@ -1195,12 +1372,6 @@ ar = \"" (search-input-file inputs (string-append "/bin/" ,(ar-for-target target
(replace 'install (replace 'install
(lambda _ (lambda _
(invoke "./x.py" "install" "library/std"))) (invoke "./x.py" "install" "library/std")))
(add-after 'install 'remove-uninstall-script
(lambda* (#:key outputs #:allow-other-keys)
;; This script has no use on Guix
;; and it retains a reference to the host's bash.
(delete-file (string-append (assoc-ref outputs "out")
"/lib/rustlib/uninstall.sh"))))
(delete 'install-rust-src) (delete 'install-rust-src)
(delete 'wrap-rust-analyzer) (delete 'wrap-rust-analyzer)
(delete 'wrap-rustc))))) (delete 'wrap-rustc)))))
@ -1223,8 +1394,7 @@ ar = \"" (search-input-file inputs (string-append "/bin/" ,(ar-for-target target
(cross-binutils target) (cross-binutils target)
(if (string=? "i686-w64-mingw32" target) (if (string=? "i686-w64-mingw32" target)
mingw-w64-i686-winpthreads mingw-w64-i686-winpthreads
mingw-w64-x86_64-winpthreads) mingw-w64-x86_64-winpthreads)))
libunwind))
(modify-inputs (package-native-inputs base-rust) (modify-inputs (package-native-inputs base-rust)
(prepend (cross-gcc target (prepend (cross-gcc target
#:libc (cross-libc target)) #:libc (cross-libc target))

4
gnu/packages/sequoia.scm
View File

@ -27,7 +27,11 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base) ; glibc #:use-module (gnu packages base) ; glibc
#:use-module (gnu packages crates-crypto)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-tls)
#:use-module (gnu packages crates-web)
#:use-module (gnu packages crates-windows)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages nettle) #:use-module (gnu packages nettle)

60
gnu/packages/shells.scm
View File

@ -22,6 +22,7 @@
;;; Copyright © 2022 Andrew Tropin <andrew@trop.in> ;;; Copyright © 2022 Andrew Tropin <andrew@trop.in>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 David Pflug <david@pflug.io> ;;; Copyright © 2023 David Pflug <david@pflug.io>
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
;;; Copyright © 2024 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2024 Tanguy Le Carrour <tanguy@bioneland.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -46,8 +47,11 @@
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages crates-crypto)
#:use-module (gnu packages crates-graphics) #:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-web)
#:use-module (gnu packages crates-windows)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
@ -1035,8 +1039,56 @@ directory. These values can be piped through a series of steps, in a series
of commands called a ``pipeline''.") of commands called a ``pipeline''.")
(license license:expat))) (license license:expat)))
(define-public rust-nu-ansi-term-0.49
(package
(name "rust-nu-ansi-term")
(version "0.49.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "nu-ansi-term" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0s2svfnircd9jp06wk55qcbb9v5cadkfcjfg99vm21qdjg0x6wy0"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-serde" ,rust-serde-1)
("rust-windows-sys" ,rust-windows-sys-0.48))
#:cargo-development-inputs
(("rust-doc-comment" ,rust-doc-comment-0.3)
("rust-serde-json" ,rust-serde-json-1))))
(home-page "https://www.nushell.sh")
(synopsis "Library for ANSI terminal colors and styles (bold, underline)")
(description
"This package is a library for ANSI terminal colors and styles (bold,
underline).")
(license license:expat)))
(define-public rust-nu-ansi-term-0.46
(package
(inherit rust-nu-ansi-term-0.49)
(name "rust-nu-ansi-term")
(version "0.46.0")
(source (origin
(method url-fetch)
(uri (crate-uri "nu-ansi-term" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "115sywxh53p190lyw97alm14nc004qj5jm5lvdj608z84rbida3p"))))
(arguments
`(#:cargo-inputs
(("rust-overload" ,rust-overload-0.1)
("rust-serde" ,rust-serde-1)
("rust-winapi" ,rust-winapi-0.3))
#:cargo-development-inputs
(("rust-doc-comment" ,rust-doc-comment-0.3)
("rust-regex" ,rust-regex-1)
("rust-serde-json" ,rust-serde-json-1))))))
(define-public rust-nu-ansi-term-0.44 (define-public rust-nu-ansi-term-0.44
(package (package
(inherit rust-nu-ansi-term-0.49)
(name "rust-nu-ansi-term") (name "rust-nu-ansi-term")
(version "0.44.0") (version "0.44.0")
(source (source
@ -1053,13 +1105,7 @@ of commands called a ``pipeline''.")
(("rust-doc-comment" ,rust-doc-comment-0.3) (("rust-doc-comment" ,rust-doc-comment-0.3)
("rust-overload" ,rust-overload-0.1) ("rust-overload" ,rust-overload-0.1)
("rust-serde" ,rust-serde-1) ("rust-serde" ,rust-serde-1)
("rust-winapi" ,rust-winapi-0.3)))) ("rust-winapi" ,rust-winapi-0.3))))))
(home-page "https://www.nushell.sh")
(synopsis "Library for ANSI terminal colors and styles (bold, underline)")
(description
"This package is a library for ANSI terminal colors and styles (bold,
underline).")
(license license:expat)))
(define-public rust-nu-cli-0.44 (define-public rust-nu-cli-0.44
(package (package

35
gnu/packages/statistics.scm
View File

@ -115,7 +115,7 @@
(define-public pspp (define-public pspp
(package (package
(name "pspp") (name "pspp")
(version "1.4.1") (version "2.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -123,11 +123,16 @@
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan")))) "1pyqlab9kw65wxc8pilcwb64l18w37xxdg3r6n287c7mda4cpxm8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:phases (list #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-test-suite
(lambda _
(substitute* "tests/output/tex.at"
(("AT_CHECK\\(\\[LC_ALL=C.UTF-8 pspp")
"AT_CHECK([LC_ALL=en_US.UTF-8 pspp"))))
(add-before 'check 'prepare-tests (add-before 'check 'prepare-tests
;; Prevent irrelevant errors that cause test output mismatches: ;; Prevent irrelevant errors that cause test output mismatches:
;; ‘Fontconfig error: No writable cache directories’ ;; ‘Fontconfig error: No writable cache directories’
@ -149,7 +154,7 @@
`(,glib "bin") ;for glib-genmarshal `(,glib "bin") ;for glib-genmarshal
perl perl
pkg-config pkg-config
python-2 ;for tests python-3 ;for tests
texinfo)) texinfo))
(home-page "https://www.gnu.org/software/pspp/") (home-page "https://www.gnu.org/software/pspp/")
(synopsis "Statistical analysis") (synopsis "Statistical analysis")
@ -509,14 +514,14 @@ available, greatly increasing its breadth and scope.")
(define-public r-boot (define-public r-boot
(package (package
(name "r-boot") (name "r-boot")
(version "1.3-29") (version "1.3-30")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "boot" version)) (uri (cran-uri "boot" version))
(sha256 (sha256
(base32 (base32
"1zgvy7n01qyxk52yhk43d7z7c36nr54z98vqwmjdlmhx4zyj0s7f")))) "15zysf5manfsap7x0zvjzgdvs9whv137iasjydp1php6sqmxc2am"))))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/boot") (home-page "https://cran.r-project.org/web/packages/boot")
(synopsis "Bootstrap functions for R") (synopsis "Bootstrap functions for R")
@ -1259,13 +1264,13 @@ using just two functions: melt and dcast (or acast).")
(define-public r-ggplot2 (define-public r-ggplot2
(package (package
(name "r-ggplot2") (name "r-ggplot2")
(version "3.4.4") (version "3.5.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ggplot2" version)) (uri (cran-uri "ggplot2" version))
(sha256 (sha256
(base32 "0iiywrzv8j0npasvzgkxwhw0zqisf4xmpx06jl0lsq1ybl3fqxid")))) (base32 "1qlh231dwsa7j0pzlw6xdm68d7r0v64916p66bg9lh1dw3a1ryh7"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-cli (list r-cli
@ -1297,13 +1302,13 @@ aesthetic attributes.")
(define-public r-ggdendro (define-public r-ggdendro
(package (package
(name "r-ggdendro") (name "r-ggdendro")
(version "0.1.23") (version "0.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "ggdendro" version)) (uri (cran-uri "ggdendro" version))
(sha256 (sha256
(base32 (base32
"1f4fz9llmbpb8gh90aid7dvriadx16xdhsl7832yw4pyqj4fjcrs")))) "0sdayyzvhkbli0ha68mc0f7cgp36njv9ign37d63l21hvd6w6h0r"))))
(build-system r-build-system) (build-system r-build-system)
(propagated-inputs (propagated-inputs
(list r-ggplot2 r-mass)) (list r-ggplot2 r-mass))
@ -1323,14 +1328,14 @@ agnes cluster diagrams.")
(define-public r-gdtools (define-public r-gdtools
(package (package
(name "r-gdtools") (name "r-gdtools")
(version "0.3.5") (version "0.3.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "gdtools" version)) (uri (cran-uri "gdtools" version))
(sha256 (sha256
(base32 (base32
"155qa55wr9vf2j2j4qjqqlkdaqlvvlvsm2wmysnhli47bfh6vd4c")))) "1d1sidm2qi1nrp1hhf010xji66aj8sn833fv4a39gli2c560p4i6"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
@ -4989,14 +4994,14 @@ conversion of R objects to LaTeX code, and recoding variables.")
(define-public r-runit (define-public r-runit
(package (package
(name "r-runit") (name "r-runit")
(version "0.4.32") (version "0.4.33")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "RUnit" version)) (uri (cran-uri "RUnit" version))
(sha256 (sha256
(base32 (base32
"1wc1gwb7yw7phf8b0gkig6c23klya3ax11c6i4s0f049k42r78r3")))) "0pybwvd57vf71vvlxdrynw5n6s5gnbqnwvq0qpd395ggqypwb95j"))))
(properties `((upstream-name . "RUnit"))) (properties `((upstream-name . "RUnit")))
(build-system r-build-system) (build-system r-build-system)
(home-page "https://cran.r-project.org/web/packages/RUnit") (home-page "https://cran.r-project.org/web/packages/RUnit")
@ -5614,14 +5619,14 @@ models, generalized linear models and model-based clustering.")
(define-public r-mclust (define-public r-mclust
(package (package
(name "r-mclust") (name "r-mclust")
(version "6.0.1") (version "6.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (cran-uri "mclust" version)) (uri (cran-uri "mclust" version))
(sha256 (sha256
(base32 (base32
"0zsk89r2l73zi1dy0195k84n4dqdp97yisll5kg16amxs5pxx4hf")))) "0mchdxkc3y0v6dw8fzjnlqd6f3zrafm3xf1c53s6ps529b66kx2x"))))
(build-system r-build-system) (build-system r-build-system)
(native-inputs (native-inputs
(list gfortran r-knitr)) (list gfortran r-knitr))

6
gnu/packages/syndication.scm
View File

@ -41,6 +41,7 @@
#:use-module (gnu packages build-tools) #:use-module (gnu packages build-tools)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
#:use-module (gnu packages crates-crypto)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
@ -223,14 +224,14 @@ cards.")
(define-public newsboat (define-public newsboat
(package (package
(name "newsboat") (name "newsboat")
(version "2.33") (version "2.34")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://newsboat.org/releases/" version (uri (string-append "https://newsboat.org/releases/" version
"/newsboat-" version ".tar.xz")) "/newsboat-" version ".tar.xz"))
(sha256 (sha256
(base32 "1yilrfa8h63x24mcl8a6a17fsaa12imhl337br7g2dw3c1g0v78p")))) (base32 "0kj3qbm3881fkrplvgnng4747bh29a8f2hhm7a2gc1n9n0wvbmvk"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
@ -266,7 +267,6 @@ cards.")
("rust-md5" ,rust-md5-0.7) ("rust-md5" ,rust-md5-0.7)
("rust-natord" ,rust-natord-1) ("rust-natord" ,rust-natord-1)
("rust-nom" ,rust-nom-7) ("rust-nom" ,rust-nom-7)
("rust-once-cell" ,rust-once-cell-1)
("rust-percent-encoding" ,rust-percent-encoding-2) ("rust-percent-encoding" ,rust-percent-encoding-2)
("rust-url" ,rust-url-2) ("rust-url" ,rust-url-2)
("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-unicode-width" ,rust-unicode-width-0.1)

100
gnu/packages/terminals.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015-2021, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015-2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com> ;;; Copyright © 2016 Mckinley Olsen <mck.olsen@gmail.com>
;;; Copyright © 2016, 2017, 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016, 2017, 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
@ -76,8 +76,10 @@
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages crates-apple)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-graphics) #:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-windows)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages dlang) #:use-module (gnu packages dlang)
@ -1510,10 +1512,11 @@ basic input/output.")
(define-public alacritty (define-public alacritty
(package (package
(name "alacritty") (name "alacritty")
(version "0.12.3") (version "0.13.1")
(source (source
(origin (origin
;; XXX: The crate at "crates.io" has limited contents. In particular, ;; XXX: The crate at "crates.io" contains only the alacritty subproject
;; of alacritty and thus has limited contents. In particular,
;; it does not contain "extra" directory with completions, icon, etc. ;; it does not contain "extra" directory with completions, icon, etc.
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1521,43 +1524,58 @@ basic input/output.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1jbyxnza38c22k7ri8apzn03q91l06isj8la9xca7cz06kn0hha9")))) (base32 "1y5xc9ryn9r0adygq53vrbpb8lazkmcqw38q978pbf0i57nwczrn"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:install-source? #f ; virtual manifest `(#:install-source? #f
#:cargo-test-flags
'("--release" "--"
;; Completions generated with a different minor version of clap?
"--skip=cli::tests::completions")
#:cargo-inputs #:cargo-inputs
(("rust-alacritty-config" ,rust-alacritty-config-0.1) (("rust-ahash" ,rust-ahash-0.8)
("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.2) ("rust-base64" ,rust-base64-0.21)
("rust-alacritty-terminal" ,rust-alacritty-terminal-0.19) ("rust-bitflags" ,rust-bitflags-2)
("rust-bitflags" ,rust-bitflags-1) ("rust-clap" ,rust-clap-4)
("rust-clap" ,rust-clap-3) ("rust-cocoa" ,rust-cocoa-0.25)
("rust-cocoa" ,rust-cocoa-0.24) ("rust-copypasta" ,rust-copypasta-0.10)
("rust-copypasta" ,rust-copypasta-0.8) ("rust-crossfont" ,rust-crossfont-0.7)
("rust-crossfont" ,rust-crossfont-0.5) ("rust-dirs" ,rust-dirs-5)
("rust-dirs" ,rust-dirs-4) ("rust-embed-resource" ,rust-embed-resource-2)
("rust-embed-resource" ,rust-embed-resource-1)
("rust-fnv" ,rust-fnv-1)
("rust-gl-generator" ,rust-gl-generator-0.14) ("rust-gl-generator" ,rust-gl-generator-0.14)
("rust-glutin" ,rust-glutin-0.30) ("rust-glutin" ,rust-glutin-0.31)
("rust-home" ,rust-home-0.5)
("rust-libc" ,rust-libc-0.2) ("rust-libc" ,rust-libc-0.2)
("rust-log" ,rust-log-0.4) ("rust-log" ,rust-log-0.4)
("rust-notify" ,rust-notify-5) ("rust-miow" ,rust-miow-0.6)
("rust-notify" ,rust-notify-6)
("rust-objc" ,rust-objc-0.2) ("rust-objc" ,rust-objc-0.2)
("rust-once-cell" ,rust-once-cell-1)
("rust-parking-lot" ,rust-parking-lot-0.12) ("rust-parking-lot" ,rust-parking-lot-0.12)
("rust-piper" ,rust-piper-0.2)
("rust-polling" ,rust-polling-3)
("rust-png" ,rust-png-0.17) ("rust-png" ,rust-png-0.17)
("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-raw-window-handle" ,rust-raw-window-handle-0.5) ("rust-raw-window-handle" ,rust-raw-window-handle-0.5)
("rust-regex-automata" ,rust-regex-automata-0.4)
("rust-rustix-openpty" ,rust-rustix-openpty-0.1)
("rust-serde" ,rust-serde-1) ("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1) ("rust-serde-json" ,rust-serde-json-1)
("rust-serde-yaml" ,rust-serde-yaml-0.8) ("rust-serde-yaml" ,rust-serde-yaml-0.9)
("rust-signal-hook" ,rust-signal-hook-0.3)
("rust-syn" ,rust-syn-2)
("rust-toml" ,rust-toml-0.8)
("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-unicode-width" ,rust-unicode-width-0.1)
("rust-wayland-client" ,rust-wayland-client-0.29) ("rust-vte" ,rust-vte-0.13)
("rust-windows-sys" ,rust-windows-sys-0.36) ("rust-windows-sys" ,rust-windows-sys-0.48)
("rust-winit" ,rust-winit-0.28) ("rust-winit" ,rust-winit-0.29)
("rust-x11-dl" ,rust-x11-dl-2)
("rust-xdg" ,rust-xdg-2)) ("rust-xdg" ,rust-xdg-2))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-clap-complete" ,rust-clap-complete-3)) (("rust-clap-complete" ,rust-clap-complete-4)
("rust-log" ,rust-log-0.4)
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-toml" ,rust-toml-0.8))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-xdg-open (add-after 'unpack 'patch-xdg-open
@ -1582,7 +1600,9 @@ basic input/output.")
(search-input-file inputs (string-append "lib/" all))) (search-input-file inputs (string-append "lib/" all)))
;; There are several libwayland libraries. ;; There are several libwayland libraries.
(("libwayland-.*\\.so" all) (("libwayland\\.so" all)
(search-input-file inputs (string-append "lib/" all)))
(("libwayland-[[:alpha:]]*\\.so" all)
(search-input-file inputs (string-append "lib/" all))) (search-input-file inputs (string-append "lib/" all)))
(("libxkbcommon\\.so") (("libxkbcommon\\.so")
(search-input-file inputs "lib/libxkbcommon.so"))))) (search-input-file inputs "lib/libxkbcommon.so")))))
@ -1594,21 +1614,30 @@ basic input/output.")
(share (string-append out "/share")) (share (string-append out "/share"))
(icons (string-append share "/icons/hicolor/scalable/apps")) (icons (string-append share "/icons/hicolor/scalable/apps"))
(tic (search-input-file (or native-inputs inputs) "/bin/tic")) (tic (search-input-file (or native-inputs inputs) "/bin/tic"))
(man (string-append share "/man/man1")) (man (string-append share "/man"))
(alacritty-bin (car (find-files "target" "^alacritty$")))) (alacritty-bin (car (find-files "target" "^alacritty$"))))
;; Install the executable. ;; Install the executable.
(install-file alacritty-bin bin) (install-file alacritty-bin bin)
;; Install man pages. ;; Install man pages.
(mkdir-p man) (mkdir-p (string-append man "/man1"))
(copy-file "extra/alacritty.man" (mkdir-p (string-append man "/man5"))
(string-append man "/alacritty.1")) (define (create-manpage manpage)
;; Install example configuration. (let ((mandir (string-append
(install-file "alacritty.yml" "/man" (string-take-right manpage 1) "/")))
(string-append share "/doc/alacritty-" (with-input-from-file (string-append manpage ".scd")
,(package-version this-package) "/example")) (lambda _
(with-output-to-file (string-append man mandir manpage)
(lambda _ (invoke "scdoc")))))))
(with-directory-excursion "extra/man"
(for-each create-manpage '("alacritty.1"
"alacritty-msg.1"
"alacritty.5"
"alacritty-bindings.5")))
;; Install desktop file. ;; Install desktop file.
(install-file "extra/linux/Alacritty.desktop" (install-file "extra/linux/Alacritty.desktop"
(string-append share "/applications")) (string-append share "/applications"))
(install-file "extra/linux/org.alacritty.Alacritty.appdata.xml"
(string-append share "/metainfo"))
;; Install icon. ;; Install icon.
(mkdir-p icons) (mkdir-p icons)
(copy-file "extra/logo/alacritty-term.svg" (copy-file "extra/logo/alacritty-term.svg"
@ -1631,7 +1660,8 @@ basic input/output.")
(native-inputs (native-inputs
(list ncurses (list ncurses
pkg-config pkg-config
python)) python
scdoc))
(inputs (inputs
(list expat (list expat
fontconfig fontconfig

1
gnu/packages/tree-sitter.scm
View File

@ -28,6 +28,7 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages crates-graphics) #:use-module (gnu packages crates-graphics)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-web)
#:use-module (gnu packages graphviz) #:use-module (gnu packages graphviz)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
#:use-module (gnu packages node) #:use-module (gnu packages node)

53
gnu/packages/version-control.scm
View File

@ -6,7 +6,7 @@
;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2016, 2019, 2021 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2014, 2016, 2019, 2021 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2015-2023 Flashner <efraim@flashner.co.il> ;;; Copyright © 2015-2024 Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2018, 2020, 2021, 2022 Kyle Meyer <kyle@kyleam.com> ;;; Copyright © 2015, 2018, 2020, 2021, 2022 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
@ -83,6 +83,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system qt) #:use-module (guix build-system qt)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
@ -96,6 +97,7 @@
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages cook) #:use-module (gnu packages cook)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-vcs)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
@ -874,10 +876,10 @@ which has been extracted into a standalone library for compatibility with
other git-like projects such as @code{libgit2}.") other git-like projects such as @code{libgit2}.")
(license license:lgpl2.1+)))) (license license:lgpl2.1+))))
(define-public libgit2 (define-public libgit2-1.5
(package (package
(name "libgit2") (name "libgit2")
(version "1.5.1") (version "1.5.2")
(source (origin (source (origin
;; Since v1.1.1, release artifacts are no longer offered (see: ;; Since v1.1.1, release artifacts are no longer offered (see:
;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729). ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729).
@ -888,7 +890,7 @@ other git-like projects such as @code{libgit2}.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"04ypzpicpgq1wh6anwcmjjyh2b854lvjhxq0hq2hbsx7kb14qc1b")) "0v9jdaxmqrzbs9v5vhh2xf5xv9h29q8qqn8vmns279ljx1zav5yd"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -911,8 +913,10 @@ other git-like projects such as @code{libgit2}.")
'())) '()))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
,@(if (target-arm32?) ,@(if (or (target-arm32?) (target-hurd?))
;; Some tests are flaky on armhf. ;; Some tests are flaky on armhf.
;; On GNU/Hurd, the 'diff/workdir' test in libgit2 1.7.1 fails
;; while comparing st.st_size to zero.
'((add-before 'check 'pre-check '((add-before 'check 'pre-check
(lambda _ (lambda _
(setenv "GITTEST_FLAKY_STAT" "true")))) (setenv "GITTEST_FLAKY_STAT" "true"))))
@ -940,10 +944,14 @@ write native speed custom Git applications in any language with bindings.")
;; GPLv2 with linking exception ;; GPLv2 with linking exception
(license license:gpl2))) (license license:gpl2)))
(define-public libgit2
;; Default version of libgit2.
libgit2-1.5)
(define-public libgit2-1.7 (define-public libgit2-1.7
(package (package
(inherit libgit2) (inherit libgit2)
(version "1.7.1") (version "1.7.2")
(source (origin (source (origin
(inherit (package-source libgit2)) (inherit (package-source libgit2))
(method git-fetch) (method git-fetch)
@ -953,7 +961,7 @@ write native speed custom Git applications in any language with bindings.")
(file-name (git-file-name "libgit2" version)) (file-name (git-file-name "libgit2" version))
(sha256 (sha256
(base32 (base32
"1wq6a91k97gbsyafla39yvn1lnr559hqc41ksz1qxv7flf5kyvfx")) "0i95jwrwx4svh5l4dpa5r4a99f813hlm7nzzkbqzmnw4pkyxhlvx"))
;; We need to use the bundled xdiff until an option is given ;; We need to use the bundled xdiff until an option is given
;; to use the one from git. ;; to use the one from git.
(modules '((guix build utils))) (modules '((guix build utils)))
@ -985,7 +993,7 @@ write native speed custom Git applications in any language with bindings.")
(define-public libgit2-1.4 (define-public libgit2-1.4
(package (package
(inherit libgit2) (inherit libgit2)
(version "1.4.5") (version "1.4.6")
(source (origin (source (origin
(inherit (package-source libgit2)) (inherit (package-source libgit2))
(method git-fetch) (method git-fetch)
@ -995,7 +1003,7 @@ write native speed custom Git applications in any language with bindings.")
(file-name (git-file-name "libgit2" version)) (file-name (git-file-name "libgit2" version))
(sha256 (sha256
(base32 (base32
"0q754ipc6skagszi93lcy6qr09ibavivm2q5i5fhpdblvlnv2p7x")))))) "0iv7h2fdnlv5vj4dx09w71xbj004hidbpsbgv02gbvlpvsz3jpcf"))))))
(define-public libgit2-1.3 (define-public libgit2-1.3
(package (package
@ -2914,16 +2922,20 @@ email header.")
(define-public b4 (define-public b4
(package (package
(name "b4") (name "b4")
(version "0.12.3") (version "0.13.0")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (pypi-uri "b4" version)) (uri (git-reference
(url "https://git.kernel.org/pub/scm/utils/b4/b4.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "0qpa0ahw1d86mdgs09ykq5pd0lm8083ds6j0knalw757yh31akmn")))) (base32
(build-system python-build-system) "1dijszinn00r6d0lxii3jz36h2c23zavbgz1m8finp5v6kaiafcg"))))
(build-system pyproject-build-system)
(arguments (arguments
(list #:tests? #f ;no tests (list #:tests? (not (%current-target-system)) ;git path hardcoded.
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
;; XXX: dnspython attempts to read /etc/resolv.conf when loading ;; XXX: dnspython attempts to read /etc/resolv.conf when loading
@ -2938,9 +2950,14 @@ email header.")
(string-append (string-append
"['" (search-input-file inputs "bin/git") "'")))))))) "['" (search-input-file inputs "bin/git") "'"))))))))
(inputs (inputs
(list git-minimal python-dkimpy python-dnspython python-requests)) (list git-filter-repo
(propagated-inputs git-minimal
(list patatt)) patatt
python-dkimpy
python-dnspython
python-requests))
(native-inputs
(list python-pytest))
(home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git") (home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git")
(synopsis "Tool for working with patches in public-inbox archives") (synopsis "Tool for working with patches in public-inbox archives")
(description (description

66
gnu/packages/video.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015, 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2014, 2015, 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2018, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2018, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2015, 2016 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2015, 2018, 2019, 2020, 2021, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2018, 2019, 2020, 2021, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
@ -915,7 +915,7 @@ television and DVD. It is also known as AC-3.")
(define-public libaom (define-public libaom
(package (package
(name "libaom") (name "libaom")
(version "3.5.0") (version "3.8.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -924,7 +924,7 @@ television and DVD. It is also known as AC-3.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0arn8a88jz4mj69n8cs4qmrdjwhbvzsqgnx20wr9mq01b06kqich")))) "04zfgvzi4h4ybvjc4zfpfsmldz8w6vasjlrry7j4p6g3g7wk64r7"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list perl pkg-config python)) ; to detect the version (list perl pkg-config python)) ; to detect the version
@ -5575,7 +5575,7 @@ and audio capture, network stream playback, and many more.")
(define-public dav1d (define-public dav1d
(package (package
(name "dav1d") (name "dav1d")
(version "1.0.0") (version "1.3.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -5584,9 +5584,12 @@ and audio capture, network stream playback, and many more.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0jkvb5as7danpalzlwd0w1dc9i2vijvmf39z0j6fwqvialsgnnj5")))) (base32 "17r6qdijdnqfciqa0ia2y4gyhaav6y5gc4d9xj4dg9h7xnpyxc3k"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (list nasm)) (native-inputs
(if (target-x86?)
(list nasm)
'()))
(home-page "https://code.videolan.org/videolan/dav1d") (home-page "https://code.videolan.org/videolan/dav1d")
(synopsis "AV1 decoder") (synopsis "AV1 decoder")
(description "dav1d is a new AV1 cross-platform decoder, and focused on (description "dav1d is a new AV1 cross-platform decoder, and focused on
@ -5851,84 +5854,76 @@ result in several formats:
(define-public rav1e (define-public rav1e
(package (package
(name "rav1e") (name "rav1e")
(version "0.6.6") (version "0.7.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (crate-uri "rav1e" version)) (uri (crate-uri "rav1e" version))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "1h9fhmamb7mh3cv86y1qja9qb7r6w2jv3p8ydngvsyjy59lq7hqn")) (base32 "1sawva6nmj2fvynydbcirr3nb7wjyg0id2hz2771qnv6ly0cx1yd"))))
(modules '((guix build utils)))
(snippet
'(begin (substitute* "Cargo.toml"
(("\"= ?([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
(string-append "\"^" version)))))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:cargo-inputs `(#:install-source? #f
#:cargo-inputs
(("rust-aom-sys" ,rust-aom-sys-0.3) (("rust-aom-sys" ,rust-aom-sys-0.3)
("rust-arbitrary" ,rust-arbitrary-0.4) ("rust-arbitrary" ,rust-arbitrary-1)
("rust-arg-enum-proc-macro" ,rust-arg-enum-proc-macro-0.3) ("rust-arg-enum-proc-macro" ,rust-arg-enum-proc-macro-0.3)
("rust-arrayvec" ,rust-arrayvec-0.7) ("rust-arrayvec" ,rust-arrayvec-0.7)
("rust-av-metrics" ,rust-av-metrics-0.9) ("rust-av-metrics" ,rust-av-metrics-0.9)
("rust-av1-grain" ,rust-av1-grain-0.2) ("rust-av1-grain" ,rust-av1-grain-0.2)
("rust-backtrace" ,rust-backtrace-0.3) ("rust-backtrace" ,rust-backtrace-0.3)
("rust-bitstream-io" ,rust-bitstream-io-1) ("rust-bitstream-io" ,rust-bitstream-io-2)
("rust-built" ,rust-built-0.5) ("rust-built" ,rust-built-0.7)
("rust-byteorder" ,rust-byteorder-1) ("rust-byteorder" ,rust-byteorder-1)
("rust-cc" ,rust-cc-1) ("rust-cc" ,rust-cc-1)
("rust-cfg-if" ,rust-cfg-if-1) ("rust-cfg-if" ,rust-cfg-if-1)
("rust-clap" ,rust-clap-4) ("rust-clap" ,rust-clap-4)
("rust-clap-complete" ,rust-clap-complete-4) ("rust-clap-complete" ,rust-clap-complete-4)
("rust-clap-lex" ,rust-clap-lex-0.3)
("rust-console" ,rust-console-0.15) ("rust-console" ,rust-console-0.15)
("rust-crossbeam" ,rust-crossbeam-0.8) ("rust-crossbeam" ,rust-crossbeam-0.8)
("rust-dav1d-sys" ,rust-dav1d-sys-0.7)
("rust-fern" ,rust-fern-0.6) ("rust-fern" ,rust-fern-0.6)
("rust-image" ,rust-image-0.24) ("rust-image" ,rust-image-0.24)
("rust-interpolate-name" ,rust-interpolate-name-0.2) ("rust-interpolate-name" ,rust-interpolate-name-0.2)
("rust-itertools" ,rust-itertools-0.10) ("rust-itertools" ,rust-itertools-0.12)
("rust-ivf" ,rust-ivf-0.1) ("rust-ivf" ,rust-ivf-0.1)
("rust-libc" ,rust-libc-0.2) ("rust-libc" ,rust-libc-0.2)
("rust-libfuzzer-sys" ,rust-libfuzzer-sys-0.3) ("rust-libdav1d-sys" ,rust-libdav1d-sys-0.6)
("rust-libfuzzer-sys" ,rust-libfuzzer-sys-0.4)
("rust-log" ,rust-log-0.4) ("rust-log" ,rust-log-0.4)
("rust-maybe-rayon" ,rust-maybe-rayon-0.1) ("rust-maybe-rayon" ,rust-maybe-rayon-0.1)
("rust-nasm-rs" ,rust-nasm-rs-0.2) ("rust-nasm-rs" ,rust-nasm-rs-0.2)
("rust-new-debug-unreachable" ,rust-new-debug-unreachable-1) ("rust-new-debug-unreachable" ,rust-new-debug-unreachable-1)
("rust-nom" ,rust-nom-7) ("rust-nom" ,rust-nom-7)
("rust-noop-proc-macro" ,rust-noop-proc-macro-0.3) ("rust-noop-proc-macro" ,rust-noop-proc-macro-0.3)
("rust-num-derive" ,rust-num-derive-0.3) ("rust-num-derive" ,rust-num-derive-0.4)
("rust-num-traits" ,rust-num-traits-0.2) ("rust-num-traits" ,rust-num-traits-0.2)
("rust-once-cell" ,rust-once-cell-1) ("rust-once-cell" ,rust-once-cell-1)
("rust-paste" ,rust-paste-1) ("rust-paste" ,rust-paste-1)
("rust-profiling" ,rust-profiling-1)
("rust-rand" ,rust-rand-0.8) ("rust-rand" ,rust-rand-0.8)
("rust-rand-chacha" ,rust-rand-chacha-0.3) ("rust-rand-chacha" ,rust-rand-chacha-0.3)
("rust-rust-hawktracer" ,rust-rust-hawktracer-0.7)
("rust-rustc-version" ,rust-rustc-version-0.4)
("rust-scan-fmt" ,rust-scan-fmt-0.2) ("rust-scan-fmt" ,rust-scan-fmt-0.2)
("rust-serde" ,rust-serde-1) ("rust-serde" ,rust-serde-1)
("rust-serde-big-array" ,rust-serde-big-array-0.4) ("rust-serde-big-array" ,rust-serde-big-array-0.5)
("rust-signal-hook" ,rust-signal-hook-0.3) ("rust-signal-hook" ,rust-signal-hook-0.3)
("rust-simd-helpers" ,rust-simd-helpers-0.1) ("rust-simd-helpers" ,rust-simd-helpers-0.1)
("rust-system-deps" ,rust-system-deps-6) ("rust-system-deps" ,rust-system-deps-6)
("rust-thiserror" ,rust-thiserror-1) ("rust-thiserror" ,rust-thiserror-1)
("rust-toml" ,rust-toml-0.5) ("rust-toml" ,rust-toml-0.8)
("rust-tracing" ,rust-tracing-0.1)
("rust-tracing-chrome" ,rust-tracing-chrome-0.7)
("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)
("rust-v-frame" ,rust-v-frame-0.3) ("rust-v-frame" ,rust-v-frame-0.3)
("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
("rust-winnow" ,rust-winnow-0.4)
("rust-y4m" ,rust-y4m-0.8)) ("rust-y4m" ,rust-y4m-0.8))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-assert-cmd" ,rust-assert-cmd-2) (("rust-assert-cmd" ,rust-assert-cmd-2)
("rust-criterion" ,rust-criterion-0.4) ("rust-criterion" ,rust-criterion-0.5)
("rust-interpolate-name" ,rust-interpolate-name-0.2) ("rust-interpolate-name" ,rust-interpolate-name-0.2)
("rust-nom" ,rust-nom-7) ("rust-nom" ,rust-nom-7)
("rust-predicates" ,rust-predicates-2)
("rust-predicates-core" ,rust-predicates-core-1)
("rust-predicates-tree" ,rust-predicates-tree-1)
("rust-pretty-assertions" ,rust-pretty-assertions-1) ("rust-pretty-assertions" ,rust-pretty-assertions-1)
("rust-quickcheck" ,rust-quickcheck-1) ("rust-quickcheck" ,rust-quickcheck-1)
("rust-quickcheck-macros" ,rust-quickcheck-macros-1)
("rust-rand" ,rust-rand-0.8) ("rust-rand" ,rust-rand-0.8)
("rust-rand-chacha" ,rust-rand-chacha-0.3) ("rust-rand-chacha" ,rust-rand-chacha-0.3)
("rust-semver" ,rust-semver-1)) ("rust-semver" ,rust-semver-1))
@ -5942,9 +5937,12 @@ result in several formats:
"--library-type" "cdylib" "--library-type" "cdylib"
(string-append "--prefix=" out)))))))) (string-append "--prefix=" out))))))))
(native-inputs (native-inputs
(list nasm pkg-config rust-cargo-c)) (append (if (target-x86?)
(list nasm)
'())
(list pkg-config rust-cargo-c)))
(inputs (inputs
(list libgit2 zlib)) (list libgit2-1.7 zlib))
(home-page "https://github.com/xiph/rav1e/") (home-page "https://github.com/xiph/rav1e/")
(synopsis "Fast and safe AV1 encoder") (synopsis "Fast and safe AV1 encoder")
(description "@code{rav1e} is an AV1 video encoder. It is designed to (description "@code{rav1e} is an AV1 video encoder. It is designed to

9
gnu/packages/web.scm
View File

@ -119,8 +119,11 @@
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cpp) #:use-module (gnu packages cpp)
#:use-module (gnu packages crates-gtk) #:use-module (gnu packages crates-crypto)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-gtk)
#:use-module (gnu packages crates-tls)
#:use-module (gnu packages crates-web)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages cyrus-sasl)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
@ -8704,7 +8707,7 @@ solution for any project's interface needs:
(define-public gmid (define-public gmid
(package (package
(name "gmid") (name "gmid")
(version "2.0") (version "2.0.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -8712,7 +8715,7 @@ solution for any project's interface needs:
version "/gmid-" version ".tar.gz")) version "/gmid-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"17cg07md6zac0j6ivawysy41jbk3a1ql3q794q1y0k01x8z23q5n")))) "1riihzgshfk6907r4g69lrlvabiznwi5d7njk7y6km0695lf62g0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:test-target "regress" (list #:test-target "regress"

147
gnu/packages/wm.scm
View File

@ -41,7 +41,7 @@
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020 Niklas Eklund <niklas.eklund@posteo.net> ;;; Copyright © 2020 Niklas Eklund <niklas.eklund@posteo.net>
;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net> ;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
;;; Copyright © 2021, 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021, 2023, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2021 qblade <qblade@protonmail.com> ;;; Copyright © 2021 qblade <qblade@protonmail.com>
;;; Copyright © 2021 lasnesne <lasnesne@lagunposprasihopre.org> ;;; Copyright © 2021 lasnesne <lasnesne@lagunposprasihopre.org>
@ -64,10 +64,11 @@
;;; Copyright © 2023 Jonathan Brielamier <jonathan.brielmaier@web.de> ;;; Copyright © 2023 Jonathan Brielamier <jonathan.brielmaier@web.de>
;;; Copyright © 2023 Vessel Wave <vesselwave@disroot.org> ;;; Copyright © 2023 Vessel Wave <vesselwave@disroot.org>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com> ;;; Copyright © 2023, 2024 Jaeme Sifat <jaeme@runbox.com>
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz> ;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
;;; Copyright © 2024 Timotej Lazar <timotej.lazar@araneo.si> ;;; Copyright © 2024 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2024 Ahmad Draidi <a.r.draidi@redscript.org> ;;; Copyright © 2024 Ahmad Draidi <a.r.draidi@redscript.org>
;;; Copyright © 2024 chris <chris@bumblehead.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -91,6 +92,7 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system asdf) #:use-module (guix build-system asdf)
#:use-module (guix build-system cargo)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system copy) #:use-module (guix build-system copy)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -108,11 +110,14 @@
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages build-tools) #:use-module (gnu packages build-tools)
#:use-module (gnu packages calendar) #:use-module (gnu packages calendar)
#:use-module (gnu packages compression)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages crates-graphics)
#:use-module (gnu packages datastructures) #:use-module (gnu packages datastructures)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages documentation) #:use-module (gnu packages documentation)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages fribidi) #:use-module (gnu packages fribidi)
@ -208,7 +213,9 @@ the leaves of a full binary tree.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (base32 "11sg9x08zl2nr7a723h462knz5lf58sgvkhv1mgc9z3hhkhvbsja")))) (sha256 (base32 "11sg9x08zl2nr7a723h462knz5lf58sgvkhv1mgc9z3hhkhvbsja"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (list pkg-config scdoc)) (native-inputs (list pkg-config scdoc
;; for wayland-scanner
wayland))
(inputs (list wayland wlroots-0.16 libxkbcommon)) (inputs (list wayland wlroots-0.16 libxkbcommon))
(home-page "https://github.com/cage-kiosk/cage") (home-page "https://github.com/cage-kiosk/cage")
(synopsis "Wayland kiosk") (synopsis "Wayland kiosk")
@ -1933,6 +1940,94 @@ display a clock or apply image manipulation techniques to the background image."
(description "Swaybg is a wallpaper utility for Wayland compositors.") (description "Swaybg is a wallpaper utility for Wayland compositors.")
(license license:expat))) ; MIT license (license license:expat))) ; MIT license
(define-public swww
(package
(name "swww")
(version "0.8.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/LGFae/swww")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1ps10dv6a8a0hiw7p8kg64mf81pvavskmyn5xpbfw6hrc991vdlz"))
(modules '((guix build utils)))
(snippet
'(begin (substitute* "utils/Cargo.toml"
(("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
(string-append "\"^" version)))))))
(build-system cargo-build-system)
(arguments
(list
#:install-source? #f
#:cargo-inputs
`(("rust-log" ,rust-log-0.4)
("rust-simplelog" ,rust-simplelog-0.12)
("rust-wayland-client" ,rust-wayland-client-0.31)
("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.18)
("rust-nix" ,rust-nix-0.27)
("rust-keyframe" ,rust-keyframe-1)
("rust-rkyv" ,rust-rkyv-0.7)
("rust-rayon" ,rust-rayon-1)
("rust-spin-sleep" ,rust-spin-sleep-1)
("rust-sd-notify" ,rust-sd-notify-0.4)
("rust-image" ,rust-image-0.24)
("rust-fast-image-resize" ,rust-fast-image-resize-2)
("rust-clap" ,rust-clap-4)
("rust-rand" ,rust-rand-0.8)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-lzzzz" ,rust-lzzzz-1))
#:cargo-development-inputs
`(("rust-rand" ,rust-rand-0.8)
("rust-assert-cmd" ,rust-assert-cmd-2)
("rust-criterion" ,rust-criterion-0.5))
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'build-documentation
(lambda* (#:key inputs #:allow-other-keys)
(invoke "doc/gen.sh")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(share (string-append out "/share"))
(man1 (string-append share "/man/man1"))
(swww (car (find-files "target" "^swww$")))
(swww-daemon (car (find-files "target" "^swww-daemon$")))
(bash-completions-dir
(string-append share "/bash-completion/completions"))
(zsh-completions-dir
(string-append share "/zsh/site-functions"))
(fish-completions-dir
(string-append share "/fish/vendor_completions.d"))
(elvish-completions-dir
(string-append share "/elvish/lib")))
(install-file swww bin)
(install-file swww-daemon bin)
(copy-recursively "doc/generated" man1)
(install-file "completions/swww.bash" bash-completions-dir)
(install-file "completions/_swww" zsh-completions-dir)
(install-file "completions/swww.fish" fish-completions-dir)
(install-file "completions/swww.elv" elvish-completions-dir))))
(add-after 'install 'wrap-binaries
(lambda* (#:key outputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(lz4 (assoc-ref inputs "lz4")))
(wrap-program (string-append out "/bin/swww")
`("PATH" prefix (,(string-append lz4 "/bin"))))
(wrap-program (string-append out "/bin/swww-daemon")
`("PATH" prefix (,(string-append lz4 "/bin"))))))))))
(native-inputs (list scdoc))
(inputs (list bash-minimal lz4))
(home-page "https://github.com/LGFae/swww")
(synopsis
"Efficient animated wallpaper daemon for wayland controlled at runtime")
(description
"A Solution to your Wayland Wallpaper Woes (swww). It uses minimal resources
and provides animations for switching between backgrounds.")
(license license:gpl3+)))
(define-public swaynotificationcenter (define-public swaynotificationcenter
(package (package
@ -3584,3 +3679,47 @@ notable features include:
(description "velox is a simple window manager for Wayland based on swc. (description "velox is a simple window manager for Wayland based on swc.
It is inspired by dwm and xmonad.") It is inspired by dwm and xmonad.")
(license license:expat)))) (license license:expat))))
(define-public yambar-wayland
(package
(name "yambar-wayland")
(version "1.10.0")
(home-page "https://codeberg.org/dnkl/yambar")
(source
(origin
(method git-fetch)
(uri (git-reference
(url home-page)
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"14lxhgyyia7sxyqjwa9skps0j9qlpqi8y7hvbsaidrwmy4857czr"))))
(build-system meson-build-system)
(arguments
(list
#:build-type "release"
#:configure-flags #~'("-Db_lto=true"
"-Dbackend-x11=disabled"
"-Dbackend-wayland=enabled")))
(native-inputs (list pkg-config
tllist
flex
bison
scdoc
wayland-protocols))
(inputs (list fcft
wayland
pipewire
libyaml
pixman
alsa-lib
json-c
libmpdclient
eudev))
(synopsis "X11 and Wayland status panel")
(description
"@command{yambar} is a lightweight and configurable status panel (bar,
for short) for X11 and Wayland, that goes to great lengths to be both CPU and
battery efficient---polling is only done when absolutely necessary.")
(license license:expat)))

1
gnu/system/shadow.scm
View File

@ -165,6 +165,7 @@ if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
# Merge search-paths from multiple profiles, the order matters. # Merge search-paths from multiple profiles, the order matters.
eval \"$(guix package --search-paths \\ eval \"$(guix package --search-paths \\
-p $HOME/.config/guix/current \\ -p $HOME/.config/guix/current \\
-p $HOME/.guix-home/profile \\
-p $HOME/.guix-profile \\ -p $HOME/.guix-profile \\
-p /run/current-system/profile)\" -p /run/current-system/profile)\"

3
guix/build/cargo-build-system.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
;;; Copyright © 2019-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; ;;;
@ -162,6 +162,7 @@ libraries or executables."
("powerpc64le-linux-gnu" "powerpc64le-unknown-linux-gnu") ("powerpc64le-linux-gnu" "powerpc64le-unknown-linux-gnu")
("riscv64-linux-gnu" "riscv64gc-unknown-linux-gnu") ("riscv64-linux-gnu" "riscv64gc-unknown-linux-gnu")
("x86_64-linux-gnu" "x86_64-unknown-linux-gnu") ("x86_64-linux-gnu" "x86_64-unknown-linux-gnu")
("x86_64-linux-gnux32" "x86_64-unknown-linux-gnux32")
("i586-pc-gnu" "i686-unknown-hurd-gnu") ("i586-pc-gnu" "i686-unknown-hurd-gnu")
("i686-w64-mingw32" "i686-pc-windows-gnu") ("i686-w64-mingw32" "i686-pc-windows-gnu")
("x86_64-w64-mingw32" "x86_64-pc-windows-gnu") ("x86_64-w64-mingw32" "x86_64-pc-windows-gnu")

6
po/doc/guix-cookbook.de.po
View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: guix 1.0.1.4876-09145-dirty\n" "Project-Id-Version: guix 1.0.1.4876-09145-dirty\n"
"Report-Msgid-Bugs-To: bug-guix@gnu.org\n" "Report-Msgid-Bugs-To: bug-guix@gnu.org\n"
"POT-Creation-Date: 2024-01-01 03:18+0000\n" "POT-Creation-Date: 2024-01-01 03:18+0000\n"
"PO-Revision-Date: 2024-01-08 16:37+0000\n" "PO-Revision-Date: 2024-02-29 15:28+0000\n"
"Last-Translator: Florian Pelz <pelzflorian@pelzflorian.de>\n" "Last-Translator: Florian Pelz <pelzflorian@pelzflorian.de>\n"
"Language-Team: German <https://translate.fedoraproject.org/projects/guix/documentation-cookbook/de/>\n" "Language-Team: German <https://translate.fedoraproject.org/projects/guix/documentation-cookbook/de/>\n"
"Language: de\n" "Language: de\n"
@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n" "Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.3.1\n" "X-Generator: Weblate 5.4\n"
#. type: Plain text #. type: Plain text
#: guix-git/doc/guix-cookbook.texi:7 #: guix-git/doc/guix-cookbook.texi:7
@ -643,7 +643,7 @@ msgstr "Reproduzierbare Profile"
#: guix-git/doc/guix-cookbook.texi:4381 guix-git/doc/guix-cookbook.texi:4382 #: guix-git/doc/guix-cookbook.texi:4381 guix-git/doc/guix-cookbook.texi:4382
#, no-wrap #, no-wrap
msgid "Getting Started" msgid "Getting Started"
msgstr "Einstieg in Guix" msgstr "Einstieg"
#. type: menuentry #. type: menuentry
#: guix-git/doc/guix-cookbook.texi:185 guix-git/doc/guix-cookbook.texi:4379 #: guix-git/doc/guix-cookbook.texi:185 guix-git/doc/guix-cookbook.texi:4379

32230
po/doc/guix-manual.de.po
View File

File diff suppressed because one or more lines are too long

30809
po/doc/guix-manual.es.po
View File

File diff suppressed because one or more lines are too long

97827
po/doc/guix-manual.fr.po
View File

File diff suppressed because one or more lines are too long

2178
po/guix/de.po
View File

File diff suppressed because it is too large Load Diff

2222
po/guix/es.po
View File

File diff suppressed because it is too large Load Diff

2280
po/guix/fr.po
View File

File diff suppressed because it is too large Load Diff

5134
po/guix/it.po
View File

File diff suppressed because it is too large Load Diff

2197
po/guix/nl.po
View File

File diff suppressed because it is too large Load Diff

2248
po/guix/sk.po
View File

File diff suppressed because it is too large Load Diff

2120
po/guix/tr.po
View File

File diff suppressed because it is too large Load Diff

2166
po/guix/zh_CN.po
View File

File diff suppressed because it is too large Load Diff

14
po/packages/it.po
View File

@ -4,20 +4,21 @@
# Nicolo Balzarotti <nicolo@nixo.xyz>, 2021. # Nicolo Balzarotti <nicolo@nixo.xyz>, 2021.
# Nathan <nathan95@live.it>, 2021. # Nathan <nathan95@live.it>, 2021.
# Fernandez Alonso Alberto Mario <albialonso7@icloud.com>, 2022. # Fernandez Alonso Alberto Mario <albialonso7@icloud.com>, 2022.
# Marco Rimoldi <marco.rimoldi@pm.me>, 2024.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GNU guix\n" "Project-Id-Version: GNU guix\n"
"Report-Msgid-Bugs-To: bug-guix@gnu.org\n" "Report-Msgid-Bugs-To: bug-guix@gnu.org\n"
"POT-Creation-Date: 2023-03-10 17:18+0000\n" "POT-Creation-Date: 2023-03-10 17:18+0000\n"
"PO-Revision-Date: 2022-10-16 13:19+0000\n" "PO-Revision-Date: 2024-02-29 13:39+0000\n"
"Last-Translator: Fernandez Alonso Alberto Mario <albialonso7@icloud.com>\n" "Last-Translator: Marco Rimoldi <marco.rimoldi@pm.me>\n"
"Language-Team: Italian <https://translate.fedoraproject.org/projects/guix/packages/it/>\n" "Language-Team: Italian <https://translate.fedoraproject.org/projects/guix/packages/it/>\n"
"Language: it\n" "Language: it\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n" "Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.14.1\n" "X-Generator: Weblate 5.4\n"
#: gnu/packages/abiword.scm:124 #: gnu/packages/abiword.scm:124
msgid "Word processing program" msgid "Word processing program"
@ -33,9 +34,9 @@ msgid ""
"becoming a state of the art word processor, with lots of features useful for\n" "becoming a state of the art word processor, with lots of features useful for\n"
"your daily work, personal needs, or for just some good old typing fun." "your daily work, personal needs, or for just some good old typing fun."
msgstr "" msgstr ""
"AbiWord è un programma di elaborazione testi. È rapidamente\n" "AbiWord è un programma di elaborazione testi. Sta rapidamente\n"
"diventando un elaboratore di testi all'avanguardia, con tantissime funzionalità utili per\n" "diventando un elaboratore di testi all'avanguardia, con tantissime funzionalità utili per\n"
"il tuo lavoro quotidiano, le tue esigenze personali o solo per un po 'di buon vecchio divertimento di digitazione." "il tuo lavoro quotidiano, le tue esigenze personali o anche solo per divertirti con la cara vecchia tastiera."
#: gnu/packages/aspell.scm:90 #: gnu/packages/aspell.scm:90
msgid "Spell checker" msgid "Spell checker"
@ -48,8 +49,7 @@ msgid ""
"documents written in the UTF-8 encoding and its ability to use multiple\n" "documents written in the UTF-8 encoding and its ability to use multiple\n"
"dictionaries, including personal ones." "dictionaries, including personal ones."
msgstr "" msgstr ""
"Aspell è un correttore ortografico che può essere utilizzato sia come libreria o come\n" "Aspell è un correttore ortografico che può essere utilizzato sia come libreria che come programma autonomo. Le caratteristiche degne di nota di Aspell includono il suo pieno supporto di\n"
"un programma autonomo. Le caratteristiche degne di nota di Aspell includono il suo pieno supporto di\n"
"documenti scritti nella codifica UTF-8 e la sua capacità di utilizzare più\n" "documenti scritti nella codifica UTF-8 e la sua capacità di utilizzare più\n"
"dizionari, compresi quelli personali." "dizionari, compresi quelli personali."

16
po/packages/ko.po
View File

@ -3,13 +3,13 @@
# This file is distributed under the same license as the GNU guix package. # This file is distributed under the same license as the GNU guix package.
# simmon <simmon@nplob.com>, 2021, 2022. # simmon <simmon@nplob.com>, 2021, 2022.
# Kim InSoo <simmon@nplob.com>, 2022. # Kim InSoo <simmon@nplob.com>, 2022.
# 김인수 <simmon@nplob.com>, 2022. # 김인수 <simmon@nplob.com>, 2022, 2024.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GNU guix\n" "Project-Id-Version: GNU guix\n"
"Report-Msgid-Bugs-To: bug-guix@gnu.org\n" "Report-Msgid-Bugs-To: bug-guix@gnu.org\n"
"POT-Creation-Date: 2023-03-10 17:18+0000\n" "POT-Creation-Date: 2023-03-10 17:18+0000\n"
"PO-Revision-Date: 2022-11-25 07:19+0000\n" "PO-Revision-Date: 2024-02-07 15:36+0000\n"
"Last-Translator: 김인수 <simmon@nplob.com>\n" "Last-Translator: 김인수 <simmon@nplob.com>\n"
"Language-Team: Korean <https://translate.fedoraproject.org/projects/guix/packages/ko/>\n" "Language-Team: Korean <https://translate.fedoraproject.org/projects/guix/packages/ko/>\n"
"Language: ko\n" "Language: ko\n"
@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n" "Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 4.14.2\n" "X-Generator: Weblate 5.3.1\n"
#: gnu/packages/abiword.scm:124 #: gnu/packages/abiword.scm:124
msgid "Word processing program" msgid "Word processing program"
@ -3837,7 +3837,7 @@ msgstr ""
#: gnu/packages/databases.scm:1953 #: gnu/packages/databases.scm:1953
msgid "Database independent interface for Perl" msgid "Database independent interface for Perl"
msgstr "펄을 위한 데이타베이스 독립 연결장치." msgstr "펄을 위한 데이타베이스 독립 연결장치"
#: gnu/packages/databases.scm:1954 #: gnu/packages/databases.scm:1954
msgid "This package provides a database interface for Perl." msgid "This package provides a database interface for Perl."
@ -4953,10 +4953,8 @@ msgid "This package provides a frontend to GDB, the GNU debugger."
msgstr "이와 같은 꾸러미는 GNU 디버거 GDB에 대한 프론트엔드를 제공합니다." msgstr "이와 같은 꾸러미는 GNU 디버거 GDB에 대한 프론트엔드를 제공합니다."
#: gnu/packages/debug.scm:886 #: gnu/packages/debug.scm:886
#, fuzzy
#| msgid "Console front-end to the GNU debugger"
msgid "Graphical front-end for GDB and other debuggers" msgid "Graphical front-end for GDB and other debuggers"
msgstr "GNU 디버거에 대한 콘솔 프론트-엔드" msgstr "GDB 및 다른 디버거를 위한 그래픽 프론트-엔드"
#: gnu/packages/debug.scm:887 #: gnu/packages/debug.scm:887
msgid "" msgid ""
@ -34825,10 +34823,8 @@ msgid "rofi frontend for buku bookmarks manager"
msgstr "" msgstr ""
#: gnu/packages/web.scm:7979 #: gnu/packages/web.scm:7979
#, fuzzy
#| msgid "This package provides a frontend to GDB, the GNU debugger."
msgid "This package provides a rofi frontend for the buku bookmark manager." msgid "This package provides a rofi frontend for the buku bookmark manager."
msgstr "이와 같은 꾸러미는 GNU 디버거 GDB에 대한 프론트엔드를 제공합니다." msgstr "이와 같은 꾸러미는 buku 즐겨찾기 관리자를 위한 rofi 프론트엔드를 제공합니다."
#: gnu/packages/web.scm:8007 #: gnu/packages/web.scm:8007
msgid "Anonymize IP addresses in log files" msgid "Anonymize IP addresses in log files"