diff options
62 files changed, 1782 insertions, 970 deletions
diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 2366c13caf..e7ef5fa784 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -22,7 +22,7 @@ Copyright @copyright{} 2020 André Batista@* Copyright @copyright{} 2020 Christine Lemmer-Webber@* Copyright @copyright{} 2021 Joshua Branson@* Copyright @copyright{} 2022, 2023 Maxim Cournoyer@* -Copyright @copyright{} 2023 Ludovic Courtès@* +Copyright @copyright{} 2023-2024 Ludovic Courtès@* Copyright @copyright{} 2023 Thomas Ieong Permission is granted to copy, distribute and/or modify this document @@ -5299,14 +5299,17 @@ export LC_ALL For convenience, @code{guix package} automatically generates @file{~/.guix-profile/etc/profile}, which defines all the environment variables necessary to use the packages---@code{PATH}, -@code{C_INCLUDE_PATH}, @code{PYTHONPATH}, etc. Thus it's a good idea to -source it from @code{/etc/profile}: +@code{C_INCLUDE_PATH}, @code{PYTHONPATH}, etc. Likewise, @command{guix +pull} does that under @file{~/.config/guix/current}. Thus it's a good +idea to source both from @code{/etc/profile}: @example -GUIX_PROFILE="$HOME/.guix-profile" -if [ -f "$GUIX_PROFILE/etc/profile" ]; then - . "$GUIX_PROFILE/etc/profile" -fi +for GUIX_PROFILE in "$HOME/.config/guix/current" "$HOME/.guix-profile" +do + if [ -f "$GUIX_PROFILE/etc/profile" ]; then + . "$GUIX_PROFILE/etc/profile" + fi +done @end example Last but not least, Guix provides command-line completion notably for diff --git a/doc/guix.texi b/doc/guix.texi index a3ba7164eb..c657410dd1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3445,7 +3445,7 @@ Install the package @var{exp} evaluates to. @var{exp} must be a Scheme expression that evaluates to a @code{<package>} object. This option is notably useful to disambiguate between same-named variants of a package, with expressions such as -@code{(@@ (gnu packages base) guile-final)}. +@code{(@@ (gnu packages commencement) guile-final)}. Note that this option installs the first output of the specified package, which may be insufficient when needing a specific output of a @@ -7632,6 +7632,9 @@ contain OpenPGP public keys in @file{.key} files, either in binary form or ``ASCII-armored''. By default the keyring is loaded from the branch named @code{keyring}. +@item --end=@var{commit} +Authenticate revisions up to @var{commit}. + @item --stats Display commit signing statistics upon completion. @@ -21116,7 +21119,7 @@ the @code{loopback} Shepherd service. @defvar %qemu-static-networking This is the @code{static-networking} record representing network setup when using QEMU's user-mode network stack on @code{eth0} (@pxref{Using -the user mode network stack,,, QEMU, QEMU Documentation}). +the user mode network stack,,, qemu, QEMU Documentation}). @end defvar @cindex DHCP, networking service @@ -28586,6 +28589,12 @@ Set of mechanisms that will never be offered. See Defaults to @samp{'("DIGEST-MD5")}. @end deftypevr +@deftypevr {@code{prosody-configuration} parameter} string-list insecure-sasl-mechanisms +Set of mechanisms that will not be offered on unencrypted connections. +See @url{https://prosody.im/doc/modules/mod_saslauth}. +Defaults to @samp{'("PLAIN" "LOGIN")}. +@end deftypevr + @deftypevr {@code{prosody-configuration} parameter} boolean s2s-require-encryption? Whether to force all server-to-server connections to be encrypted or not. See @url{https://prosody.im/doc/modules/mod_tls}. @@ -28665,7 +28674,7 @@ See @url{https://prosody.im/doc/configure#virtual_host_settings}. Available @code{virtualhost-configuration} fields are: -all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{disable-sasl-mechanisms}, @code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus: +all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{disable-sasl-mechanisms}, @code{insecure-sasl-mechanisms}, @code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus: @deftypevr {@code{virtualhost-configuration} parameter} string domain Domain you wish Prosody to serve. @end deftypevr @@ -28687,7 +28696,7 @@ Defaults to @samp{'()}. Available @code{int-component-configuration} fields are: -all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{disable-sasl-mechanisms}, @code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus: +all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{disable-sasl-mechanisms}, @code{insecure-sasl-mechanisms}, @code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus: @deftypevr {@code{int-component-configuration} parameter} string hostname Hostname of the component. @end deftypevr @@ -28740,7 +28749,7 @@ Defaults to @samp{'()}. Available @code{ext-component-configuration} fields are: -all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{disable-sasl-mechanisms}, @code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus: +all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{disable-sasl-mechanisms}, @code{insecure-sasl-mechanisms}, @code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus: @deftypevr {@code{ext-component-configuration} parameter} string component-secret Password which the component will use to log in. @end deftypevr diff --git a/etc/teams/qt/common.scm b/etc/teams/qt/common.scm index 8e11ac220b..4735b408d0 100644 --- a/etc/teams/qt/common.scm +++ b/etc/teams/qt/common.scm @@ -16,10 +16,6 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. -;;; This file returns a manifest of packages related to linux-libre. -;;; Simplistically, it selects packages whose names begin with "linux-libre". -;;; It is used to assist continuous integration of the kernel packages. - (use-modules (guix packages) (guix profiles) (guix utils) diff --git a/etc/teams/qt/qt-manifest.scm b/etc/teams/qt/qt-manifest.scm index 0d8fa95bfe..22078530a7 100644 --- a/etc/teams/qt/qt-manifest.scm +++ b/etc/teams/qt/qt-manifest.scm @@ -16,10 +16,6 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. -;;; This file returns a manifest of packages related to linux-libre. -;;; Simplistically, it selects packages whose names begin with "linux-libre". -;;; It is used to assist continuous integration of the kernel packages. - (load "common.scm") ;;; Commentary: diff --git a/etc/teams/qt/qt5-manifest.scm b/etc/teams/qt/qt5-manifest.scm index 34fdf479bf..2b25888d4b 100644 --- a/etc/teams/qt/qt5-manifest.scm +++ b/etc/teams/qt/qt5-manifest.scm @@ -16,10 +16,6 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. -;;; This file returns a manifest of packages related to linux-libre. -;;; Simplistically, it selects packages whose names begin with "linux-libre". -;;; It is used to assist continuous integration of the kernel packages. - (load "common.scm") ;;; Commentary: diff --git a/gnu/local.mk b/gnu/local.mk index 900c98ac1b..2ea9806b7e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1954,7 +1954,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-werkzeug-tests.patch \ %D%/packages/patches/python-zeep-Fix-pytest_httpx-test-cases.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ - %D%/packages/patches/qemu-disable-some-qtests-tests.patch \ + %D%/packages/patches/qemu-disable-bios-tables-test.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qemu-fix-agent-paths.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c12d47da4b..2b94b1e17a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5516,71 +5516,73 @@ This allows greetd-pam-mount to auto-(un)mount @env{XDG_RUNTIME_DIR} without interfering with any pam-mount configuration."))) (define-public wlgreet - (package - (name "wlgreet") - (version "0.4.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~kennylevinsen/wlgreet") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1k0jmgh0rjbnb49gkvs0a4d7z9xb6pad8v5w5f7my4s0rfpk7wd9")))) - (build-system cargo-build-system) - (arguments - (list #:cargo-inputs - `(("rust-chrono" ,rust-chrono-0.4) - ("rust-getopts" ,rust-getopts-0.2) - ("rust-greetd-ipc" ,rust-greetd-ipc-0.9) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-memmap2" ,rust-memmap2-0.3) - ("rust-nix" ,rust-nix-0.25) - ("rust-os-pipe" ,rust-os-pipe-1) - ("rust-rusttype" ,rust-rusttype-0.9) - ("rust-serde" ,rust-serde-1) - ("rust-smithay-client-toolkit" - ,rust-smithay-client-toolkit-0.15) - ("rust-toml" ,rust-toml-0.5) - ("rust-wayland-client" ,rust-wayland-client-0.29) - ("rust-wayland-protocols" ,rust-wayland-protocols-0.29)) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'remove-bundled-fonts - (lambda _ - (delete-file-recursively "fonts"))) - (add-after 'remove-bundled-fonts 'fix-font-references - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/draw.rs" - (("\\.\\./fonts/dejavu/DejaVuSansMono\\.ttf" _) - (search-input-file - inputs - "share/fonts/truetype/DejaVuSansMono.ttf")) - (("\\.\\./fonts/Roboto-Regular\\.ttf" _) - (search-input-file - inputs - "share/fonts/truetype/Roboto-Regular.ttf"))))) - (add-after 'configure 'fix-library-references - (lambda* (#:key inputs vendor-dir #:allow-other-keys) - (substitute* (find-files vendor-dir "\\.rs$") - (("lib(wayland-.*|xkbcommon)\\.so" so-file) - (search-input-file - inputs - (string-append "lib/" so-file))))))))) - (inputs - (list font-dejavu - font-google-roboto - libxkbcommon - wayland)) - (home-page "https://git.sr.ht/~kennylevinsen/wlgreet") - (synopsis "Bare-bones Wayland-based greeter for @command{greetd}") - (description - "@command{wlgreet} provides a @command{greetd} greeter + (let ((commit "7e79d6004fc5e765a5c3ece6d377f8c5999d9dfa") + (revision "1")) + (package + (name "wlgreet") + (version (git-version "0.4.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~kennylevinsen/wlgreet") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "039a05v6c2i3al86k4fncqr3z47dnrz7y8wmhx6wvm08zx8s89ww")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-chrono" ,rust-chrono-0.4) + ("rust-getopts" ,rust-getopts-0.2) + ("rust-greetd-ipc" ,rust-greetd-ipc-0.9) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-memmap2" ,rust-memmap2-0.3) + ("rust-nix" ,rust-nix-0.25) + ("rust-os-pipe" ,rust-os-pipe-1) + ("rust-rusttype" ,rust-rusttype-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-smithay-client-toolkit" + ,rust-smithay-client-toolkit-0.15) + ("rust-toml" ,rust-toml-0.5) + ("rust-wayland-client" ,rust-wayland-client-0.29) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.29)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-bundled-fonts + (lambda _ + (delete-file-recursively "fonts"))) + (add-after 'remove-bundled-fonts 'fix-font-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/draw.rs" + (("\\.\\./fonts/dejavu/DejaVuSansMono\\.ttf" _) + (search-input-file + inputs + "share/fonts/truetype/DejaVuSansMono.ttf")) + (("\\.\\./fonts/Roboto-Regular\\.ttf" _) + (search-input-file + inputs + "share/fonts/truetype/Roboto-Regular.ttf"))))) + (add-after 'configure 'fix-library-references + (lambda* (#:key inputs vendor-dir #:allow-other-keys) + (substitute* (find-files vendor-dir "\\.rs$") + (("lib(wayland-.*|xkbcommon)\\.so" so-file) + (search-input-file + inputs + (string-append "lib/" so-file))))))))) + (inputs + (list font-dejavu + font-google-roboto + libxkbcommon + wayland)) + (home-page "https://git.sr.ht/~kennylevinsen/wlgreet") + (synopsis "Bare-bones Wayland-based greeter for @command{greetd}") + (description + "@command{wlgreet} provides a @command{greetd} greeter that runs on a Wayland compositor such as @command{sway}. It is implemented with pure Wayland APIs, so it does not depend on a GUI toolkit.") - (license license:gpl3))) + (license license:gpl3)))) (define-public libseat (package diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 90507ebd90..3fb9362b91 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; 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 © 2016-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2016-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016, 2018, 2019, 2021, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2020-2022 Efraim Flashner <efraim@flashner.co.il> @@ -357,7 +357,7 @@ precision.") (define-public giac (package (name "giac") - (version "1.9.0-45") + (version "1.9.0-93") (source (origin (method url-fetch) @@ -369,7 +369,7 @@ precision.") "~parisse/debian/dists/stable/main/source/" "giac_" version ".tar.gz")) (sha256 - (base32 "0yxsl1vvwcbpwcmzp9v9rfm9djmapab0nhb3gs7zmjv5yvzbgj4d")))) + (base32 "11acbgd264vi9r3gzx8js8x2piavhybr97iyrh027qvxlbsdsgqm")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 578a0bd016..d2a856d8ed 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020, 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Jonathan Frederickson <jonathan@terracrypt.net> -;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> +;;; Copyright © 2020, 2024 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2020, 2021, 2023 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2021 jgart <jgart@dismail.de> @@ -261,6 +261,41 @@ softsynth library that can be used with other applications.") ;; Player. license:gpl3+)))) +(define-public alsa-midi-latency-test + (let ((version "0.0.5") + (revision "0") + (commit "07e43f8a1e6fd6d3bd97a00f2ee5afb74cb66f95")) + (package + (name "alsa-midi-latency-test") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/koppi/alsa-midi-latency-test") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0b3xd4z7zx6mmh6q2q7wnyd0hzikny2cikwzhaab3q86b551vb9n")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;there are no tests + #:phases #~(modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + (invoke "sh" "./autogen.sh")))))) + (native-inputs (list automake autoconf libtool)) + (inputs (list alsa-lib)) + (synopsis "Measure the roundtrip time of MIDI messages") + (description + "@code{alsa-midi-latency-test} measures the roundtrip time of a MIDI +message in the alsa subsystem of the Linux kernel using a high precision timer. +It calculates the worst case roundtrip time of all sent MIDI messages and +displays a histogram of the roundtrip time jitter.") + (home-page "https://github.com/koppi/alsa-midi-latency-test") + (license license:gpl2+)))) + (define-public webrtc-audio-processing (package (name "webrtc-audio-processing") diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0aa1635e6a..ec18568e53 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7882,18 +7882,18 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.38.7") + (version "1.38.8") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "0xx6ybvnbpxj59g1fiij8bicniamhhd7d7fcw8c7py15y3h2mlc1")))) + "126qq2549h3dpjiq36709pym5bfwk6jqbz5q2sb5hl8lwm1apv8w")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) (propagated-inputs - (list r-biocgenerics r-genomeinfodbdata r-iranges r-s4vectors)) + (list r-biocgenerics r-genomeinfodbdata r-iranges r-rcurl r-s4vectors)) (native-inputs (list r-knitr)) (home-page "https://bioconductor.org/packages/GenomeInfoDb") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index dd51f73d5b..064882b2d9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11675,30 +11675,6 @@ clustering analysis, differential analysis, motif inference and exploration of single cell ATAC-seq sequencing data.") (license license:gpl3))) -(define-public r-tictoc - (package - (name "r-tictoc") - (version "1.2") - (source (origin - (method url-fetch) - (uri (cran-uri "tictoc" version)) - (sha256 - (base32 - "037jbwb58mj5asf3kr6hpf3fy9c6fkinnd8hbpfb141a2jsa8pph")))) - (properties `((upstream-name . "tictoc"))) - (build-system r-build-system) - (home-page "https://github.com/jabiru/tictoc") - (synopsis - "Time R scripts and implementations of stack and list structures") - (description - "The tictoc package provides the timing functions @code{tic} and -@code{toc} that can be nested. It provides an alternative to -@code{system.time()} with a different syntax similar to that in another -well-known software package. @code{tic} and @code{toc} are easy to use, and -are especially useful when timing several sections in more than a few lines of -code.") - (license license:asl2.0))) - (define-public r-tsis (let ((commit "24460298fbe1d26e4da390f6e4f3d4d9d62334dc") (revision "1")) @@ -16480,45 +16456,6 @@ sequencing data in microbiome studies with the Dirichlet-tree Multinomial Mixtures.") (license license:cc0)))) -(define-public r-dyngen - (package - (name "r-dyngen") - (version "1.0.5") - (source - (origin - (method url-fetch) - (uri (cran-uri "dyngen" version)) - (sha256 - (base32 - "095jqn1rd83qm3ayca9hmv6bhlaa2c338020l46vniq8n38kbnra")))) - (properties `((upstream-name . "dyngen"))) - (build-system r-build-system) - (propagated-inputs - (list r-assertthat - r-dplyr - r-dynutils - r-ggplot2 - r-ggraph - r-ggrepel - r-gillespiessa2 - r-igraph - r-lmds - r-matrix - r-patchwork - r-pbapply - r-purrr - r-rlang - r-tibble - r-tidygraph - r-tidyr - r-viridis)) - (home-page "https://github.com/dynverse/dyngen") - (synopsis "Multi-Modal simulator for single-cell omics analyses") - (description - "This package provides a multi-modal simulation engine for studying -dynamic cellular processes at single-cell resolution.") - (license license:expat))) - ;; Needed for r-liana (define-public r-omnipathr/devel (let ((commit "679bb79e319af246a16968d27d64d8d6937a331a") diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 97518abc4c..22edad035a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1344,13 +1344,13 @@ compositional data.") (define-public r-gwasexacthw (package (name "r-gwasexacthw") - (version "1.01") + (version "1.2") (source (origin (method url-fetch) (uri (cran-uri "GWASExactHW" version)) (sha256 (base32 - "19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78")))) + "1xzcvmbh27ibd7g9zlqyp215q4yfkhdypcvm5gjkvw1qhd3pl4yk")))) (properties `((upstream-name . "GWASExactHW"))) (build-system r-build-system) (home-page "https://cran.r-project.org/package=GWASExactHW") @@ -2318,13 +2318,13 @@ known as Dynamic Linear Models.") (define-public r-zcompositions (package (name "r-zcompositions") - (version "1.5.0-2") + (version "1.5.0-3") (source (origin (method url-fetch) (uri (cran-uri "zCompositions" version)) (sha256 (base32 - "08kcl870x7kai7zdhqgm4cbfhbrf673rjxghbwpn08l7pwkhix60")))) + "1gbwx3vgx5viqnn5jsszild6ikyc2pmf1hdjc9475caf9xx9l589")))) (properties `((upstream-name . "zCompositions"))) (build-system r-build-system) (propagated-inputs @@ -3841,6 +3841,30 @@ algorithm described in MetaCell analysis of single-cell RNA-seq data using K-nn graph partitions.") (license license:gpl2))) +(define-public r-tictoc + (package + (name "r-tictoc") + (version "1.2.1") + (source (origin + (method url-fetch) + (uri (cran-uri "tictoc" version)) + (sha256 + (base32 + "0cw8r1gn4p2v1l3d80brk9sfr9nyckyyym5nr9xq3d74l74vgkcg")))) + (properties `((upstream-name . "tictoc"))) + (build-system r-build-system) + (home-page "https://github.com/jabiru/tictoc") + (synopsis + "Time R scripts and implementations of stack and list structures") + (description + "The tictoc package provides the timing functions @code{tic} and +@code{toc} that can be nested. It provides an alternative to +@code{system.time()} with a different syntax similar to that in another +well-known software package. @code{tic} and @code{toc} are easy to use, and +are especially useful when timing several sections in more than a few lines of +code.") + (license license:asl2.0))) + (define-public r-tidyft (package (name "r-tidyft") @@ -4998,14 +5022,14 @@ weights.") (define-public r-sass (package (name "r-sass") - (version "0.4.8") + (version "0.4.9") (source (origin (method url-fetch) (uri (cran-uri "sass" version)) (sha256 (base32 - "0364ndnmlqrga3k4c1hfy1894k5wpm9srf9201g9zb92rlq2kfj2")))) + "1lnl2xssz33vg7p6a8ij55hg6j1p1d3y2mq22pvf0r3rmnd08cz1")))) (properties `((upstream-name . "sass"))) (build-system r-build-system) (propagated-inputs @@ -6515,13 +6539,13 @@ processes. Most of its code is based on the @code{psutil} Python package.") (define-public r-pkgbuild (package (name "r-pkgbuild") - (version "1.4.3") + (version "1.4.4") (source (origin (method url-fetch) (uri (cran-uri "pkgbuild" version)) (sha256 - (base32 "0rci20gj2x0bgjy51jp8i4gld6arsigj7lhdkpwvdyhadjsyv0qm")))) + (base32 "1a72s2gg7ddjj94naiii44f3vyhky05gaa6xvdf72m1nshy88wjr")))) (build-system r-build-system) (propagated-inputs (list r-callr r-cli r-desc r-processx r-r6)) @@ -8945,14 +8969,14 @@ problems as well as resampling based estimators of prediction error.") (define-public r-psych (package (name "r-psych") - (version "2.4.1") + (version "2.4.3") (source (origin (method url-fetch) (uri (cran-uri "psych" version)) (sha256 (base32 - "08ip2m91c6hinva18zv575cn6w14pnjc503m1gisrg65c3z3f69b")))) + "0ic479y314knn20m1cjlp15lji7f70xrg95ln570pgkhrk5853bi")))) (build-system r-build-system) (propagated-inputs (list r-lattice r-mnormt r-nlme)) @@ -9132,13 +9156,13 @@ from the data points.") (define-public r-coro (package (name "r-coro") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (cran-uri "coro" version)) (sha256 - (base32 "0wvxdpdh3xrskz5s5wfkva856x849knx1jigbf0ff6s6n6qjjxsf")))) + (base32 "0r6cb2gr29vxjlbfzqxdgbccp57l6raxncljisl1vyj6xi2by8cg")))) (properties `((upstream-name . "coro"))) (build-system r-build-system) (propagated-inputs (list r-rlang)) @@ -10277,13 +10301,13 @@ constants, and control debugging of packages via environment variables.") (define-public r-processx (package (name "r-processx") - (version "3.8.3") + (version "3.8.4") (source (origin (method url-fetch) (uri (cran-uri "processx" version)) (sha256 - (base32 "0cfq6pq8rg0vhjfgvf48hfvngbn1g6hv28b6pgxh55xqh8acbn0s")))) + (base32 "02z7n59pglz6jw1vyyl0mkc7mz2c7y8yzsnhq5yz62digwnnf9v6")))) (build-system r-build-system) (propagated-inputs (list r-ps r-r6)) @@ -10712,14 +10736,14 @@ vectors.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.49") + (version "0.50") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "0i9icscy5n6p6w3f4v2z3cznywrrv2l6xyyhb0k1fpa4cpn6j4cl")))) + "11k0pl073b4k4wmpxkw4a071jbpvhr1g3cwm9v99rw3gh6p6x15l")))) (build-system r-build-system) (propagated-inputs (list r-xfun)) @@ -10797,13 +10821,13 @@ implementation of an approximate nearest neighbor search using hierarchical (define-public r-nestedcv (package (name "r-nestedcv") - (version "0.7.4") + (version "0.7.8") (source (origin (method url-fetch) (uri (cran-uri "nestedcv" version)) (sha256 - (base32 "0ymy1dbkcpiyq44zpvpkz1m5ivnchip07q6agh6ij50imddxb48s")))) + (base32 "1pdky7kzqs1rhl0f4hba3sggifplfgbp339imxym4dvvdb81b589")))) (properties `((upstream-name . "nestedcv"))) (build-system r-build-system) (propagated-inputs (list r-caret @@ -10812,13 +10836,13 @@ implementation of an approximate nearest neighbor search using hierarchical r-foreach r-ggplot2 r-glmnet - r-magrittr r-matrixstats r-matrixtests r-proc r-rfast r-rhpcblasctl - r-rlang)) + r-rlang + r-rocr)) (native-inputs (list r-knitr)) (home-page "https://github.com/myles-lewis/nestedcv") (synopsis "Nested cross-validation with glmnet and caret") @@ -12593,6 +12617,45 @@ contain lags, diffs and missing values.") ;; Any GPL version. (license license:gpl2+))) +(define-public r-dyngen + (package + (name "r-dyngen") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "dyngen" version)) + (sha256 + (base32 + "095jqn1rd83qm3ayca9hmv6bhlaa2c338020l46vniq8n38kbnra")))) + (properties `((upstream-name . "dyngen"))) + (build-system r-build-system) + (propagated-inputs + (list r-assertthat + r-dplyr + r-dynutils + r-ggplot2 + r-ggraph + r-ggrepel + r-gillespiessa2 + r-igraph + r-lmds + r-matrix + r-patchwork + r-pbapply + r-purrr + r-rlang + r-tibble + r-tidygraph + r-tidyr + r-viridis)) + (home-page "https://github.com/dynverse/dyngen") + (synopsis "Multi-Modal simulator for single-cell omics analyses") + (description + "This package provides a multi-modal simulation engine for studying +dynamic cellular processes at single-cell resolution.") + (license license:expat))) + (define-public r-dynutils (package (name "r-dynutils") @@ -13709,14 +13772,14 @@ Sequence logos can easily be combined with other ggplot2 plots.") (define-public r-ggsci (package (name "r-ggsci") - (version "3.0.1") + (version "3.0.2") (source (origin (method url-fetch) (uri (cran-uri "ggsci" version)) (sha256 (base32 - "030rkjx64mlhy19d74p3blsi92nyjq9vbn33323dvm1rihb8avgi")))) + "0qasxv3aliqqmfi3nk3140lrbcrw4lbfw5hm65hfkgf5a3bkca67")))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 r-scales)) @@ -14486,14 +14549,14 @@ Decomposition in R (Beaton et al 2014) <doi:10.1016/j.csda.2013.11.006>.") (define-public r-insight (package (name "r-insight") - (version "0.19.8") + (version "0.19.9") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "1f76fqrcv54l01z2nb46ysh3f41j06nqpn4ffn2gmjfggmj4xvwq")))) + "0q6wd28bnav9vwzprwvm9fhpmhqvq85iyg4h503lavcvi5g39a9x")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -14730,13 +14793,13 @@ contains or can be specified by the user.") (define-public r-wrs2 (package (name "r-wrs2") - (version "1.1-5") + (version "1.1-6") (source (origin (method url-fetch) (uri (cran-uri "WRS2" version)) (sha256 (base32 - "028xs424m879siaf3rrhzl1dacp9j7wcl5fpikyx2n0cc7anq4vq")))) + "1wsnsl4gy1hbgxfzzhfybak0jqmxq9fsh3scqyxydd7ia9r2n52k")))) (properties `((upstream-name . "WRS2"))) (build-system r-build-system) (propagated-inputs (list r-mass r-plyr r-reshape)) @@ -16610,13 +16673,13 @@ handle data from simple random samples as well as complex surveys.") (define-public r-tarchetypes (package (name "r-tarchetypes") - (version "0.7.12") + (version "0.8.0") (source (origin (method url-fetch) (uri (cran-uri "tarchetypes" version)) (sha256 (base32 - "0l5kk7a3p0pbqh9rrjz43aa4dgcfffcb3wwsl60bm9v48lzv7frv")))) + "18vn2mx5nqlib0by5v7493g8gsbzcdbg0dn92cpbf713r69v1lbk")))) (properties `((upstream-name . "tarchetypes"))) (build-system r-build-system) (propagated-inputs (list r-digest @@ -16644,13 +16707,13 @@ were influenced by the drake R package by Will Landau (2018) (define-public r-targets (package (name "r-targets") - (version "1.5.1") + (version "1.6.0") (source (origin (method url-fetch) (uri (cran-uri "targets" version)) (sha256 (base32 - "1g21cp0p5jdghr61w9q3y73jm2k248z4apn7rlxqm6m18i4x7zsb")))) + "1ddpbhvdydxm62k6ay7hpqjh8kh2isjpcdh3gygzcdrghx6d7x65")))) (properties `((upstream-name . "targets"))) (build-system r-build-system) (propagated-inputs (list r-base64url @@ -17783,14 +17846,14 @@ more information about packages, and where they were installed from.") (define-public r-remotes (package (name "r-remotes") - (version "2.4.2.1") + (version "2.5.0") (source (origin (method url-fetch) (uri (cran-uri "remotes" version)) (sha256 (base32 - "1790q52z4fy4zb1hnpn066q9fph53syl7gaxlbgbqq1dcndcma3v")))) + "0345s9q0fyv0wrxkklcy97h7bi85jfb3vwkh80px926d4qa3yrjd")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -19201,14 +19264,14 @@ Processing.") (define-public r-tm (package (name "r-tm") - (version "0.7-11") + (version "0.7-12") (source (origin (method url-fetch) (uri (cran-uri "tm" version)) (sha256 (base32 - "0hp7xamjmifd56qwsin5m0xng592wwxsbfxdz37n4k6zjf28paws")))) + "1z0zpz6jgzg34cz07cdpya2zwwsvywrd8xgwahhlz15vnaij7j3y")))) (properties `((upstream-name . "tm"))) (build-system r-build-system) (propagated-inputs @@ -20432,14 +20495,14 @@ preparing, executing, and processing HTTP requests.") (define-public r-bigrquery (package (name "r-bigrquery") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (cran-uri "bigrquery" version)) (sha256 (base32 - "1s2vvygv4d8mdd67r6j2s9d1xg009lpxysfarmrnqh0s2s1rglkz")))) + "0wkm9xka83skq1cnv830q4jnqvwm8rlmns2mj8n692h2y5qxlmna")))) (build-system r-build-system) (propagated-inputs (list r-bit64 @@ -23730,13 +23793,13 @@ lspec, polyclass, and polymars.") (define-public r-rms (package (name "r-rms") - (version "6.7-1") + (version "6.8-0") (source (origin (method url-fetch) (uri (cran-uri "rms" version)) (sha256 - (base32 "199xb98zxsbd8wa9g33bgrvbcpq79glnfmq060ic8f9vjw96r0qz")))) + (base32 "1cd6m6i2ild2f2x9rkyd2aqb33q3xy0596bs3dnvr2mnh5fcar5d")))) (build-system r-build-system) (propagated-inputs (list r-cluster @@ -25634,14 +25697,14 @@ colored by the number of neighboring points. This is useful to visualize the (define-public r-arrow (package (name "r-arrow") - (version "14.0.2.1") + (version "15.0.1") (source (origin (method url-fetch) (uri (cran-uri "arrow" version)) (sha256 (base32 - "1l1ninmq6mbqm7cckcy0qw4f20fkrixrykcqkh24bszg514r9af5")))) + "070pp0p5h1ij7pg34l5grrx4vwfihagnvnk4kj7l3w0gh8y88ibz")))) (properties `((upstream-name . "arrow"))) (build-system r-build-system) (inputs @@ -27446,14 +27509,14 @@ in pipelines.") (define-public r-parameters (package (name "r-parameters") - (version "0.21.5") + (version "0.21.6") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "0yxljycspmljj5s4i5knwyhxp29s616f7kg3xcwn0ip15kfg260v")))) + "004ld3m9qdq3bwl8qmp3h700kzqlgbmgz739d7fpiqgrs0s2gv83")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs @@ -28790,14 +28853,14 @@ discussed in Reisen et al. (2017) @url{doi:10.1016/j.jspi.2017.02.008}.") (define-public r-gamlss-data (package (name "r-gamlss-data") - (version "6.0-2") + (version "6.0-6") (source (origin (method url-fetch) (uri (cran-uri "gamlss.data" version)) (sha256 (base32 - "07mpdl4h9rwmnpl9jmsn6ig8ji11an6pyjfsvg62h2alapwbdcyv")))) + "08mb154mz1kk19zb414i5mg1q1yv7nylwpc5kzsb602mv4cxpq5s")))) (properties `((upstream-name . "gamlss.data"))) (build-system r-build-system) (home-page "http://www.gamlss.org/") @@ -32360,14 +32423,14 @@ Latent regression models and plausible value imputation are also supported.") (define-public r-erm (package (name "r-erm") - (version "1.0-5") + (version "1.0-6") (source (origin (method url-fetch) (uri (cran-uri "eRm" version)) (sha256 (base32 - "0bkivhiy02pibdcvb9z0i0yvc3wz3v33n6slhkkik61gcw1idmf0")))) + "059xny2jl81is1qyxgpbf4qi5zqpvdc64322kjz1i011kq9apwmw")))) (properties `((upstream-name . "eRm"))) (build-system r-build-system) (propagated-inputs @@ -35664,14 +35727,14 @@ model.") (define-public r-igraph (package (name "r-igraph") - (version "2.0.2") + (version "2.0.3") (source (origin (method url-fetch) (uri (cran-uri "igraph" version)) (sha256 (base32 - "0kfc9blyy54cz0m4mdzzwgvn0rkil49kdk438411mx62g2vxby9l")))) + "0xlg5lxzr8dc260fii43chsspqvb962i1yrcars988b78lnig2lf")))) (properties `((upstream-name . "igraph") (updater-extra-native-inputs . ("which")))) @@ -35679,7 +35742,7 @@ model.") (native-inputs (list gfortran pkg-config r-knitr which)) (inputs - (list glpk gmp libxml2 zlib)) + (list glpk libxml2 zlib)) (propagated-inputs (list r-cli r-cpp11 @@ -36893,13 +36956,13 @@ other R users.") (define-public r-seurat (package (name "r-seurat") - (version "5.0.2") + (version "5.0.3") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "1d49a9mhip81lvnkr8i4dznkmzyskdzrpi485w7yw2sr0qbyzg5c")))) + "08r5l6sk8i134izd29ydfm7hva7a9b3lfglmgngc9w73qs9dzwz4")))) (properties `((upstream-name . "Seurat"))) (build-system r-build-system) (propagated-inputs @@ -37669,13 +37732,13 @@ computational operations, add-on packages provide additional functionality.") (define-public r-mlr3learners (package (name "r-mlr3learners") - (version "0.5.8") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3learners" version)) (sha256 (base32 - "0q44qmd9zfc68jl2zz684rx9744g83vd7z40dck8cdvnnrxcff5g")))) + "06gz6h19cnb62js1b35nddy453dyj64mr788p8ww56kgfk6yzxr8")))) (build-system r-build-system) (propagated-inputs (list r-checkmate @@ -38020,14 +38083,14 @@ the font tool-set provided by the @code{systemfonts} package.") (define-public r-ragg (package (name "r-ragg") - (version "1.2.7") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "ragg" version)) (sha256 (base32 - "17qc53scxf02f8hlpyirsjdav4wjh3mk6q04npf82y0j5mk1hynp")))) + "1chlas4i6p8gigx02x1y7nanmz9jbv1h4fa145zk223bbg9j931j")))) (properties `((upstream-name . "ragg"))) (build-system r-build-system) (inputs diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 62739fa1c0..ea49868c06 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -4514,7 +4514,7 @@ the SQL language using a syntax that reflects the resulting query.") (define-public apache-arrow (package (name "apache-arrow") - (version "14.0.2") + (version "15.0.1") (source (origin (method git-fetch) @@ -4524,7 +4524,7 @@ the SQL language using a syntax that reflects the resulting query.") (file-name (git-file-name name version)) (sha256 (base32 - "1idw58vs8r6g6xy2qkhccgc79hwx4r5rr4bhd6ilxx56fwq9hkn2")))) + "0zrcwsq9c976xncc1kg6lw24s5r3ag8vfzhmcnkvi5z2c9x4lvvc")))) (build-system cmake-build-system) (arguments (list diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 84d3293c79..36d3eb8b7e 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -1273,7 +1273,7 @@ nameservers other than libc.") (define-public smartdns (package (name "smartdns") - (version "43") + (version "45") (source (origin (method git-fetch) (uri (git-reference @@ -1285,7 +1285,7 @@ nameservers other than libc.") ((".*SYSTEMDSYSTEMUNITDIR.*") ""))) (sha256 (base32 - "0s789l6i4yirmarg80mknc1pp65rz01ky9f7gidgclkfcwzz41l3")))) + "1f0j6d8vz1x2f4nr2w3q7azkjh8hlkj81v61a8sw1kq5160qhlb9")))) (build-system gnu-build-system) (arguments (list #:test-target "test" @@ -1293,7 +1293,7 @@ nameservers other than libc.") #~(list (string-append "CC=" #$(cc-for-target)) (string-append "DESTDIR=" #$output) "PREFIX=''" - (string-append "VER=" #$version)) + (string-append "VER=" #$(package-version this-package))) #:phases #~(modify-phases %standard-phases (delete 'configure) @@ -1321,7 +1321,7 @@ nameservers other than libc.") (lambda _ (chdir "../../source")))))) (inputs (list openssl)) - (native-inputs (list googletest `(,isc-bind "utils"))) + (native-inputs (list googletest `(,isc-bind "utils") which)) (home-page "https://github.com/pymumu/smartdns") (synopsis "Local DNS server") (description diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 0820f685b7..0fe1f2c1c7 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -8,7 +8,6 @@ ;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com> ;;; Copyright © 2021, 2022 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com> -;;; Copyright © 2024 Arun Isaac <arunisaac@systemreboot.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,7 +47,6 @@ #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages python-build) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -62,24 +60,22 @@ (define-public python-docker (package (name "python-docker") - (version "7.0.0") + (version "5.0.3") (source (origin (method url-fetch) (uri (pypi-uri "docker" version)) (sha256 (base32 - "18z5wzqm7dbxaa5q4gs8yh2dma8i7savqcvibvy1i56djbxkcdrj")))) + "1yr7w8vmdis01myx26pqx7wcyz2cy1mfs421alppq3lpc9ms45nr")))) (build-system python-build-system) ;; TODO: Tests require a running Docker daemon. (arguments '(#:tests? #f)) (inputs (list python-requests python-six python-urllib3)) - (native-inputs - (list python-setuptools-scm)) (propagated-inputs (list python-docker-pycreds python-paramiko ;adds SSH support - python-packaging python-websocket-client)) + python-websocket-client)) (home-page "https://github.com/docker/docker-py/") (synopsis "Python client for Docker") (description "Docker-Py is a Python client for the Docker container diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 5d455431d3..83c4313bd7 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -30,7 +30,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages documentation) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix gexp) @@ -104,7 +104,7 @@ (description "LaTeX2HTML is a utility that converts LaTeX documents to web pages in HTML.") (home-page "https://www.latex2html.org/") - (license gpl2+))) + (license license:gpl2+))) (define-public asciidoc (package @@ -175,7 +175,7 @@ EPUB, man page. AsciiDoc is highly configurable: both the AsciiDoc source file syntax and the backend output markups (which can be almost any type of SGML/XML markup) can be customized and extended by the user.") - (license gpl2+))) + (license license:gpl2+))) (define-deprecated asciidoc-py3 asciidoc) @@ -241,7 +241,34 @@ documentation from annotated C++ sources, but it also supports other popular programming languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba, Microsoft, and UNO/OpenOffice flavors), Fortran, VHDL, Tcl, and to some extent D.") - (license gpl3+))) + (license license:gpl3+))) + +(define-public halibut + (package + (name "halibut") + (version "1.3") + (source (origin + (method url-fetch) + (uri (string-append + "https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-" + version "/halibut-" version ".tar.gz")) + (sha256 + (base32 + "0ciikn878vivs4ayvwvr63nnhpcg12m8023xv514zxqpdxlzg85a")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f)) ;No tests. + (native-inputs (list pkg-config perl)) + (home-page "https://www.chiark.greenend.org.uk/~sgtatham/halibut/") + (synopsis "Documentation production system for software manuals") + (description + "Halibut is a text formatting system designed primarily for writing software +documentation. It accepts a single source format and outputs any combination of +plain text, HTML, Unix man or info pages, PostScript or PDF. It has extensive +support for indexing and cross-referencing, and generates hyperlinks within output +documents wherever possible. It supports Unicode, with the ability to fall back to +an alternative representation if Unicode output is not available.") + (license license:expat))) (define-public doc++ (package @@ -266,7 +293,7 @@ and to some extent D.") generate both TeX output for high-quality hardcopies or HTML output for online browsing. The documentation is extracted directly from the C/C++/IDL source or Java class files.") - (license gpl2+))) + (license license:gpl2+))) (define-public pod2pdf (package @@ -292,7 +319,7 @@ or Java class files.") Documentation} format to PDF files. It also supports some extensions to the POD format, and supports the file types JPG, GIF, TIFF, PNG, and PNM for embedded objects.") - (license artistic2.0))) + (license license:artistic2.0))) (define-public python-docrepr (package @@ -344,7 +371,7 @@ objects.") (description "Docrepr renders Python docstrings to HTML with Sphinx. It can generate rich and plain representations of docstrings, alongside additional metadata about the object to which the docstring belongs.") - (license bsd-3))) + (license license:bsd-3))) (define-public scrollkeeper (package @@ -377,7 +404,7 @@ documentation metadata as specified by the Open Source Metadata Framework and provides a simple API to allow help browsers to find, sort, and search the document catalog. It will also be able to communicate with catalog servers on the Net to search for documents which are not on the local system.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public zeal (let ((commit "1cfa7c637f745be9d98777f06b4f8dec90892bf2") @@ -425,4 +452,4 @@ the Net to search for documents which are not on the local system.") (synopsis "Offline documentation browser inspired by Dash") (description "Zeal is a simple offline documentation browser inspired by Dash.") - (license gpl3+)))) + (license license:gpl3+)))) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 698f15678b..f67e83aa9f 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -566,7 +566,7 @@ a pen-tablet display and a beamer.") (define-public fet (package (name "fet") - (version "6.15.0") + (version "6.18.1") (source (origin (method url-fetch) @@ -575,7 +575,7 @@ a pen-tablet display and a beamer.") (list (string-append directory base) (string-append directory "old/" base)))) (sha256 - (base32 "0mmk9f0b23lmmk40mv25wf9vgb7wdgfn5zsa1qrkvkh7dh1hjpax")))) + (base32 "0yf94z4yybaw53jf0hzi1p53rwa91wl3g6pai7gsr4palssyfxw2")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8c3fc5e022..eadc8eeb67 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -313,7 +313,7 @@ (define-public emacs-ac-php (package (name "emacs-ac-php") - (version "2.5.0") + (version "2.6.0") (source (origin (method git-fetch) @@ -322,7 +322,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10")))) + (base32 "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697")))) (build-system emacs-build-system) (arguments (list @@ -372,14 +372,14 @@ (define-public emacs-activities (package (name "emacs-activities") - (version "0.6") + (version "0.7") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/activities-" version ".tar")) (sha256 - (base32 "03dc2d9w40qp0qacv5vk49498qyb9y9n6ppd79jbglkpr0a60y21")))) + (base32 "17vwbblcwayf1lqfvc64s606cyv1pyh094i3d8fz0k5ivgfp6ybi")))) (build-system emacs-build-system) (propagated-inputs (list emacs-persist)) (home-page "https://github.com/alphapapa/activities.el") @@ -516,7 +516,7 @@ e.g. emacs-geiser-guile for Guile.") (define-public emacs-gptel (package (name "emacs-gptel") - (version "0.7.0") + (version "0.8.0") (source (origin (method git-fetch) (uri (git-reference @@ -525,7 +525,7 @@ e.g. emacs-geiser-guile for Guile.") (file-name (git-file-name name version)) (sha256 (base32 - "0wfqwp5rz77xzsxb56g4w9h047zb0y06ajcr724b5sjykbbznhzw")))) + "1n3kdylv50filla692j2vcjalw6yza80xlg90cw54m9jp9br8sch")))) (build-system emacs-build-system) (arguments (list @@ -3472,14 +3472,14 @@ podcasts) in Emacs.") (define emacs-emms-print-metadata (package (name "emacs-emms-print-metadata") - (version "18") + (version "19") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "emms-" version ".tar")) (sha256 - (base32 "1jslk37kx7yzvwy4hq1a6b71kp4a3bgfzzp8bpplv7z6vcmwrmgq")))) + (base32 "13c884s92ddn52psgkaz3zvb94g23gq41dbidpx7x4gzdhd9qqxm")))) (build-system gnu-build-system) (arguments (list @@ -4369,14 +4369,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "14.0.3") + (version "14.0.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "1xk29nk3r7ilxk2vag3diacamqvlws7mbjk5a0iivz5y6fy7hmjc")))) + (base32 "03w6qs4f0ksb8f54zsx189775w3wdyfaqg3dwn20a77y5cvisk52")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). @@ -4824,7 +4824,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (define-public emacs-cape (package (name "emacs-cape") - (version "1.3") + (version "1.4") (source (origin (method git-fetch) @@ -4833,7 +4833,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1zz5sah8zdkvmbh2kdn4v5vf3sb09krdrxhzyzcg63zjya2z8prz")))) + (base32 "1ml3w9xvcxbcbsi01rdsclsxra5h7jrm9lsrkbj1hin2wl5gr9np")))) (build-system emacs-build-system) (arguments (list @@ -5437,16 +5437,16 @@ Lisp developers who want to write macros with convenience.") (define-public emacs-tablist (package (name "emacs-tablist") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/politza/tablist") + (url "https://github.com/emacsorphanage/tablist") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0pzsdg0rm59daw34ppss79cg05z9wnr8nkmdcc48nkd0p69ip2yy")))) + "11vmvrhmsxy97bfj7jndpc58bik7177i3wvc45mlyldxwyirs962")))) (build-system emacs-build-system) (home-page "https://github.com/politza/tablist") (synopsis "Extension for @code{tabulated-list-mode}") @@ -5875,8 +5875,8 @@ code written in the D programming language.") (define-public emacs-extempore-mode ;; Use the latest commit at time of packaging. There are no releases or tags. - (let ((commit "09518ae6650d7be33a4633a4c0f31b7130d04c6e") - (revision "1")) + (let ((commit "92e0fff482a0a4dc2971c39581c5ea9e84ae5e1c") + (revision "2")) (package (name "emacs-extempore-mode") (version (git-version "0.0.0" revision commit)) @@ -5888,7 +5888,7 @@ code written in the D programming language.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0hfza9lzdsz94gxhmzyp9fwviscv19rmnjgd0q613faayn11sjsp")))) + (base32 "1chxl2x9wjblhfknx7aa8pgqppc60917n437bxapx4hp3275x16q")))) (build-system emacs-build-system) (home-page "https://github.com/extemporelang/extempore-emacs-mode") (synopsis "Emacs major mode for Extempore source files") @@ -6497,7 +6497,7 @@ files and directories.") (define-public emacs-fountain-mode (package (name "emacs-fountain-mode") - (version "3.7.1") + (version "3.7.2") (source (origin (method git-fetch) @@ -6506,7 +6506,7 @@ files and directories.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1m6xvda2bx5pxzklc0nlzfc9a9fbnvysld2zha59qdjlr9zzi298")))) + (base32 "0xy45inihqwaix49vxr5yiqyps4r2djkzdd4g7kkc0fv7kzrm1m4")))) (arguments (list #:phases #~(modify-phases %standard-phases @@ -6604,7 +6604,7 @@ window.") (define-public emacs-git-link (package (name "emacs-git-link") - (version "0.8.6") + (version "0.9.1") (source (origin (method git-fetch) @@ -6613,7 +6613,7 @@ window.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ifq9z4p0rbz2bpm6qz89xg5ycn5fflsyradzzxzsgyys0zc6szx")))) + (base32 "1dxmzk4qrz69h097lwshfg4qavdp92an5212ndhjkpmkgvk1v0xl")))) (build-system emacs-build-system) (arguments (list @@ -6675,7 +6675,7 @@ This mode supports Apache HTTP Server 2.4 and major modules.") (define-public emacs-apheleia (package (name "emacs-apheleia") - (version "4.0") + (version "4.1") (source (origin (method git-fetch) @@ -6684,7 +6684,7 @@ This mode supports Apache HTTP Server 2.4 and major modules.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0afv75w028v59qf777nrf57xj9yaz3jj2bixfmkgiqrn1wii9pm6")))) + (base32 "10adk4l5090dy0as6xqv5qpgdc0vf7jy8s1nrsn3zgf6n3s3ffqb")))) (build-system emacs-build-system) (home-page "https://github.com/raxod502/apheleia") (synopsis "Reformat buffer stably") @@ -7984,7 +7984,7 @@ mode-line.") (define-public emacs-robe (package (name "emacs-robe") - (version "0.8.3") + (version "0.8.4") (source (origin (method git-fetch) @@ -7993,7 +7993,7 @@ mode-line.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1xbj7wi389n6pxfvxrakvhylkdlqg8ll9ad2zmxggcchygwah6nl")))) + (base32 "0kvyfyr4b0z0l964a8z9shy8nlnxzxc2ljcc02gj2pn1rn1wz0gq")))) (build-system emacs-build-system) (arguments '(#:include (cons "^lib\\/" %default-include))) @@ -8958,7 +8958,14 @@ user.") (arguments (list #:tests? #t - #:test-command #~(list "make" "test-only"))) + #:test-command #~(list "make" "test-only") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'compatibility-with-recent-buttercup + (lambda _ + (substitute* (find-files "tests/" "\\.el$") + (("\\(buttercup-minor-mode\\) -\\*-") + "(buttercup-minor-mode); lexical-binding: t -*-"))))))) (native-inputs (list emacs-buttercup)) (build-system emacs-build-system) (home-page "https://elpa.nongnu.org/nongnu/subed.html") @@ -9316,14 +9323,14 @@ correct movement and editing than you would otherwise have.") (define-public emacs-compat (package (name "emacs-compat") - (version "29.1.4.4") + (version "29.1.4.5") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "compat-" version ".tar")) (sha256 (base32 - "0710g552b1nznnfx2774gmg6yizs27s0bakqm95nsjrp6kgznbfr")))) + "191cjzrw9xm5bvcf8s1yr9hdcn9i02789xfd8pz33lk65s0rq413")))) (build-system emacs-build-system) (home-page "https://git.sr.ht/~pkal/compat") (synopsis "Emacs Lisp Compatibility Library") @@ -10356,70 +10363,68 @@ in HTML mode.") (define-public emacs-slime ;; Update together with sbcl-slime-swank. - (let ((commit "735258a26bb97e85d25f39e4bef83c1f80c12f5d") - (revision "1")) - (package - (name "emacs-slime") - (version (git-version "2.28" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/slime/slime") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0prskgzfqjmn8sc7p9nklnd0n1plwcvh40slgh23km31raplmzk7")))) - (build-system emacs-build-system) - (arguments - (list - #:include #~(cons* "\\.lisp$" "\\.asd$" - "contrib" - "lib/hyperspec.el" - %default-include) - #:exclude #~(list "^slime-tests.el" "^contrib/test/" - "^contrib/Makefile$" "^contrib/README.md$") - #:phases - #~(modify-phases %standard-phases - (add-before 'install 'configure - (lambda* _ - (emacs-substitute-variables "slime.el" - ("inferior-lisp-program" "sbcl")))) - (add-before 'install 'install-doc - (lambda _ - (let ((info-dir (string-append #$output "/share/info")) - (doc-dir (string-append #$output "/share/doc/" - #$name "-" #$version)) - (doc-files '("doc/slime-refcard.pdf" - "README.md" "NEWS" "PROBLEMS" - "CONTRIBUTING.md"))) - (with-directory-excursion "doc" - (substitute* "Makefile" - (("infodir=/usr/local/info") - (string-append "infodir=" info-dir))) - (invoke "make" "html/index.html") - (invoke "make" "slime.info") - (install-file "slime.info" info-dir) - (copy-recursively "html" (string-append doc-dir "/html"))) - (for-each (lambda (f) - (install-file f doc-dir) - (delete-file f)) - doc-files) - (delete-file-recursively "doc"))))))) - (propagated-inputs - (list emacs-macrostep)) - (native-inputs - (list texinfo)) - (home-page "https://github.com/slime/slime") - (synopsis "Superior Lisp Interaction Mode for Emacs") - (description - "SLIME extends Emacs with support for interactive programming in + (package + (name "emacs-slime") + (version "2.29.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/slime/slime") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fcasqsdfwsphkfx1vd3r5mr89vgvzb9g2dbw82mc9lijg1mr1ki")))) + (build-system emacs-build-system) + (arguments + (list + #:include #~(cons* "\\.lisp$" "\\.asd$" + "contrib" + "lib/hyperspec.el" + %default-include) + #:exclude #~(list "^slime-tests.el" "^contrib/test/" + "^contrib/Makefile$" "^contrib/README.md$") + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'configure + (lambda* _ + (emacs-substitute-variables "slime.el" + ("inferior-lisp-program" "sbcl")))) + (add-before 'install 'install-doc + (lambda _ + (let ((info-dir (string-append #$output "/share/info")) + (doc-dir (string-append #$output "/share/doc/" + #$name "-" #$version)) + (doc-files '("doc/slime-refcard.pdf" + "README.md" "NEWS" "PROBLEMS" + "CONTRIBUTING.md"))) + (with-directory-excursion "doc" + (substitute* "Makefile" + (("infodir=/usr/local/info") + (string-append "infodir=" info-dir))) + (invoke "make" "html/index.html") + (invoke "make" "slime.info") + (install-file "slime.info" info-dir) + (copy-recursively "html" (string-append doc-dir "/html"))) + (for-each (lambda (f) + (install-file f doc-dir) + (delete-file f)) + doc-files) + (delete-file-recursively "doc"))))))) + (propagated-inputs + (list emacs-macrostep)) + (native-inputs + (list texinfo)) + (home-page "https://github.com/slime/slime") + (synopsis "Superior Lisp Interaction Mode for Emacs") + (description + "SLIME extends Emacs with support for interactive programming in Common Lisp. The features are centered around @command{slime-mode}, an Emacs minor mode that complements the standard @command{lisp-mode}. While lisp-mode supports editing Lisp source files, @command{slime-mode} adds support for interacting with a running Common Lisp process for compilation, debugging, documentation lookup, and so on.") - (license (list license:gpl2+ license:public-domain))))) + (license (list license:gpl2+ license:public-domain)))) (define-public emacs-popup (package @@ -10898,7 +10903,7 @@ sgml/html integration, and indentation (working with sgml).") (define-public emacs-jinx (package (name "emacs-jinx") - (version "1.2") + (version "1.4") (source (origin (method git-fetch) @@ -10908,7 +10913,7 @@ sgml/html integration, and indentation (working with sgml).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "04avl356y0m0i1mqmzzz0245fxflj7i8ssicnvf4wmpjc0qdr694")))) + (base32 "14zamk2s20f6dnv23v9snya0mi1bs2nq6xpp5bj06kiymzwhcqjw")))) (build-system emacs-build-system) (arguments (list @@ -12019,7 +12024,7 @@ include installing, removing or visiting the homepage.") (define-public emacs-prescient (package (name "emacs-prescient") - (version "6.2") + (version "6.3") (source (origin (method git-fetch) @@ -12028,7 +12033,7 @@ include installing, removing or visiting the homepage.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk")))) + (base32 "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4")))) (build-system emacs-build-system) (propagated-inputs (list emacs-company emacs-corfu emacs-ivy emacs-selectrum emacs-vertico)) @@ -12102,7 +12107,7 @@ style, or as multiple word prefixes.") (define-public emacs-consult (package (name "emacs-consult") - (version "1.2") + (version "1.4") (source (origin (method git-fetch) @@ -12110,7 +12115,7 @@ style, or as multiple word prefixes.") (url "https://github.com/minad/consult") (commit version))) (sha256 - (base32 "1466f6j9bxw9mh0ad9yv2qfkhzlz1ysgch53nlkvbry4llhdhj43")) + (base32 "0kp1xrivs111d8ksjyf3m1ldzb8qknwrh2k2lzbrq6yiwc4bigy7")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -13588,31 +13593,33 @@ allowing unprefixed keys to insert their respective characters as expected.") (license license:gpl3+)))) (define-public emacs-clojure-mode - (package - (name "emacs-clojure-mode") - (version "5.18.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/clojure-emacs/clojure-mode") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5")))) - (build-system emacs-build-system) - (native-inputs - (list emacs-buttercup emacs-dash emacs-paredit emacs-s)) - (arguments - `(#:tests? #t - #:test-command '("buttercup"))) - (home-page "https://github.com/clojure-emacs/clojure-mode") - (synopsis "Major mode for Clojure code") - (description - "This Emacs package provides font-lock, indentation, navigation and basic + (let ((commit "af0e518a6b86f2c6f32dfb30b99c067071ed5cd4") + (revision "1")) + (package + (name "emacs-clojure-mode") + (version (git-version "5.18.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clojure-emacs/clojure-mode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wx3zgrwxywqk7f47idp2d09vjf557xf4l6p5a9xwqmpylnwaznh")))) + (build-system emacs-build-system) + (native-inputs + (list emacs-buttercup emacs-dash emacs-paredit emacs-s)) + (arguments + `(#:tests? #t + #:test-command '("buttercup"))) + (home-page "https://github.com/clojure-emacs/clojure-mode") + (synopsis "Major mode for Clojure code") + (description + "This Emacs package provides font-lock, indentation, navigation and basic refactoring for the @uref{http://clojure.org, Clojure programming language}. It is recommended to use @code{clojure-mode} with Paredit or Smartparens.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-clj-deps-new (let ((commit "e1cf65eb040f5a2e9a3eca970044ba71cc53fb27") @@ -13642,7 +13649,7 @@ Clojure projects from templates.") (define-public emacs-clj-refactor (package (name "emacs-clj-refactor") - (version "3.11.3") + (version "3.12.0") (source (origin (method git-fetch) @@ -13651,7 +13658,7 @@ Clojure projects from templates.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "17c9lrykbfp0ab7lmi4jh34q6ir7i46acn313xw5342d2q5ql6sk")))) + (base32 "0mha1wqn5hd9g8y0fp35qkhlnxlrwli62x7mbifman279h16gaml")))) (build-system emacs-build-system) (propagated-inputs (list emacs-cider @@ -15198,7 +15205,7 @@ generated by Org mode (or Markdown mode) is left untouched.") (define-public emacs-visual-fill-column (package (name "emacs-visual-fill-column") - (version "2.5.2") + (version "2.6.2") (source (origin (method git-fetch) @@ -15207,7 +15214,7 @@ generated by Org mode (or Markdown mode) is left untouched.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0mw61gc70bi64kypnag9xl3y9sd2y7mb8d2q97aq74jx7hq6cm8j")))) + (base32 "1imliz6fb5bxwcflkiqgk82xa34qkxaxzmy3rmj1cy2va148afx9")))) (build-system emacs-build-system) (home-page "https://codeberg.org/joostkremers/visual-fill-column") (synopsis "Fill-column for visual-line-mode") @@ -16179,35 +16186,45 @@ using package inferred style.") (license license:gpl3+)))) (define-public emacs-lua-mode - (package - (name "emacs-lua-mode") - (version "20210802") - (home-page "https://github.com/immerrr/lua-mode/") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0r3svhggdml2n256k3b0zmbjnw51p46gan6dg07bhavpfrqs5196")))) - (build-system emacs-build-system) - (arguments - `(#:tests? #t - #:test-command '("buttercup" "-l" "lua-mode.el"))) - (native-inputs - (list emacs-buttercup lua)) - (synopsis "Major mode for lua") - (description - "This Emacs package provides a mode for @uref{https://www.lua.org/, + (let ((commit "d074e4134b1beae9ed4c9b512af741ca0d852ba3") + (revision "1")) + (package + (name "emacs-lua-mode") + (version (git-version "20221027" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/immerrr/lua-mode/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00gvrmw8pll0cl7srygh2kmbf0g44sk9asj5sm77qvhr8jz4xkkq")))) + (build-system emacs-build-system) + (arguments + (list + #:tests? #t + #:test-command #~(list "buttercup" "-l" "lua-mode.el") + #:phases + #~(modify-phases %standard-phases + ;; XXX: These tests are not compatible with Buttercup, and cause + ;; build to fail. Remove them until they are fixed by upstream. + (add-after 'unpack 'remove-faulty-tests + (lambda _ + (delete-file "test/test-indentation.el")))))) + (native-inputs + (list emacs-buttercup lua)) + (home-page "https://github.com/immerrr/lua-mode/") + (synopsis "Major mode for Lua") + (description + "This Emacs package provides a mode for @uref{https://www.lua.org/, Lua programming language}.") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public emacs-ebuild-mode (package (name "emacs-ebuild-mode") - (version "1.69") + (version "1.70") (source (origin (method url-fetch) @@ -16216,7 +16233,7 @@ Lua programming language}.") "ebuild-mode-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz")) (sha256 - (base32 "1sqyjz4qy07q6wkh89gg4f4s1fk96mv2f99y4rm0sp7gf6bkdj38")))) + (base32 "14cy52hyh5gam1m5a4ys1zmlwabi7gv4nc8l6ki61lh5g1gqmbly")))) (build-system emacs-build-system) (arguments (list @@ -16304,7 +16321,7 @@ extensions.") (define-public emacs-evil-collection (package (name "emacs-evil-collection") - (version "0.0.9") + (version "0.0.10") (source (origin (method git-fetch) @@ -16313,7 +16330,7 @@ extensions.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1y1ig4shqaaiiwqm5pv8hvh8ynr6irhffkgmpyzmhdaaicxnfazc")))) + (base32 "09hnxb8nh3g0hi93fz9f1y164gv9iyh5994wfn6fsq2v1xdz8phm")))) (build-system emacs-build-system) (arguments (list @@ -16895,7 +16912,7 @@ passive voice.") (define-public emacs-org (package (name "emacs-org") - (version "9.6.19") + (version "9.6.21") (source (origin (method git-fetch) @@ -16904,7 +16921,7 @@ passive voice.") (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0yxicr9z6drsaybp8jl0jmslcqbz0np4gzzkr70j8pq3x9y69i7z")))) + (base32 "1hf76wa7qvp9lvkr3rgzk7q3slq7mf17w6w6axaj6cn73ryn2ldw")))) (build-system emacs-build-system) (arguments (list @@ -19280,25 +19297,24 @@ methods from a given list.") (license license:gpl3+))) (define-public emacs-mini-echo - (let ((commit "f25a2f543b3e9fa5043ef37c81c17fc15aceb534") - (revision "1")) - (package - (name "emacs-mini-echo") - (version (git-version "0.7.2" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/liuyinz/mini-echo.el.git") - (commit commit))) - (sha256 - (base32 "1nbwwf087v1mp5vbmasxqnmbrsgzgm87yd5ajq1hnfxd412w3vhx")))) - (build-system emacs-build-system) - (home-page "https://github.com/liuyinz/mini-echo.el") - (synopsis "Echo buffer status in minibuffer window") - (description "This package lets you show buffer status in the echo area, + (package + (name "emacs-mini-echo") + (version "0.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/liuyinz/mini-echo.el") + (commit (string-append "v" version)))) + (sha256 + (base32 "0q4hvbypnjg5q1szwki2md45r5kkdxrr4zxqh57y7d53idjzhpnf")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-hide-mode-line)) + (home-page "https://github.com/liuyinz/mini-echo.el") + (synopsis "Echo buffer status in minibuffer window") + (description "This package lets you show buffer status in the echo area, so you can get rid of the mode-line.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-mini-frame (let ((commit "60838f3cab438dcbda8eaa15ab3e5d1af88910e9") @@ -19785,15 +19801,17 @@ a point. The plugin provides visual feedback for marked regions.") (define-public emacs-key-chord (package (name "emacs-key-chord") - (version "0.6") + (version "0.7") (source (origin - (method url-fetch) - (uri "https://www.emacswiki.org/emacs/download/key-chord.el") - (file-name (string-append "key-chord-" version ".el")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacsorphanage/key-chord") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg")))) + "0r3zvq1z79csgcq0mgifdakx0z0li3haxk4wxvijwxllfb9kn22g")))) (build-system emacs-build-system) (home-page "https://www.emacswiki.org/emacs/key-chord.el") (synopsis "Map pairs of simultaneously pressed keys to Emacs commands") @@ -20256,7 +20274,7 @@ a @url{http://json.org/, JSON} file.") (define-public emacs-json-mode (package (name "emacs-json-mode") - (version "1.9.0") + (version "1.9.1") (source (origin (method git-fetch) @@ -20265,7 +20283,7 @@ a @url{http://json.org/, JSON} file.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0irz9gpw43wkhiq8828wm9nsc3baqg299dgly9iv7jiygk2lp14s")))) + (base32 "1yy440aaf17y6nrlcq0phz0x5j3wcymcrdm8pm0rmwdxfmar0csx")))) (build-system emacs-build-system) (propagated-inputs (list emacs-json-snatcher)) @@ -21588,57 +21606,45 @@ part, which includes creating tokens.") (license license:asl2.0))) (define-public emacs-circe - (package - (name "emacs-circe") - (version "2.12") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jorgenschaefer/circe") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937")))) - (build-system emacs-build-system) - (arguments - `(#:tests? #t - #:test-command '("buttercup" "-L" ".") - #:emacs ,emacs ;requires gnutls - #:phases - (modify-phases %standard-phases - ;; The HOME environment variable should be set to an existing - ;; directory for the tests to succeed. - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" "/tmp"))) - (add-before 'check 'remove-failing-tests - (lambda _ - (make-file-writable "tests/test-circe.el") - (emacs-batch-edit-file "tests/test-circe.el" - `(progn - (dolist (test - '("should have circe-server-buffer set in the mode hook" - "should complete nicks with colon at the beginning of the input" - "should complete nicks without colon later in the input")) - (goto-char (point-min)) - (search-forward (format "(it %S" test)) - (beginning-of-line) - (kill-sexp)) - (basic-save-buffer)))))))) - (native-inputs - (list emacs-buttercup)) - ;; In order to securely connect to an IRC server using TLS, Circe requires - ;; the GnuTLS binary. - (propagated-inputs - (list gnutls)) - (home-page "https://github.com/jorgenschaefer/circe") - (synopsis "Client for IRC in Emacs") - (description "Circe is a Client for IRC in Emacs. It integrates well with + (let ((commit "cc630eb9acb835012ad207dce545d2c380588da7") + (revision "1")) + (package + (name "emacs-circe") + (version (git-version "2.13" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jorgenschaefer/circe") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1m2vnp38yv9fnxchcbf6mrzb7yp7z214vr28pr7sslrmm99dqg89")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("buttercup" "-L" ".") + #:emacs ,emacs ;requires gnutls + #:phases + (modify-phases %standard-phases + ;; The HOME environment variable should be set to an existing + ;; directory for the tests to succeed. + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp")))))) + (native-inputs + (list emacs-buttercup)) + ;; In order to securely connect to an IRC server using TLS, Circe requires + ;; the GnuTLS binary. + (propagated-inputs + (list gnutls)) + (home-page "https://github.com/jorgenschaefer/circe") + (synopsis "Client for IRC in Emacs") + (description "Circe is a Client for IRC in Emacs. It integrates well with the rest of the editor, using standard Emacs key bindings and indicating activity in channels in the status bar so it stays out of your way unless you want to use it.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-tracking (package @@ -22872,7 +22878,7 @@ match and total match information in the mode-line in various search modes.") (define-public emacs-pg (package (name "emacs-pg") - (version "0.28") + (version "0.30") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/emarsden/pg-el") @@ -22880,7 +22886,7 @@ match and total match information in the mode-line in various search modes.") (file-name (git-file-name name version)) (sha256 (base32 - "00sdvlb9ybyzncjijibw81mf3lhw5p40v7086cg18xvpa2qvzdfz")))) + "1g04izsnvxinbwvzx0sj643ix5jlwdd7dkl61nvaqkkkm3g35jp6")))) (build-system emacs-build-system) (home-page "https://github.com/emarsden/pg-el") (synopsis "Emacs Lisp interface for PostgreSQL") @@ -23501,7 +23507,7 @@ according to a parsing expression grammar.") (define-public emacs-eldev (package (name "emacs-eldev") - (version "1.9") + (version "1.9.1") (source (origin (method git-fetch) @@ -23510,7 +23516,7 @@ according to a parsing expression grammar.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0mhp3m4d5na844nnv107j706552h0q6xs93jkp4rmqiig73kq17w")))) + (base32 "1v0jwzwq0xpih8m4aymz90fdfvypkiqczh0ip5jg4kcvzikliw3f")))) (build-system emacs-build-system) (arguments (list @@ -23716,7 +23722,7 @@ files to be expanded upon opening them.") (define-public emacs-ebib (package (name "emacs-ebib") - (version "2.40.4") + (version "2.40.5") (source (origin (method git-fetch) @@ -23725,7 +23731,7 @@ files to be expanded upon opening them.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0b60k4yqmnim9hx25dhyvn6g646mq10pym8k6h176jr06br8kc2y")))) + (base32 "1ga8zzzqs6vrjzm6jily37jyzpq4vsgh49vxy8a68399bdl90s77")))) (build-system emacs-build-system) (propagated-inputs (list emacs-biblio emacs-compat emacs-ivy emacs-parsebib)) @@ -26787,31 +26793,30 @@ be changed by customizing the appropriate variables.") (license license:gpl3+)))) (define-public emacs-org-caldav - (let ((commit "754989ae500b3f576bdb94fe2ef3059f12eaf7d7")) ;version bump - (package - (name "emacs-org-caldav") - (version "3.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dengste/org-caldav") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0vx465di6imfxmxxkhd8lsdgywyz3gnindg0fyvb2zshg3zz80bg")))) - (build-system emacs-build-system) - (arguments - ;; Tests require to have two specific calendars on a test server. - `(#:exclude '("^org-caldav-testsuite\\.el"))) - (propagated-inputs - (list emacs-org)) - (home-page "https://github.com/dengste/org-caldav") - (synopsis "Sync Org files with external calendars via the CalDAV protocol") - (description - "Org CalDAV synchronizes events between Org files and a CalDAV + (package + (name "emacs-org-caldav") + (version "3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dengste/org-caldav") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0im6swyhdy8g56lh2nnbz7hb4hjqspi7aag7qc4616m5fs7ijlig")))) + (build-system emacs-build-system) + (arguments + ;; Tests require to have two specific calendars on a test server. + `(#:exclude '("^org-caldav-testsuite\\.el"))) + (propagated-inputs + (list emacs-org)) + (home-page "https://github.com/dengste/org-caldav") + (synopsis "Sync Org files with external calendars via the CalDAV protocol") + (description + "Org CalDAV synchronizes events between Org files and a CalDAV calendar.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-zotxt (package @@ -27774,8 +27779,17 @@ turn.") (native-inputs (list emacs-buttercup emacs-undercover)) (arguments - `(#:tests? #t - #:test-command '("buttercup" "-L" "test/github-review-test.el"))) + (list + #:tests? #t + #:test-command #~(list "buttercup" "-L" "test/github-review-test.el") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'compatibility-with-recent-buttercup + (lambda _ + (emacs-batch-edit-file "test/github-review-test.el" + '(progn + (insert ";;; -*-lexical-binding:t-*-") + (basic-save-buffer)))))))) (home-page "https://github.com/charignon/github-review") (synopsis "Review GitHub pull requests within Emacs") (description "This package provides commands to pull in, comment on, and @@ -28704,49 +28718,51 @@ and comments.") (license license:gpl3+)))) (define-public emacs-yeetube - (package - (name "emacs-yeetube") - (version "2.1.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.thanosapollo.org/yeetube") - (commit version))) - (sha256 - (base32 - "0c2iq6rb179zh9qbw7prxsjbiz77j060pj75s82wbbz5xjavzgp5")) - (file-name (git-file-name name version)))) - (build-system emacs-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'locate-binaries - (lambda* (#:key inputs #:allow-other-keys) - (emacs-substitute-variables "yeetube.el" - ("yeetube-ytdlp" - (search-input-file inputs "/bin/yt-dlp"))) - (emacs-substitute-variables "yeetube-mpv.el" - ("yeetube-mpv-path" - (search-input-file inputs "/bin/mpv")) - ("yeetube-mpv-torsocks" - (search-input-file inputs "/bin/torsocks"))))) - (add-after 'unpack 'relax-check - (lambda _ - (substitute* "yeetube-mpv.el" - (("\\(yeetube-mpv-check\\)") ""))))))) - (inputs (list mpv torsocks yt-dlp)) - (propagated-inputs (list emacs-compat)) - (home-page "https://thanosapollo.com/blog/yeetube/") - (synopsis "Youtube and Invidious front-end for Emacs") - (description - "This package offers an Emacs interface that allows you to search YouTube + (let ((commit "c74e4e77156297624d278a05bdd19c016a91ff9b")) ;version bump + (package + (name "emacs-yeetube") + (version "2.1.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.thanosapollo.org/yeetube") + (commit commit))) + (sha256 + (base32 + "1gpfm41d4wzk1i0hnmfn81xv05ida9ljibar7ji4d7nisjbd4vp9")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'locate-binaries + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "." "\\.el$") + (("\\(executable-find \"mpv\"\\)") + (format #f "~s" + (search-input-file inputs "/bin/mpv"))) + (("\\(executable-find \"torsocks\"\\)") + (format #f "~s" + (search-input-file inputs "/bin/torsocks"))) + (("\\(executable-find \"wget\"\\)") + (format #f "~s" + (search-input-file inputs "/bin/wget"))) + (("\\(executable-find \"yt-dlp\"\\)") + (format #f "~s" + (search-input-file inputs "/bin/yt-dlp"))))))))) + (inputs (list mpv torsocks wget yt-dlp)) + (propagated-inputs (list emacs-compat)) + (home-page "https://thanosapollo.com/blog/yeetube/") + (synopsis "Youtube and Invidious front-end for Emacs") + (description + "This package offers an Emacs interface that allows you to search YouTube or an Invidious instance for a specific query. The search results are shown as links in an Org mode buffer. The videos can be opened to a user-defined video player (by default @command{mpv}) or downloaded using @command{yt-dlp}. This package also includes a @code{yt-dlp} front-end.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-org-web-tools (package @@ -29356,7 +29372,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)") (define-public emacs-buttercup (package (name "emacs-buttercup") - (version "1.33") + (version "1.34") (source (origin (method git-fetch) @@ -29366,7 +29382,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)") (file-name (git-file-name name version)) (sha256 (base32 - "10q6zr837yaal1g3l7vmj08b3c301j99b290pylshb0si360a27h")))) + "07bsbzqxsb6sbayriymy54bqcy7is7c61fpnm83mg9527w0w4g19")))) (build-system emacs-build-system) (arguments (list @@ -31535,28 +31551,25 @@ functions for Fish shell scripts.") (license license:gpl3+))) (define-public emacs-eshell-up - (let ((commit "9c100bae5c3020e8d9307e4332d3b64e7dc28519") - (version "0.0.3") - (revision "12")) - (package - (name "emacs-eshell-up") - (version (git-version version revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/peterwvj/eshell-up") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "00zdbcncjabgj5mp47l1chymx5na18v2g4kj730dgmj3rnl3iz2q")))) - (build-system emacs-build-system) - (home-page "https://github.com/peterwvj/eshell-up") - (synopsis "Quickly go to a parent directory in @code{Eshell}") - (description "This package provides quick navigation to a specific -parent directory using @code{Eshell}.") - (license license:gpl3+)))) + (package + (name "emacs-eshell-up") + (version "0.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/peterwvj/eshell-up") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0kdqbnapgdk6p4sid9yjlk16sps2qq3xyh7j0jljn0c25qhqbw21")))) + (build-system emacs-build-system) + (home-page "https://github.com/peterwvj/eshell-up") + (synopsis "Quickly go to a parent directory in Eshell") + (description "This package provides quick navigation to a specific parent +directory using Eshell.") + (license license:gpl3+))) (define-public emacs-springboard ;; Upstream provides no tag. Using the latest commit. Version is extracted @@ -32745,14 +32758,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.6.2.1") + (version "2.6.2.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "145riknpdvw7rvpz20m766yci3w012f241mw38pbbb9cb8pn2rbf")))) + (base32 "0bbsff2qr71f70nxhdi19b3jzpv6bgfb7x7qkrccsygvsvgyrb2h")))) (build-system emacs-build-system) (arguments (list @@ -33682,7 +33695,7 @@ simple but powerful Org contents.") (define-public emacs-ox-tufte (package (name "emacs-ox-tufte") - (version "4.0.4") + (version "4.1.1") (source (origin (method git-fetch) @@ -33691,7 +33704,7 @@ simple but powerful Org contents.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "15jfwrdawj8flgyfqhsfhdlnam6n5gzw5minnixwxyp69q5vxnpw")))) + (base32 "0nmi6p19sg2vl64znm356bchphbybq03jyjsnqhddb39c4pilxah")))) (build-system emacs-build-system) (arguments (list @@ -33782,7 +33795,7 @@ time.") (define-public emacs-mastodon (package (name "emacs-mastodon") - (version "1.0.14") + (version "1.0.18") (source (origin (method git-fetch) @@ -33791,7 +33804,7 @@ time.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "151190hcafm0r8pi053lm7akjli3m55q676sa3i3fy9c0pc4bhz8")))) + (base32 "1l4arid01m5475wq4sy8j598ww13847sbpg9grl71r72rs83071w")))) (build-system emacs-build-system) (arguments (list @@ -34258,16 +34271,16 @@ Emacs that integrate with major modes like Org-mode.") (define-public emacs-modus-themes (package (name "emacs-modus-themes") - (version "4.3.0") + (version "4.4.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://git.sr.ht/~protesilaos/modus-themes") + (url "https://github.com/protesilaos/modus-themes") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "12i32y7y6hcv7mqc6g7pcmxr2f54xf3vl2yavdv76643vlhay32v")))) + (base32 "1vy6wyq8hv8fih4m8m1k9n7fdp913nmv0k5g8vppnjivmnrwfswy")))) (native-inputs (list texinfo)) (build-system emacs-build-system) (arguments @@ -34300,6 +34313,29 @@ users with red-green color deficiency.") (license (list license:gpl3+ license:fdl1.3+)))) ; GFDLv1.3+ for the manual +(define-public emacs-plan9-theme + (let ((commit "c2da2fcb241e9800d931a1ff19ecd9fd84d30382") + (revision "0")) + (package + (name "emacs-plan9-theme") + (home-page "https://github.com/john2x/plan9-theme.el") + (version (git-version "0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rjxbk9fljnjmg00vdqcyynzg591cgknyy2d92xsxsyg4d28dvwi")))) + (build-system emacs-build-system) + (synopsis "Light color theme for Emacs based on Plan 9") + (description + "@code{plan9} is an Emacs theme with light colors and a classic +look which is inspired by the colors of Plan 9 from Bell Labs.") + (license license:gpl3+)))) + (define-public emacs-punpun-theme (let ((commit "7026684cd568cb691af3ced5de14c375fe6f5a1a") (revision "0")) @@ -37899,44 +37935,46 @@ released, and track their progress in watching a series.") (license license:gpl3+))) (define-public emacs-webpaste - (package - (name "emacs-webpaste") - (version "3.2.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/etu/webpaste.el") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "07hj9nr7x6c9w2dnvc58cfbprgp9cqzdxflp5qlpglzdw0bi9s3c")))) - (build-system emacs-build-system) - (arguments - `(#:tests? #t - #:test-command '("make" "unit" "integration") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - ;; Do not use cask to run tests. - (substitute* "Makefile" - (("\\$\\{CASK\\} exec ") "")) - ;; Disable tests that need network access. - (substitute* (list "tests/unit/test-webpaste-provider-creation.el" - "tests/integration/test-webpaste-providers.el") - (("describe") "xdescribe"))))))) - (native-inputs - (list emacs-buttercup)) - (propagated-inputs - (list emacs-request)) - (home-page "https://github.com/etu/webpaste.el") - (synopsis "Paste to pastebin-like services") - (description "This mode pastes whole buffers or parts of buffers + (let ((commit "8ac7b2d409f158bcaa853aa1c5763e8acf2857bb") + (revision "1")) + (package + (name "emacs-webpaste") + (version (git-version "3.2.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/etu/webpaste.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wl2q4q7c2a1m60q4dnajsyzkc9yprkyzx4hxzmxkwry22k906x3")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("make" "unit" "integration") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + ;; Do not use cask to run tests. + (substitute* "Makefile" + (("\\$\\{CASK\\} exec ") "")) + ;; Disable tests that need network access. + (substitute* (list "tests/unit/test-webpaste-provider-creation.el" + "tests/integration/test-webpaste-providers.el") + (("describe") "xdescribe"))))))) + (native-inputs + (list emacs-buttercup)) + (propagated-inputs + (list emacs-request)) + (home-page "https://github.com/etu/webpaste.el") + (synopsis "Paste to pastebin-like services") + (description "This mode pastes whole buffers or parts of buffers to pastebin-like services. It supports more than one service and will failover if one service fails. More services can easily be added over time and preferred services can easily be configured.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-keystore-mode (let ((release "0.0.1") diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index d77659f018..5916717a31 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2018, 2023 David Thompson <dthompson2@worcester.edu> ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2017-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2017-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> @@ -410,7 +410,7 @@ older games.") ;; This is not a patch staging area for DOSBox, but an unaffiliated fork. (package (name "dosbox-staging") - (version "0.80.1") + (version "0.81.0") (source (origin (method git-fetch) @@ -419,7 +419,7 @@ older games.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1iqqrw95lpgjbmi777jdl5z1nizxgfy8xwpmy1fasjlb2yh2kp93")))) + (base32 "1fkshxaq12pd72v8m2f3a6d6jk9gh39hn0846gfkfinvw7yykzrl")))) (build-system meson-build-system) (arguments (list #:configure-flags @@ -736,7 +736,7 @@ The following systems are supported: (define-public mgba (package (name "mgba") - (version "0.10.2") + (version "0.10.3") (source (origin (method git-fetch) @@ -746,7 +746,7 @@ The following systems are supported: (file-name (git-file-name name version)) (sha256 (base32 - "1wwpjcblp2c1svab4z1if5xb7707wsy6zw590lwdz9za35i0h37q")) + "1h4wsx76kylsn4f4418swbp6zjp1x94dfn751iks1i6i529pfay1")) (modules '((guix build utils))) (snippet ;; Make sure we don't use the bundled software. @@ -760,7 +760,8 @@ The following systems are supported: (arguments `(#:tests? #f ;no "test" target #:configure-flags - (list "-DUSE_LZMA=OFF" ;do not use bundled LZMA + (list "-DBUILD_LTO=OFF" ;FIXME: <https://github.com/mgba-emu/mgba/issues/3115> + "-DUSE_LZMA=OFF" ;do not use bundled LZMA "-DUSE_LIBZIP=OFF"))) ;use "zlib" instead (native-inputs (list pkg-config qttools-5)) (inputs @@ -1574,14 +1575,14 @@ that compiles to WebAssembly.") (define-public scummvm (package (name "scummvm") - (version "2.7.0") + (version "2.8.1") (source (origin (method url-fetch) (uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version "/scummvm-" version ".tar.xz")) (sha256 - (base32 "14wrrzai25mh8qra3lsfibx8z6f96cqbnmsfh9kyhkvpc7yiyjs4")))) + (base32 "1dr70z1dkfw2gp43jq0qp7g73glr36a7qdcv1jvp1m927nhz95vy")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 8c30bd1a30..08b345332a 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -31,12 +31,14 @@ ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com> ;;; Copyright © 2022 Collin J. Doering <collin@rekahsoft.ca> +;;; Copyright © 2023 dan <i@dan.games> ;;; Copyright © 2022 Justin Veilleux <terramorpha@cock.li> ;;; Copyright © 2023 Frank Pursel <frank.pursel@gmail.com> ;;; Copyright © 2023 Skylar Hill <stellarskylark@posteo.net> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> ;;; Copyright © 2023 Attila Lendvai <attila@lendvai.name> ;;; Copyright © 2024 Saku Laesvuori <saku@laesvuori.fi> +;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -608,7 +610,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (define-public electron-cash (package (name "electron-cash") - (version "4.3.1") + (version "4.4.0") (source (origin (method git-fetch) @@ -617,7 +619,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0slx7hmlw2gpcqg951vwvnyl7j52pfzqyaldphghhfxbfzjs7v64")))) + (base32 "1hfkp24m1yipadanjf5wm6clmyllkcbh7fbw8whnrvxa2v7sa4l8")))) (build-system python-build-system) (arguments (list @@ -1969,35 +1971,54 @@ that allows you to run services and through them access the Bitcoin Cash network (version "2.3.6") (source (origin - (method url-fetch) - (uri (pypi-uri "beancount" version)) + (method git-fetch) ; no test data files in PyPI archive + (uri (git-reference + (url "https://github.com/beancount/beancount") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0nj7sdh7wxc0hv8wxwqhw9v1zgx1sn4w92368ci2wzdmssz967w0")) - (patches (search-patches "beancount-disable-googleapis-fonts.patch")))) - (build-system python-build-system) + (base32 "1slxsjw29cyr2kbirdpijhpqspk55k38rpmk3zc02pr1wll62qsv")) + (patches (search-patches "beancount-disable-googleapis-fonts.patch")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Remove broken experiments. + (delete-file-recursively "experiments") + ;; Remove bundled packages. + (delete-file-recursively "third_party"))))) + (build-system pyproject-build-system) (arguments - `(#:tests? #f ; Says test is missing, not sure why - #:phases - (modify-phases %standard-phases - ;; Not importing the googleapis package for now - (add-after 'unpack 'ignore-googleapis - (lambda _ - (substitute* "setup.py" - (("'google-api-python-client',") "")) - #t)) - ;; No module named 'google_auth_oauthlib' - (delete 'sanity-check)))) - (inputs + (list + #:test-flags + #~(list "-k" (string-append + ;; ModuleNotFoundError: No module named 'pytest' + "not test_parse_stdin" + ;; AssertionError: 5 not greater than 20 + " and not test_setup")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "setup.py" + ;; Use compatible fork, and do not fail during sanity check. + (("\"pdfminer2\",") "")))) + (add-before 'check 'build-extensions + (lambda _ + (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (propagated-inputs (list python-beautifulsoup4 python-bottle python-chardet python-dateutil + python-google-api-client + python-google-auth-oauthlib python-lxml python-magic + python-oauth2client python-ply python-requests)) (native-inputs - (list python-pytest)) + (list gnupg python-pdfminer-six python-pytest)) (home-page "https://beancount.github.io/") (synopsis "Command-line double-entry accounting tool") (description @@ -2006,6 +2027,55 @@ define financial transaction records in a text file, read them in memory, generate a variety of reports from them, and provides a web interface.") (license license:gpl2))) +(define-public fava + (package + (name "fava") + ;; XXX: A newer version requires Flask > 2.2, which is not available in + ;; Guix yet. + (version "1.24.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fava" version)) + (sha256 + (base32 "1iwha9vx223iiyjqbixpz1lp8q766ikhi7xcap3pscjhldxlym4j")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "setup.cfg" + ((">=8,<10") ">8")))) + ;; Tests write to $HOME. + ;; FileNotFoundError: [Errno 2] No such file or directory + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp")))))) + (propagated-inputs + (list beancount + python-babel + python-cheroot + python-click + python-flask + python-flask-babel + python-jinja2 + python-markdown2 + python-ply + python-simplejson + python-werkzeug)) + (native-inputs + (list python-pytest + python-chardet + python-dateutil + python-setuptools-scm)) + (home-page "https://beancount.github.io/fava/") + (synopsis "Web interface for the accounting tool Beancount") + (description "Fava is a web interface for the double-entry bookkeeping +software Beancount with a focus on features and usability.") + (license license:expat))) + (define-public emacs-beancount ;; Note that upstream has not made any release since this project moved ;; into its own repository (it was originally part of beancount itself) @@ -2359,11 +2429,11 @@ pool.") (define-public opentaxsolver ;; The OTS version is formatted like tax-year_version. So, at time of - ;; writing, the version is 2022_20.00. Each part of this is used in + ;; writing, the version is 2023_21.03. Each part of this is used in ;; different places in the source uri, so it's convenient to have them ;; separately like this. - (let ((tax-year "2022") - (ots-version "20.00")) + (let ((tax-year "2023") + (ots-version "21.03")) (package (name "opentaxsolver") (version (string-append tax-year "_" ots-version)) @@ -2375,7 +2445,7 @@ pool.") "_linux/OpenTaxSolver" version "_linux64.tgz")) (sha256 (base32 - "06k0a72bmwdmr71dvrp8b4vl8vilnggsh92hrp7wjdgcjj9m074w")) + "1i543bvclnyiwnyjlskhr2bxlsigggvwdhg2519rf12lsghgfszq")) (patches (search-patches "opentaxsolver-file-browser-fix.patch")))) (build-system glib-or-gtk-build-system) (arguments diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 368d4c331d..9ec722c19c 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1081,7 +1081,7 @@ utilities to ease adding new glyphs to the font.") (define-public font-google-noto (package (name "font-google-noto") - (version "23.11.1") + (version "24.2.1") (source (origin (method git-fetch) @@ -1090,8 +1090,53 @@ utilities to ease adding new glyphs to the font.") (commit (string-append "noto-monthly-release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0vvxhky35l4i0ha60yw0gj26f3v33hpf2zax17yyj16mww4cn4d8")))) + (base32 "087jg8ahpq35xwyrmvm9ivxl0wjic2j4r28bbrwqmgdva9brms40")))) (build-system font-build-system) + (arguments + (list + #:modules + '((guix build font-build-system) + (guix build utils) + (ice-9 ftw)) + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (define* (install source #:optional (output #$output)) + (let ((%install (assoc-ref %standard-phases 'install))) + (with-directory-excursion source + (%install #:outputs `(("out" . ,output)))))) + + (define (scan-directory name) + (scandir name (lambda (file) + (not (member file '("." ".." "LICENSE")))))) + + (define (install-font-variant variant) + "Given font variant VARIANT, install one of its formats, +variable TTF or OTF or TTF." + (with-directory-excursion variant + (let ((formats (scan-directory "."))) + (cond + ((member "variable-ttf" formats) + (install "variable-ttf")) + ((member "otf" formats) + (install "otf")) + ((member "ttf" formats) + (install "ttf")))))) + + (define (install-font font) + "Given FONT, install one of its variants, either full or +unhinted, and install its hinted variant into 'ttf' output. According to the +source, unhinted and hinted variants are always available." + (with-directory-excursion font + (if (member "full" (scan-directory ".")) + (install-font-variant "full") + (install-font-variant "unhinted")) + (install "hinted" #$output:ttf))) + + (with-directory-excursion "fonts" + (for-each install-font (scan-directory ".")))))))) + (outputs '("out" "ttf")) (home-page "https://www.google.com/get/noto/") (synopsis "Fonts to cover all languages") (description "Google Noto Fonts is a family of fonts designed to support @@ -1102,7 +1147,7 @@ display all Unicode symbols.") (define-public font-google-noto-emoji (package (name "font-google-noto-emoji") - (version "2.038") + (version "2.042") (source (origin (method git-fetch) @@ -1112,7 +1157,7 @@ display all Unicode symbols.") (file-name (git-file-name name version)) (sha256 (base32 - "1rgmcc6nqq805iqr8kvxxlk5cf50q714xaxk3ld6rjrd69kb8ix9")))) + "17i7awyqz9jv0j2blcf0smmpas375c3pdhjv1zqzl861g8qm1lm2")))) (build-system font-build-system) (arguments (list @@ -1122,11 +1167,10 @@ display all Unicode symbols.") (lambda _ ;; Note this ensures the correct license file is installed. (chdir "fonts"))) - (add-after 'enter-font-directory 'remove-unsupported - (lambda* _ - (delete-file "NotoColorEmoji_WindowsCompatible.ttf") - (delete-file "Noto-COLRv1-noflags.ttf") - (delete-file "Noto-COLRv1.ttf")))))) + (replace 'install + (lambda _ + (let ((dir (string-append #$output "/share/fonts/truetype"))) + (install-file "NotoColorEmoji.ttf" dir))))))) (home-page "https://fonts.google.com/noto/specimen/Noto+Color+Emoji") (synopsis "Font for rendering color emoji characters") (description @@ -1143,11 +1187,23 @@ family.") (method url-fetch) (uri (string-append "https://github.com/googlefonts/noto-cjk/releases/download/Sans" - version "/03_NotoSansCJK-OTC.zip")) + version "/01_NotoSansCJK-OTF-VF.zip")) (file-name (string-append name "-" version ".zip")) (sha256 - (base32 "1v9yda7r98g4a3pk0y3cjbgc1i2lv4ax0f0v6aqasfzz4ldlx3sj")))) + (base32 "1ka37kqyd0sfqwk485nv6ihrdjl5xycr38m4jq40r2lzmpmkmqym")))) (build-system font-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (chdir "..") ;For license. + (let ((install (assoc-ref %standard-phases 'install))) + (with-directory-excursion "Variable/OTC" + (install #:outputs `(("out" . ,#$output)))) + (with-directory-excursion "Variable/OTF" + (install #:outputs `(("out" . ,#$output:otf)))))))))) + (outputs '("out" "otf")) (home-page "https://www.google.com/get/noto/") (synopsis "Fonts to cover all languages") (description "Google Noto Fonts is a family of fonts designed to support @@ -1159,17 +1215,29 @@ CJK fonts.") (define-public font-google-noto-serif-cjk (package (name "font-google-noto-serif-cjk") - (version "2.001") + (version "2.002") (source (origin (method url-fetch) (uri (string-append "https://github.com/googlefonts/noto-cjk/releases/download/Serif" - version "/04_NotoSerifCJKOTC.zip")) + version "/02_NotoSerifCJK-OTF-VF.zip")) (file-name (string-append name "-" version ".zip")) (sha256 - (base32 "1l6r3sz2s0vcyfx6ria7wqcq45zp40gxgg97lh8hpmajhzw301ig")))) + (base32 "007jk7rmfapq5zq4ji9d1l5gpp34p98l9ylhiw33q42d66v2g717")))) (build-system font-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (chdir "..") ;For license. + (let ((install (assoc-ref %standard-phases 'install))) + (with-directory-excursion "Variable/OTC" + (install #:outputs `(("out" . ,#$output)))) + (with-directory-excursion "Variable/OTF" + (install #:outputs `(("out" . ,#$output:otf)))))))))) + (outputs '("out" "otf")) (home-page "https://www.google.com/get/noto/") (synopsis "Fonts to cover all languages") (description "Google Noto Fonts is a family of fonts designed to support diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 299fe87edf..212c258aca 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018, 2019, 2020, 2021, 2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Roel Janssen <roel@gnu.org> -;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2020, 2021, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org> @@ -2049,7 +2049,7 @@ Unicode Charts. It was developed for use with DejaVu Fonts project.") (define-public libraqm (package (name "libraqm") - (version "0.8.0") + (version "0.10.1") (source (origin (method git-fetch) @@ -2058,7 +2058,7 @@ Unicode Charts. It was developed for use with DejaVu Fonts project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qrdw67n14n0km2f8l0gk8scgj3ybz662s9x8jwj3rrj33nl2d1a")))) + (base32 "1bzdrvacgj9629r4mgmag9sm5ay5914fbs8pnxf8xphvrbnbxm8z")))) (build-system meson-build-system) (native-inputs (list gtk-doc/stable pkg-config python-wrapper)) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index fc3c2b3e29..89634cf914 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2022 muradm <mail@muradm.net> ;;; Copyright © 2023 Alex Devaure <ajadevaure@gmail.com> ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1571,7 +1572,10 @@ XEv.") (base32 "0bpix92vzip9vlhzihj3k8h9flrlna231x3y8ah7p4965l177yjd")))) (build-system meson-build-system) (native-inputs - (list pkg-config wayland libxkbcommon)) + (list pkg-config + ;; for wayland-scanner + wayland)) + (inputs (list wayland libxkbcommon)) (synopsis "Xdotool type for Wayland") (description "Wtype lets you simulate keyboard input and mouse activity, move and resize windows, etc.") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e619c2f10e..f150c33e83 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -938,6 +938,41 @@ original rogue game found on 4.2BSD.") (home-page "https://github.com/Davidslv/rogue") (license license:bsd-3))) +(define-public sgt-puzzles + (let ((commit "80aac3104096aee4057b675c53ece8e60793aa90") + (revision "0")) + (package + (name "sgt-puzzles") + (version (git-version "20240302" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.tartarus.org/simon/puzzles.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0z4clv0xi98q28riz323ppn165cm62gj1c6h3xdd2sym4v8gy65z")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f ;No tests. + #:configure-flags #~(list "-DNAME_PREFIX=sgt-") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-xdg-open-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gtk.c" + (("(#define HELP_BROWSER_PATH).+" all define) + (format #f "~a ~s~%" define + (search-input-file inputs "/bin/xdg-open"))))))))) + (inputs (list gtk+ xdg-utils)) + (native-inputs (list pkg-config perl imagemagick halibut)) + (home-page "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/") + (synopsis "Simon Tatham's portable puzzle collection") + (description "Simon Tatham's Portable Puzzle Collection contains a number of +popular puzzle games for one player.") + (license license:expat)))) (define-public bzflag (package @@ -7423,7 +7458,7 @@ at their peak of economic growth and military prowess. (define-public open-adventure (package (name "open-adventure") - (version "1.16") + (version "1.18") (source (origin (method git-fetch) @@ -7432,7 +7467,7 @@ at their peak of economic growth and military prowess. (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0spciwqcyldalzdd813zwigbldcnyaxi7kfslq1yp0fg4c4a10aa")))) + (base32 "1zl72lsp443aryzmwzh5w4j439jgf5njvh9xig6vjvmzhfcjkk9q")))) (build-system gnu-build-system) (arguments (list @@ -7461,10 +7496,13 @@ at their peak of economic growth and military prowess. (install-file "advent.6" man))))))) (native-inputs (list asciidoc + cppcheck libedit pkg-config + python-pylint python-pyyaml - python-wrapper)) + python-wrapper + ruby-asciidoctor)) (home-page "https://gitlab.com/esr/open-adventure") (synopsis "Colossal Cave Adventure") (description @@ -8449,7 +8487,7 @@ ncurses for text display.") (define-public naev (package (name "naev") - (version "0.10.4") + (version "0.11.4") (source (origin (method git-fetch) @@ -8459,7 +8497,7 @@ ncurses for text display.") (recursive? #t))) ; for game data (file-name (git-file-name name version)) (sha256 - (base32 "0lg8cmzdzzpmqgmh9a1v190vv4d15hwa0inyzdwsq5x8lyc13hyr")))) + (base32 "1gd7jgb996fgnlrlqkfyx416g1kd458vik3nviazwwj83ksafaqb")))) (build-system meson-build-system) (arguments ;; XXX: Do not add debugging symbols, which cause the build to fail. diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 215a625373..789595937a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -523,9 +523,9 @@ variable defined below. It requires guile-json to be installed." ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-base-version "115.8.0") +(define %icecat-base-version "115.9.0") (define %icecat-version (string-append %icecat-base-version "-guix0-preview1")) -(define %icecat-build-id "20240220000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-build-id "20240319000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -545,12 +545,12 @@ variable defined below. It requires guile-json to be installed." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "1slmp2v1q3my81z8kiym9rpxw5d9n4sn07v7hv99517w7vr8d05g")))) + "00r847l2j2wk20wf1plbnz2ifyqkvwqmaqwq6zknsqz6qmqk6fyv")))) ;; The upstream-icecat-base-version may be older than the ;; %icecat-base-version. - (upstream-icecat-base-version "115.8.0") - (gnuzilla-commit "7e2ff1ad7e03d2bfe0b2daf3f25961b06cab8848") + (upstream-icecat-base-version "115.9.0") + (gnuzilla-commit "d1dab742d12e2ffacae70733b14016287fc46613") (gnuzilla-source (origin (method git-fetch) @@ -562,7 +562,7 @@ variable defined below. It requires guile-json to be installed." (string-take gnuzilla-commit 8))) (sha256 (base32 - "1lv3vfqv0zb634gnvzb37fs04rb1jlrd2n1k51yjsvdznpqfpi1y")))) + "16z2l0fbbxpl2q80w9mx0x89cq82plkb45jpf172xah0k782akhd")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index aaa2de33a6..290afdd3b9 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -404,6 +404,31 @@ signalling failures, it offers ways to express expectations and get nice failure messages automatically.") (license license:asl2.0)))) +(define-public go-github-com-jbenet-go-cienv + (package + (name "go-github-com-jbenet-go-cienv") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jbenet/go-cienv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qyfjvr8n5chpb5zi6r9cf0danrwds3k5lbf7vp7ygcl6wnm0vmv")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/jbenet/go-cienv")) + (home-page "https://github.com/jbenet/go-cienv") + (synopsis "CI system environment variables") + (description + "Package @code{cienv} implements some helper functions to use during tests. +Many times certain facilities are not available, or tests must run +differently.") + (license license:expat))) + (define-public go-github-com-onsi-ginkgo (package (name "go-github-com-onsi-ginkgo") diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm index b999c063ee..a1ad00f588 100644 --- a/gnu/packages/golang-compression.scm +++ b/gnu/packages/golang-compression.scm @@ -140,6 +140,33 @@ library included in the stdlib, and supports GIF, TIFF and PDF.") (description "@code{compress} provides various compression algorithms.") (license license:bsd-3))) +(define-public go-github-com-klauspost-pgzip + (package + (name "go-github-com-klauspost-pgzip") + (version "1.2.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klauspost/pgzip") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1j29wr6nd9ncdbkjphyziv0h8p5s2mj222cgcfqxmzjnfn7623d8")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/klauspost/pgzip")) + (propagated-inputs (list go-github-com-klauspost-compress)) + (home-page "https://github.com/klauspost/pgzip") + (synopsis "Parallel (de)compression of gzip files in Go") + (description + "This package implements parallel gzip compression and decompression in +Golang and is fully compatible with @code{compress/gzip} from the standard +library. This is beneficial for large amounts of data, say more than 1MB at a +time, as otherwise the internal gzip library will likely be faster.") + (license (list license:bsd-3 license:expat)))) + (define-public go-github-com-nwaples-rardecode-v2 (package (name "go-github-com-nwaples-rardecode-v2") @@ -166,23 +193,27 @@ library included in the stdlib, and supports GIF, TIFF and PDF.") (define-public go-github-com-ulikunitz-xz (package (name "go-github-com-ulikunitz-xz") - (version "0.5.8") + (version "0.5.11") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ulikunitz/xz.git") + (url "https://github.com/ulikunitz/xz") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 - (base32 "1xnsymi5fmmm734bi4c6z57p5cvnyxlpi29yxs4v21w5k763aypd")))) + (base32 "1hbs3x7s7d5ch6ipaqi265w0fwpijs0j19xdbhbjjsyr4khxbqd0")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/ulikunitz/xz")) + (list + #:import-path "github.com/ulikunitz/xz")) (home-page "https://github.com/ulikunitz/xz") (synopsis "Read and write xz compressed streams in Go") - (description "This package provides a library to read and write xz -compressed streams in Go.") + (description + "This package provides a support of reading and writing of xz +compressed streams. It includes also a gxz command for compressing and +decompressing data. The package is completely written in Go and doesn't have +any dependency on any C code.") (license license:bsd-3))) ;;; diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 1d7ad01af2..29bc50c6a5 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -98,6 +98,45 @@ API service accounts for Go.") (license license:asl2.0))) +(define-public go-github-com-alexliesenfeld-health + (package + (name "go-github-com-alexliesenfeld-health") + (version "0.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alexliesenfeld/health") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fchlvxwidsscskwq07vhxfwcn5wbigbizi51619l8gg09mr158q")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/alexliesenfeld/health" + #:phases #~(modify-phases %standard-phases + ;; Examples requires additional dependencies and comes with + ;; their own go.mod, consider to pack it as separate + ;; package if required. + (add-after 'unpack 'remove-examples + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/examples"))))))) + (native-inputs (list go-github-com-stretchr-testify)) + (home-page "https://github.com/alexliesenfeld/health") + (synopsis "Simple and flexible health check library for Go") + (description + "This library provides a @code{http.Handler} that acts as a health +endpoint. It can be used by cloud infrastructure or other services to +determine the availability of an application. + +Rather than simply returning a response with HTTP status code 200, this +library allows building health checks that test the availability of all +required dependencies. The HTTP response contains the aggregated health +result and details about the health status of each component.") + (license license:expat))) + (define-public go-github-com-andybalholm-cascadia (package (name "go-github-com-andybalholm-cascadia") diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index ef700b9373..5c6e74870b 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1035,6 +1035,83 @@ increment versions.") @end itemize") (license license:bsd-3))) +(define-public go-github-com-jbenet-go-random + (package + (name "go-github-com-jbenet-go-random") + (version "0.0.0-20190219211222-123a90aedc0c") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jbenet/go-random") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0kgx19m8p76rmin8s8y6j1padciv1dx37qzy7jkh9bw49ai3haw3")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/jbenet/go-random")) + (propagated-inputs + (list go-github-com-dustin-go-humanize)) + (home-page "https://github.com/jbenet/go-random") + (synopsis "Go library and a program that outputs randomness") + (description + "This is a Unix utility that outputs randomness. It is a thin +wrapper around @code{crypto/rand}.") + (license license:expat))) + +(define-public go-github-com-jbenet-go-temp-err-catcher + (package + (name "go-github-com-jbenet-go-temp-err-catcher") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jbenet/go-temp-err-catcher") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0n482jhh6jwq43jj21xkq8grqzx78hjh7f44p0q3n01zp1dsh97r")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/jbenet/go-temp-err-catcher")) + (home-page "https://github.com/jbenet/go-temp-err-catcher") + (synopsis "Error handling helper library") + (description "Package @code{temperrcatcher} provides a @code{TempErrCatcher} +object, which implements simple error-retrying functionality.") + (license license:expat))) + +(define-public go-github-com-jbenet-goprocess + (package + (name "go-github-com-jbenet-goprocess") + (version "0.1.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jbenet/goprocess") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1z4a5skx9kh2c727pc6zz0vhf9v8acd320s7z0f1kwy3y1nbdhjk")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/jbenet/goprocess")) + (native-inputs + (list go-github-com-jbenet-go-cienv)) + (home-page "https://github.com/jbenet/goprocess") + (synopsis "Manage process life cycles in Go") + (description + "@code{goprocess} introduces a way to manage process lifecycles in +Go. It is much like @code{go.net/context} (it actually uses a Context), but it is +more like a Context-WaitGroup hybrid. @code{goprocess} is about being able to start +and stop units of work, which may receive @code{Close} signals from many clients.") + (license license:expat))) + (define-public go-github-com-jinzhu-copier (package (name "go-github-com-jinzhu-copier") @@ -1058,6 +1135,31 @@ increment versions.") struct to another.") (license license:expat))) +(define-public go-github-com-josharian-intern + (package + (name "go-github-com-josharian-intern") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/josharian/intern") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1za48ppvwd5vg8vv25ldmwz1biwpb3p6qhf8vazhsfdg9m07951c")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/josharian/intern")) + (home-page "https://github.com/josharian/intern") + (synopsis "String interning for Go") + (description + "This library defines functions to perform string interning in Go, +storing only one copy of each unique string in memory. All functions may be +called concurrently with themselves and each other.") + (license license:expat))) + (define-public go-github-com-k0kubun-pp (package (name "go-github-com-k0kubun-pp") @@ -1733,6 +1835,34 @@ query information regarding the number of CPUs available to the system.") weighted moving averages}.") (license license:expat))) +(define-public go-github-com-whyrusleeping-go-sysinfo + (package + (name "go-github-com-whyrusleeping-go-sysinfo") + (version "0.0.0-20190219211824-4a357d4b90b1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/go-sysinfo") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0s6yjp9incc579wbbga33vq0hcanv8j2xh9l90ya0r4fihz39jiq")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/go-sysinfo")) + (propagated-inputs + (list go-github-com-dustin-go-humanize)) + (home-page "https://github.com/whyrusleeping/go-sysinfo") + (synopsis "Package to extract system information") + ;; There is not much information provided by the project, see + ;; <https://github.com/whyrusleeping/go-sysinfo/issues>. + (description + "This packages provides a basic system stats like @code{DiskUsage} and +@code{MemoryInfo}.") + (license license:expat))) + (define-public go-go-uber-org-automaxprocs (package (name "go-go-uber-org-automaxprocs") diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 84d12f6b13..c6e7443f85 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Frank Pursel <frank.pursel@gmail.com> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -835,15 +836,16 @@ roots, or wrestle with obscure build systems.") "06pywwpmfwjz225h59wf90q96a2fd66qfcw5xa6m6y9k9k7glnx4")))) (build-system gnu-build-system) (arguments - `(#:make-flags - (list "prefix=" - (string-append "DESTDIR=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'check - (lambda _ - (invoke "make" "microbench")))))) + (list #:make-flags + #~(list "prefix=" + (string-append "DESTDIR=" #$output) + #$@(if (target-riscv64?) '("LDFLAGS=-latomic") '())) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "microbench"))))))) (home-page "https://bellard.org/quickjs/") (synopsis "Small embeddable Javascript engine") (description "QuickJS supports the ES2020 specification including modules, diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ec9bf3a9ca..012a62526f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3687,48 +3687,47 @@ writing code that contains string literals that contain code themselves.") (sbcl-package->ecl-package sbcl-pythonic-string-reader)) (define-public sbcl-slime-swank - (let ((commit "735258a26bb97e85d25f39e4bef83c1f80c12f5d") - (revision "1")) - (package - (name "sbcl-slime-swank") - (version (git-version "2.28" revision commit)) - (source - (origin - (file-name (git-file-name "cl-slime-swank" version)) - (method git-fetch) - (uri (git-reference - (url "https://github.com/slime/slime/") - (commit commit))) - (sha256 - (base32 "0prskgzfqjmn8sc7p9nklnd0n1plwcvh40slgh23km31raplmzk7")) - (modules '((guix build utils))) - (snippet - ;; The doc folder drags `gawk' into the closure. Doc is already - ;; provided by emacs-slime. - `(begin - (delete-file-recursively "doc") - #t)))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:asd-systems '("swank" "swank/exts") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-fasl-directory - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "swank-loader.lisp" - (("\\(probe-file fasl\\)" all) - ;; Do not try to delete Guix store files. - (string-append - all "\n" - " (not (equal (subseq (pathname-directory fasl) 1 3)" - " '(\"gnu\" \"store\"))) ; XXX: GUIX PATCH")))))))) - (home-page "https://github.com/slime/slime") - (synopsis "Common Lisp Swank server") - (description - "This is only useful if you want to start a Swank server in a Lisp + ;; Update together with emacs-slime. + (package + (name "sbcl-slime-swank") + (version "2.29.1") + (source + (origin + (file-name (git-file-name "cl-slime-swank" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/slime/slime/") + (commit (string-append "v" version)))) + (sha256 + (base32 "1fcasqsdfwsphkfx1vd3r5mr89vgvzb9g2dbw82mc9lijg1mr1ki")) + (modules '((guix build utils))) + (snippet + ;; The doc folder drags `gawk' into the closure. Doc is already + ;; provided by emacs-slime. + `(begin + (delete-file-recursively "doc") + #t)))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:asd-systems '("swank" "swank/exts") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-fasl-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "swank-loader.lisp" + (("\\(probe-file fasl\\)" all) + ;; Do not try to delete Guix store files. + (string-append + all "\n" + " (not (equal (subseq (pathname-directory fasl) 1 3)" + " '(\"gnu\" \"store\"))) ; XXX: GUIX PATCH")))))))) + (home-page "https://github.com/slime/slime") + (synopsis "Common Lisp Swank server") + (description + "This is only useful if you want to start a Swank server in a Lisp processes that doesn't run under Emacs. Lisp processes created by @command{M-x slime} automatically start the server.") - (license (list license:gpl2+ license:public-domain))))) + (license (list license:gpl2+ license:public-domain)))) (define-public cl-slime-swank (sbcl-package->cl-source-package sbcl-slime-swank)) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index c58e56b7a7..219b183753 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1003,7 +1003,7 @@ the HTML documentation of TXR.") (define-public txr (package (name "txr") - (version "293") + (version "294") (source (origin (method git-fetch) @@ -1012,7 +1012,7 @@ the HTML documentation of TXR.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1b3vhlnw4ymznnlh9d71qhkcdc1p69a53hilckc3rql9y4jsik57")))) + (base32 "0cd0ah6lzwszn4jjxrbwknhscdm6rgsprpiybzlikcckgcylpkdn")))) (build-system gnu-build-system) (arguments (list #:configure-flags diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 47e8cd39c2..a757c22154 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -26,6 +26,7 @@ (define-module (gnu packages logging) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix download) @@ -227,10 +228,12 @@ output in multiple windows in a terminal.") ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle (arguments - '(#:configure-flags - (list "-DSPDLOG_BUILD_BENCH=OFF" - "-DSPDLOG_BUILD_SHARED=ON" - "-DSPDLOG_BUILD_TESTS=ON"))) + (list #:configure-flags + #~(list "-DSPDLOG_BUILD_BENCH=OFF" + "-DSPDLOG_BUILD_SHARED=ON" + #$@(if (%current-target-system) + '() + '("-DSPDLOG_BUILD_TESTS=ON"))))) (native-inputs (list catch2-3)) (home-page "https://github.com/gabime/spdlog") (synopsis "Fast C++ logging library") diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f91d3e5ba6..479591889f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8095,6 +8095,12 @@ easily be incorporated into existing simulation codes.") #:parallel-tests? #f ;tests use 'mpiexec -n4' #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + ;; Skip failing tests (SIGFPE and SIGSEGV). + (substitute* "ReleaseTests/CMakeLists.txt" + (("^.*SpAsgnTest.*$") "") + (("^.*IndexingTest.*$") "")))) (add-before 'check 'mpi-setup ,%openmpi-setup) (add-before 'check 'test-setup diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5d8edd9c49..c1f69ee55c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 nikita <nikita@n0.is> ;;; Copyright © 2017 Rodger Fox <thylakoid@openmailbox.org> -;;; Copyright © 2017–2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2017–2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2018, 2019, 2021 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr> @@ -54,6 +54,7 @@ ;;; Copyright © 2023 Antero Mejr <antero@mailbox.org> ;;; Copyright © 2023, 2024 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -867,7 +868,7 @@ settings (aliasing, linear interpolation and cubic interpolation).") (define-public hydrogen (package (name "hydrogen") - (version "1.2.0") + (version "1.2.3") (source (origin (method git-fetch) @@ -876,7 +877,7 @@ settings (aliasing, linear interpolation and cubic interpolation).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0v4ir1my8zndw5rvz6jr42ysprwycgxrlsc53070y3620n699nha")))) + (base32 "0qb16yn3igs95silvngwy5mjwlzsyz5axwbd3lz6pjhwbf81rn7d")))) (build-system cmake-build-system) (arguments `(#:test-target "tests" @@ -1508,7 +1509,7 @@ and auto-mapping slices to MIDI note numbers.") (define-public lilypond (package (name "lilypond") - (version "2.24.1") + (version "2.24.3") (source (origin (method url-fetch) @@ -1516,7 +1517,7 @@ and auto-mapping slices to MIDI note numbers.") "v" (version-major+minor version) "/" "lilypond-" version ".tar.gz")) (sha256 - (base32 "028m31fjcfgsq3f8ahz4hp2r36shsvkq1fjjibqdcp2aas3r1ifm")))) + (base32 "1gj4xjc9842wnqvqj08lkykpz2r72mqqw3x1fk6s9xbsxxv5y06z")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;out-test/collated-files.html fails @@ -5047,7 +5048,7 @@ includes LV2 plugins and a JACK standalone client.") (define-public musescore (package (name "musescore") - (version "4.1.1") + (version "4.2.1") (source (origin (method git-fetch) @@ -5056,7 +5057,7 @@ includes LV2 plugins and a JACK standalone client.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12h26k9qnsq027gdpch579nchwrqva1ymwm2fj5xmlh0aayrwy4d")) + (base32 "0rc5ma1k0cjllfl86apbyj61sh0691lsmqnvqicyn0zi53z8w9v0")) (modules '((guix build utils))) (snippet '(begin @@ -5284,7 +5285,7 @@ specification and header.") (define-public rosegarden (package (name "rosegarden") - (version "23.06") + (version "23.12") (source (origin (method url-fetch) @@ -5292,7 +5293,7 @@ specification and header.") (version-major+minor version) "/" "rosegarden-" version ".tar.xz")) (sha256 - (base32 "1k3j5p6lx3w6pbsh95xiyfj8g8ysmvd18v0wmx7kdb3vyj5mfd0z")))) + (base32 "0clkzrs931dypvqcn5hzx2v3bq9gc439g71phahgwkh4c1jfcmrz")))) (build-system cmake-build-system) (arguments (list @@ -7246,22 +7247,27 @@ It is provided as an LV2 plugin and as a standalone Jack application.") (uri (git-reference (url "https://github.com/jackaudio/a2jmidid") (commit version))) + (modules '((guix build utils))) + (snippet + ;; Fix build for for riscv64-linux, same as: + ;; https://github.com/jackaudio/a2jmidid/pull/18 + '(substitute* "sigsegv.c" + (("!defined[(]__aarch64__[)]") + "!defined(__arch64__) && !defined(__riscv)"))) (sha256 (base32 "1x6rcl3f4nklnx4p5jln9a7fpj9y7agjxs9rw7cccmwnski7pnsq")) (file-name (git-file-name name version)))) (arguments - `(#:tests? #f ; No tests. - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-programs - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/"))) - (substitute* (string-append bin "a2j") - (("a2j_control") (string-append bin "a2j_control"))) - (wrap-program (string-append bin "a2j_control") - `("PYTHONPATH" prefix (,(getenv "GUIX_PYTHONPATH")))) - #t)))))) + (list #:tests? #f ; No tests. + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-programs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((bin (string-append #$output "/bin/"))) + (substitute* (string-append bin "a2j") + (("a2j_control") (string-append bin "a2j_control"))) + (wrap-program (string-append bin "a2j_control") + `("PYTHONPATH" prefix (,(getenv "GUIX_PYTHONPATH")))))))))) (build-system meson-build-system) (inputs (list alsa-lib diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index ef86c8185a..089bea7f01 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2021, 2024 Andy Tai <atai@atai.org> -;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2021, 2022, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -210,7 +210,7 @@ default. To add support for more languages, the (define-public gimagereader (package (name "gimagereader") - (version "3.4.1") + (version "3.4.2") (source (origin (method url-fetch) @@ -219,7 +219,7 @@ default. To add support for more languages, the "/download/v" version "/" "gimagereader-" version ".tar.xz")) (sha256 - (base32 "1972bvnk2bkgbh70vy2prcmdzf4wlna862p2vja9yjxi2c0scmwc")))) + (base32 "0r52j5q2d0mvzw6qkds6vrapcqhdgyj2jvp7bh8w9zw6gpjsyk0q")))) (build-system cmake-build-system) (arguments (list diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 0e3d1efb07..e9dd7427d3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1530,8 +1530,8 @@ environments.") "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) (define-public guix-build-coordinator - (let ((commit "d802b817d81e2ea8c9f30664acd7b3b37b16f7c5") - (revision "99")) + (let ((commit "14e18eed98d1836662d8787d08f7a37cf8c2f69d") + (revision "100")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1542,7 +1542,7 @@ environments.") (commit commit))) (sha256 (base32 - "1c69sww6mgwh17dd9k00fy6mi05asxb5l1jf2a7q63gv06h3bp0l")) + "1vv1l6y80ymqi7qz70bfq4is4y1xh21jm4d4gapn63931ac4fiij")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index fa079a9b09..97561316f6 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2017, 2020-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2017, 2020-2022, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018, 2022 Marius Bakke <marius@gnu.org> @@ -149,7 +149,7 @@ human.") (define-public keepassxc (package (name "keepassxc") - (version "2.7.6") + (version "2.7.7") (source (origin (method url-fetch) @@ -157,7 +157,7 @@ human.") "/releases/download/" version "/keepassxc-" version "-src.tar.xz")) (sha256 - (base32 "0w6nh2lnzfqcxasfsppmh4q309p1flzgfiv25hahzsd8kx879055")))) + (base32 "0rzfh8xdsd1r0xb7yb0h2zyzwhbsp7si8c0haaqgzcz4k2p4bz2q")))) (build-system qt-build-system) (arguments (list diff --git a/gnu/packages/patches/qemu-build-info-manual.patch b/gnu/packages/patches/qemu-build-info-manual.patch index ff28266aaa..0950787810 100644 --- a/gnu/packages/patches/qemu-build-info-manual.patch +++ b/gnu/packages/patches/qemu-build-info-manual.patch @@ -13,50 +13,33 @@ readers. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> diff --git a/docs/meson.build b/docs/meson.build +index 9040f860ae..2ae7886fcb 100644 --- a/docs/meson.build +++ b/docs/meson.build -@@ -92,4 +92,25 @@ if build_docs +@@ -98,4 +98,26 @@ if build_docs alias_target('sphinxdocs', sphinxdocs) alias_target('html', sphinxdocs) alias_target('man', sphinxmans) + -+ # Generate a Texinfo version of the QEMU manual. ++ # Add a target to build and install a Texinfo version of the QEMU ++ # manual, if 'makeinfo' is available. + makeinfo = find_program(['texi2any', 'makeinfo']) + if makeinfo.found() + sphinxtexi = custom_target( -+ 'QEMU manual generated texinfo source', -+ output: ['QEMU.texi', 'sphinxtexi.stamp'], ++ 'qemu.texi', ++ output: ['qemu.texi', 'sphinxtexi.stamp'], + depfile: 'sphinxtexi.d', + command: [SPHINX_ARGS, '-Ddepfile=@DEPFILE@', + '-Ddepfile_stamp=@OUTPUT1@', '-b', 'texinfo', -+ meson.current_source_dir(), meson.current_build_dir()]) ++ '-d', private_dir, input_dir, meson.current_build_dir()]) + sphinxinfo = custom_target( -+ 'QEMU info manual', ++ 'qemu.info', + input: sphinxtexi, -+ output: 'QEMU.info', ++ output: 'qemu.info', + install: true, + install_dir: get_option('infodir'), -+ command: [makeinfo, '--no-split', '@INPUT0@', '--output=@OUTPUT@']) ++ command: [makeinfo, '--no-split', '--output=@OUTPUT@', '@INPUT0@']) + alias_target('texi', sphinxtexi) + alias_target('info', sphinxinfo) + endif endif -diff --git a/meson.build b/meson.build ---- a/meson.build -+++ b/meson.build -@@ -37,6 +37,7 @@ endif - qemu_confdir = get_option('sysconfdir') / get_option('qemu_suffix') - qemu_datadir = get_option('datadir') / get_option('qemu_suffix') - qemu_docdir = get_option('docdir') / get_option('qemu_suffix') -+qemu_infodir = get_option('infodir') / get_option('qemu_suffix') - qemu_moddir = get_option('libdir') / get_option('qemu_suffix') - - qemu_desktopdir = get_option('datadir') / 'applications' -@@ -3698,6 +3699,7 @@ else - summary_info += {'local state directory': 'queried at runtime'} - endif - summary_info += {'Doc directory': get_option('prefix') / get_option('docdir')} -+summary_info += {'Info directory': get_option('prefix') / get_option('infodir')} - summary_info += {'Build directory': meson.current_build_dir()} - summary_info += {'Source path': meson.current_source_dir()} - summary_info += {'GIT submodules': config_host['GIT_SUBMODULES']} diff --git a/gnu/packages/patches/qemu-disable-some-qtests-tests.patch b/gnu/packages/patches/qemu-disable-bios-tables-test.patch index f60698de8f..39b7b0b53c 100644 --- a/gnu/packages/patches/qemu-disable-some-qtests-tests.patch +++ b/gnu/packages/patches/qemu-disable-bios-tables-test.patch @@ -1,20 +1,18 @@ -Disable the qtest-aarch64/migration-test, which sometimes fail -non-deterministically (see: -https://gitlab.com/qemu-project/qemu/-/issues/1230). +The bios-tables-test may fail; disable it (see: https://gitlab.com/qemu-project/qemu/-/issues/1098) -Also disable the bios-tables-test, which may fail on older machines (see: -https://gitlab.com/qemu-project/qemu/-/issues/1098). - ---- qemu-8.1.0/tests/qtest/meson.build.old 2023-08-30 11:48:27.871146249 -0400 -+++ qemu-8.1.0/tests/qtest/meson.build 2023-08-30 13:53:25.994084948 -0400 -@@ -1,6 +1,5 @@ +diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build +index f096cf3ecd..82f6e1ffeb 100644 +--- a/tests/qtest/meson.build ++++ b/tests/qtest/meson.build +@@ -1,7 +1,6 @@ slow_qtests = { 'ahci-test' : 60, + 'aspeed_smc-test': 360, - 'bios-tables-test' : 120, 'boot-serial-test' : 60, 'migration-test' : 150, 'npcm7xx_pwm-test': 150, -@@ -81,9 +80,6 @@ +@@ -82,9 +81,6 @@ qtests_i386 = \ config_all_devices.has_key('CONFIG_Q35') and \ config_all_devices.has_key('CONFIG_VIRTIO_PCI') and \ slirp.found() ? ['virtio-net-failover'] : []) + \ @@ -24,27 +22,17 @@ https://gitlab.com/qemu-project/qemu/-/issues/1098). qtests_pci + \ qtests_cxl + \ ['fdc-test', -@@ -212,7 +208,6 @@ - +@@ -213,7 +209,6 @@ qtests_arm = \ + # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional qtests_aarch64 = \ - (cpu != 'arm' and unpack_edk2_blobs ? ['bios-tables-test'] : []) + \ (config_all.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \ ['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \ (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \ -@@ -222,8 +217,7 @@ - config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \ - ['arm-cpu-features', - 'numa-test', -- 'boot-serial-test', -- 'migration-test'] -+ 'boot-serial-test'] - - qtests_s390x = \ - qtests_filter + \ -@@ -301,7 +295,6 @@ +@@ -304,7 +299,6 @@ if gnutls.found() endif - + qtests = { - 'bios-tables-test': [io, 'boot-sector.c', 'acpi-utils.c', 'tpm-emu.c'], 'cdrom-test': files('boot-sector.c'), diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 7cece2b2c2..36ebf8547d 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1213,13 +1213,13 @@ the PDF pages.") (define-public img2pdf (package (name "img2pdf") - (version "0.4.4") + (version "0.5.1") (source (origin (method url-fetch) (uri (pypi-uri "img2pdf" version)) (sha256 - (base32 "0g3rpq68y5phnlgxrqn39k10j9nmgksg6m5ic8wgs8v5cjlrij4f")))) + (base32 "158bgnk2jhjnpyld4z3jq8v2j8837vh4j0672g8mnjrg4i3px13k")))) (build-system python-build-system) (propagated-inputs (list python-pikepdf python-pillow diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 0d7e894d60..ed7f4abbb0 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -276,14 +276,14 @@ colors, styles, options and details.") (define-public asymptote (package (name "asymptote") - (version "2.87") + (version "2.88") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "06sr0fpc3zci7ncj9gwp3h8zhbvxs37rwwzqirnxa86zyfar4shf")) + (base32 "1fzm58md2kc32sj19bksnd8yzkg47z5pblkxp28r7vm67xs1mrqd")) (modules '((guix build utils))) (snippet ;; Remove bundled RapidJSON. diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index c2bdfc8da8..9ad081beb1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -58,6 +58,7 @@ ;;; Copyright © 2022 msimonin <matthieu.simonin@inria.fr> ;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr> +;;; Copyright © 2023 dan <i@dan.games> ;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net> ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com> @@ -1279,6 +1280,62 @@ over a different origin than that of the web application.") other HTTP libraries.") (license license:expat))) +(define-public python-cheroot + (package + (name "python-cheroot") + (version "10.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cheroot" version)) + (sha256 + (base32 + "1w0ind0dza9j1py56y23344piqkpyfmcm060qfrnk6gggy3s3i2r")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list "--cov=cheroot" + ;; Tests are flaky in parallel invocation. + ;; "--numprocesses=auto" + "--doctest-modules" + "--showlocals" + ;; Disable test requiring networking. + "-k" "not test_tls_client_auth") + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? test-flags #:allow-other-keys) + (when tests? + (with-directory-excursion "/tmp" + (apply invoke "pytest" "-v" + (append test-flags (list #$output)))))))))) + (propagated-inputs + (list python-jaraco-functools + python-more-itertools + python-six)) + (native-inputs + (list python-cryptography + python-jaraco-text + python-portend + python-pyopenssl + python-pypytools + python-pytest + python-pytest-cov + python-pytest-mock + python-pytest-xdist + python-requests + python-requests-toolbelt + python-requests-unixsocket + python-setuptools-scm + python-setuptools-scm-git-archive + python-trustme)) + (home-page "https://cheroot.cherrypy.dev") + (synopsis "Highly-optimized, pure-python HTTP server") + (description + "Cheroot is a high-performance, pure-Python HTTP server.") + (license license:bsd-3))) + (define-public httpie (package (name "httpie") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8e8b6c6bfa..a7ea87e023 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -49,7 +49,7 @@ ;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2018 Adam Massmann <massmannak@gmail.com> ;;; Copyright © 2016, 2018 Tomáš Čech <sleep_walker@gnu.org> -;;; Copyright © 2018-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2018-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018, 2019, 2021, 2023 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> @@ -136,6 +136,7 @@ ;;; Copyright © 2023 Amade Nemes <nemesamade@gmail.com> ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu> ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com> +;;; Copyright © 2023 dan <i@dan.games> ;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw> ;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net> ;;; Copyright © 2023 Ontje Lünsdorf <ontje.luensdorf@dlr.de> @@ -6058,6 +6059,54 @@ adds a 'now' tag providing a convenient access to the arrow.now() API from templates. A format string can be provided to control the output.") (license license:expat))) +(define-public python-pypugjs + (package + (name "python-pypugjs") + (version "5.9.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kakulukia/pypugjs") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zj7a560h973cl7brfw1nmyhgm8rp8j80wnih0shvhmw4ql23lpa")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + ;; Our pyramid is outdated and pyramid-mako is not packaged. + (add-after 'unpack 'disable-pyramid + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "setup.py" + (("'pyramid") + "#'pyramid")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest" "-v" + "pypugjs/testsuite/"))))))) + (native-inputs (list python-coverage + python-django + python-jinja2 + python-flake8 + python-flask + python-mako + python-nose + python-poetry-core + python-pytest + python-tornado-6 + python-wheel)) + (propagated-inputs (list python-charset-normalizer python-six)) + (home-page "https://github.com/kakulukia/pypugjs") + (synopsis "Convert Pug source files into different template languages") + (description + "PyPugJS is a high-performance port of PugJS for Python, that converts +any @file{.pug} source into different template languages: Django, Jinja2, +Mako, and Tornado.") + (license license:expat))) ;; MIT + (define-public python-pysdl2 (package (name "python-pysdl2") @@ -6173,26 +6222,20 @@ bookmarks using a declarative input in the form of a markdown file.") (define-public python-joblib (package (name "python-joblib") - (version "1.1.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (pypi-uri "joblib" version)) (sha256 (base32 - "0019p280s2k941mihl67l7y6amwx86639xp3zvpsg1lmyish67rh")))) - (build-system python-build-system) + "1cbjjzsh9hzaqr2cqja95673p7j88b8bd02hjpkq8xz147k6by4j")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "JOBLIB_MULTIPROCESSING" "0") - (invoke "pytest" "-v" "joblib" - ;; We disable this test to avoid having to depend on ipython/jupyter - "-k" "not test_parallel_call_cached_function_defined_in_jupyter"))))))) - (native-inputs - (list python-pytest)) + (list + #:test-flags ; disabled to avoid having to depend on ipython/jupyter + #~(list "-k" "not test_parallel_call_cached_function_defined_in_jupyter"))) + (native-inputs (list python-pytest)) + (propagated-inputs (list python-psutil)) (home-page "https://joblib.readthedocs.io/") (synopsis "Using Python functions as pipeline jobs") (description @@ -11434,6 +11477,27 @@ removal, line continuation, indentation, comment processing, identifier processing, values parsing, case insensitive comparison, and more.") (license license:expat))) +(define-public python-pypytools + (package + (name "python-pypytools") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pypytools" version)) + (sha256 + (base32 "0ag5xyzagprji0m2pkqsfy8539s003mn41pl6plbmh6iwi9w0h51")))) + (build-system python-build-system) + (arguments (list #:tests? #f)) ; no tests + (propagated-inputs (list python-py)) + (home-page "https://github.com/antocuni/pypytools/") + (synopsis + "Tools to use PyPy-specific features, with CPython fallbacks") + (description + "This package provides a collection of useful tools to use PyPy-specific +features, with CPython fallbacks.") + (license license:x11))) + (define-public python-simplegeneric (package (name "python-simplegeneric") @@ -12801,19 +12865,18 @@ approach.") (build-system python-build-system) (arguments ;; TODO: Package missing test dependencies. - '(#:tests? #f - #:phases - (modify-phases %standard-phases - ;; For cluster execution Snakemake will call Python. Since there is - ;; no suitable PYTHONPATH set, cluster execution will fail. We fix - ;; this by calling the snakemake wrapper instead. - (add-after 'unpack 'call-wrapper-not-wrapped-snakemake - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "snakemake/executors/__init__.py" - (("\\{sys.executable\\} -m snakemake") - (string-append (assoc-ref outputs "out") - "/bin/snakemake"))) - #t))))) + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; For cluster execution Snakemake will call Python. Since there is + ;; no suitable PYTHONPATH set, cluster execution will fail. We fix + ;; this by calling the snakemake wrapper instead. + (add-after 'unpack 'call-wrapper-not-wrapped-snakemake + (lambda _ + (substitute* "snakemake/executors/__init__.py" + (("\\{sys.executable\\} -m snakemake") + (string-append #$output "/bin/snakemake")))))))) (propagated-inputs (list python-appdirs python-configargparse @@ -12944,7 +13007,22 @@ Python style, together with a fast and comfortable execution environment.") "") (("\"-m snakemake\"") (string-append "\"" #$output - "/bin/snakemake" "\""))))) + "/bin/snakemake" "\"")) + ;; The snakemake command produced by format_job_exec contains + ;; references to /gnu/store. Prior to patching above that's + ;; just a reference to Python; after patching it's a reference + ;; to the snakemake executable. + ;; + ;; In Tibanna execution mode Snakemake arranges for a certain + ;; Docker image to be deployed to AWS. It then passes its own + ;; command line to Tibanna. This is misguided because it only + ;; ever works if the local Snakemake command was run inside + ;; the same Docker image. In the case of using Guix this is + ;; never correct, so we need to replace the store reference. + (("tibanna_args.command = command") + (string-append + "tibanna_args.command = command.replace('" + #$output "/bin/snakemake', 'python3 -m snakemake')"))))) (add-after 'unpack 'patch-version (lambda _ (substitute* "setup.py" @@ -14265,6 +14343,41 @@ extensions, and several HTML output formats. A command line wrapper markdown_py is also provided to convert Markdown files to HTML.") (license license:bsd-3))) +(define-public python-markdown2 + (package + (name "python-markdown2") + (version "2.4.13") + (source + (origin + (method git-fetch) ; no tests data in PyPi package + (uri (git-reference + (url "https://github.com/trentm/python-markdown2") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m1wy8i4xmna5b97dvks8cfjmc1wid8pxmd2h82869d0ajva3r6a")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? test-flags #:allow-other-keys) + (when tests? + (with-directory-excursion "test" + (invoke "python" "testall.py")))))))) + (native-inputs + (list python-pygments)) + (home-page "https://github.com/trentm/python-markdown2") + (synopsis "Fast and complete Python implementation of Markdown") + (description + "This package provides a fast and complete Python implementation of +Markdown. It was written to closely match the behaviour of the original +Perl-implemented Markdown.pl. It also comes with a number of +extensions (called @code{extras}) for things like syntax coloring, tables, +header-ids.") + (license license:expat))) + (define-public python-mdx-include (package (name "python-mdx-include") @@ -30562,7 +30675,7 @@ accessor layer.") (define-public pyzo (package (name "pyzo") - (version "4.13.3") + (version "4.15.0") (source (origin (method git-fetch) @@ -30572,7 +30685,7 @@ accessor layer.") (file-name (git-file-name name version)) (sha256 (base32 - "1m0mrp20wjvy804214f4zzlbaqrakam0g3qr562yn2mjcgfba554")))) + "0m2sp65q21hhlfkvyby4sjc8cmwv3l0avw42xsna8za8ax9xadxr")))) (build-system python-build-system) (arguments `(#:phases diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9df49d7fb3..5866d33394 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2360,7 +2360,7 @@ control equipment. The module provides both QML and C++ interfaces. The primary target audience are embedded devices with fullscreen user interfaces, and mobile applications targeting TV-like form factors."))) -(define-public qtscxml +(define-public qtscxml-5 (package (inherit qtsvg-5) (name "qtscxml") @@ -2388,6 +2388,45 @@ machines (loading the SCXML file and instantiating states and transitions) and generating a C++ file that has a class implementing the state machine. It also contains functionality to support data models and executable content."))) +(define-public qtscxml + (package + (name "qtscxml") + (version "6.5.2") + (source (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 + "1jxx9p7zi40r990ky991xd43mv6i8hdpnj2fhl7sf4q9fpng4c58")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "tests/3rdparty"))))) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (delete 'check) ;move after the install phase + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'check-setup + (lambda _ + (setenv "ARGS" "-E tst_scion") + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "QML2_IMPORT_PATH" + (string-append #$output "/lib/qt6/qml:" + (getenv "QML2_IMPORT_PATH")))))))) + (build-system cmake-build-system) + (inputs (list qtbase qtdeclarative libxkbcommon)) + (synopsis "Qt SCXML module") + (description "The Qt SCXML module provides functionality to create state +machines from SCXML files. This includes both dynamically creating state +machines (loading the SCXML file and instantiating states and transitions) and +generating a C++ file that has a class implementing the state machine. It +also contains functionality to support data models and executable content.") + (home-page (package-home-page qtbase)) + (license (package-license qtbase)))) + (define-public qtpositioning (package (name "qtpositioning") @@ -4497,7 +4536,7 @@ color-related widgets.") qtquickcontrols-5 qtquickcontrols2-5 qtscript - qtscxml + qtscxml-5 qtsensors qtspeech qtsvg-5 diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index a1fc058db8..8fe9039f20 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix deprecation) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix utils) @@ -950,43 +951,42 @@ for interaction with Nitrokey Pro, Nitrokey Storage, and Librem Key devices.") (license license:gpl3+))) -(define-public ausweisapp2 +(define-public ausweisapp (package - (name "ausweisapp2") - (version "1.22.2") + (name "ausweisapp") + (version "2.1.0") (source (origin (method url-fetch) - (uri (string-append "https://github.com/Governikus/AusweisApp2/releases" - "/download/" version "/AusweisApp2-" version ".tar.gz")) + (uri (string-append "https://github.com/Governikus/AusweisApp/releases" + "/download/" version "/AusweisApp-" version ".tar.gz")) (sha256 (base32 - "1qh1m057va7njs3yk0s31kwsvv44fjlsdac6lhiw5npcwssgjn8l")))) + "1jzxfybjrc3byw42bqjvn1nsn7vbgcl8y94sywjy6vaj3a58hy36")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs - (list pkg-config qttools-5)) + (list pkg-config qttools)) (inputs - (list qtbase-5 - qtsvg-5 - qtdeclarative-5 - qtwebsockets-5 + (list qtbase + qtsvg + qtscxml + qtdeclarative + qtshadertools + qtwebsockets qtgraphicaleffects - qtquickcontrols2-5 pcsc-lite openssl)) (arguments - `(#:modules ((guix build cmake-build-system) - (guix build qt-utils) - (guix build utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build qt-utils)) + `(#:qtbase ,qtbase #:phases (modify-phases %standard-phases - (add-after 'install 'wrap-qt - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program "AusweisApp2" #:output out #:inputs inputs))))))) - (home-page "https://github.com/Governikus/AusweisApp2") + (replace 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (when tests? (invoke "ctest" "--output-on-failure" "-j" + (if parallel-tests? + (number->string (parallel-job-count)) + "1")))))))) + (home-page "https://github.com/Governikus/AusweisApp") (synopsis "Authentication program for German ID cards and residence permits") (description @@ -996,6 +996,9 @@ titles. To use this app, a supported RFID card reader or NFC-enabled smart phone is required.") (license license:eupl1.2))) +(define-deprecated/public ausweisapp2 ausweisapp + (deprecated-package "ausweisapp2" ausweisapp)) + (define-public libfido2 (package (name "libfido2") diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ef2d154a07..952335be54 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -972,13 +972,13 @@ effects of different types of color-blindness.") (define-public r-digest (package (name "r-digest") - (version "0.6.34") + (version "0.6.35") (source (origin (method url-fetch) (uri (cran-uri "digest" version)) (sha256 - (base32 "1na47pywh059g9ymf56z232h5yxbj0gn755cb10ms5igjd97awqb")))) + (base32 "07vqv2mnf8ppan2a3gydh4yr84n8489hypfas1rlk7050nxkycyc")))) (build-system r-build-system) ;; Vignettes require r-knitr, which requires r-digest, so we have to ;; disable them and the tests. @@ -4533,14 +4533,14 @@ more complete @code{viridis} package.") (define-public r-tidyselect (package (name "r-tidyselect") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (cran-uri "tidyselect" version)) (sha256 (base32 - "0fwy4qp3j0ksy15rkrh3588h7wa8c21h0fzx5s762zg34yvjd3ak")))) + "0g4h8mfm5ima0izy4h0c65q478473xsj4hskh15dzg5z1fx9g7hn")))) (build-system r-build-system) (propagated-inputs (list r-cli r-glue r-lifecycle r-rlang r-vctrs r-withr)) @@ -4952,13 +4952,13 @@ package instead.") (define-public r-hmisc (package (name "r-hmisc") - (version "5.1-1") + (version "5.1-2") (source (origin (method url-fetch) (uri (cran-uri "Hmisc" version)) (sha256 - (base32 "0laan26ja6m9k3spkk1ymalwb181ramzjq6ii3b0404xv2kfywa9")))) + (base32 "088gniwbymzhqg3vp0kpkbazryjzy9iq6wdvf9hg9qf0sjbibpg7")))) (properties `((upstream-name . "Hmisc"))) (build-system r-build-system) (native-inputs diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index bf5151f32a..c165b5342d 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2019, 2020, 2021, 2022, 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2019-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020-2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Tom Zander <tomz@freedommail.ch> ;;; Copyright © 2020 Mark Meyer <mark@ofosos.org> @@ -808,7 +808,7 @@ environment with Markdown markup.") (define-public manuskript (package (name "manuskript") - (version "0.15.0") + (version "0.16.1") (source (origin (method git-fetch) @@ -817,7 +817,7 @@ environment with Markdown markup.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0d1r62s1qidspck0b1zf8dibyjn9g72agbkjcica4bvfylnbqz9z")))) + (base32 "1w1wscq7w0xx4wkkk9rl3pc067yspbk8qnfaq3i9sxc7k6zsy77x")))) (build-system python-build-system) (arguments (list @@ -967,14 +967,14 @@ editors.") (define-public texmacs (package (name "texmacs") - (version "2.1.1") + (version "2.1.4") (source (origin (method url-fetch) (uri (string-append "https://www.texmacs.org/Download/ftp/tmftp/" "source/TeXmacs-" version "-src.tar.gz")) (sha256 - (base32 "0c780vcwppzhb70d3d96md3hra7338d4fv3aj0sm7jx0mj2a334i")))) + (base32 "11l1q5lmsj9g7yil1dn7n1cgsr8iikx59kg9riahpb6xw0p959l7")))) (build-system cmake-build-system) (native-inputs (list pkg-config xdg-utils)) ;for xdg-icon-resource diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index a66be3d5f0..251fe00aa0 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2020, 2021, 2022 Marius Bakke <marius@gnu.org> -;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2021 Leo Famulari <leo@famulari.name> ;;; Copyright © 2021, 2022 Pierre Langlois <pierre.langlois@gmx.com> @@ -169,15 +169,16 @@ (define-public qemu (package (name "qemu") - (version "8.1.3") + (version "8.2.2") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) (sha256 - (base32 "1fv5wbxpjxqzv10bdlq0ykgqfmzqx4s8yfch9zvqcm8h0il1gk23")) - (patches (search-patches "qemu-disable-some-qtests-tests.patch" + (base32 "1wy45fbf4816l4ylsz8b8cbypva9apcdnvlgqfr586icp30lcww4")) + (patches (search-patches "qemu-build-info-manual.patch" + "qemu-disable-bios-tables-test.patch" "qemu-fix-agent-paths.patch")) (modules '((guix build utils))) (snippet @@ -196,7 +197,7 @@ (for-each delete-file (find-files "." "^(efi|pxe)-.*\\.rom$"))) ;; Delete bundled code that we provide externally. (for-each delete-file-recursively - '("subprojects/dtc" + '("roms/u-boot/scripts/dtc" "roms/ipxe" "roms/openbios" "roms/opensbi" @@ -321,10 +322,18 @@ (lambda* (#:key native-inputs inputs #:allow-other-keys) ;; Ensure the executables created by these source files reference ;; /bin/sh from the store so they work inside the build container. - (substitute* '("block/cloop.c" "migration/exec.c" - "net/tap.c" "tests/qtest/libqtest.c" + (substitute* '("block/cloop.c" + "migration/exec.c" + "migration/migration.c" + "net/tap.c" + "util/envlist.c") + (("/bin/sh") + (search-input-file inputs "/bin/sh"))) + ;; For tests, use the native /bin/sh is available. + (substitute* '("tests/qtest/libqtest.c" "tests/qtest/vhost-user-blk-test.c") - (("/bin/sh") (search-input-file inputs "/bin/sh"))) + (("/bin/sh") + (search-input-file (or native-inputs inputs) "/bin/sh"))) (substitute* "tests/qemu-iotests/testenv.py" (("#!/usr/bin/env python3") (string-append "#!" (search-input-file (or native-inputs inputs) diff --git a/gnu/packages/weather.scm b/gnu/packages/weather.scm index 5a58b97a30..e95f6bb501 100644 --- a/gnu/packages/weather.scm +++ b/gnu/packages/weather.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2022, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,7 +28,7 @@ (define-public wego (package (name "wego") - (version "2.1") + (version "2.2") (source (origin (method git-fetch) @@ -37,7 +37,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0bji9fywa0kg29zj1vrwq7l5f18hh0lcz6rl6sppi5id0qbjpiwl")))) + (base32 "09zn1z2744izzkkavs3lc1scsv22js8h28b0d86qd5dh2zfwfikf")))) (build-system go-build-system) (arguments '(#:import-path "github.com/schachmat/wego")) (propagated-inputs diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 1c0992523a..e6bc6a0c7b 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -590,7 +590,7 @@ driven and does not detract you from your daily work.") (define-public nyxt (package (name "nyxt") - (version "3.11.4") + (version "3.11.5") (source (origin (method git-fetch) @@ -599,7 +599,7 @@ driven and does not detract you from your daily work.") (commit version))) (sha256 (base32 - "1c1kiwa7chm491gpzihpqv33ysmxfp83gw6wcsbq72hkwir6kf74")) + "1f7pvh5bzkasbcfydd82pg7qn987ysbxk3j58dxzq2nzi05s0y4p")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -720,7 +720,7 @@ is fully configurable and extensible in Common Lisp.") (define-public lagrange (package (name "lagrange") - (version "1.16.7") + (version "1.17.6") (source (origin (method url-fetch) @@ -728,7 +728,7 @@ is fully configurable and extensible in Common Lisp.") (string-append "https://git.skyjake.fi/skyjake/lagrange/releases/" "download/v" version "/lagrange-" version ".tar.gz")) (sha256 - (base32 "0ig7xdsihq7wc8h7n1af275z3kjxq5iiy0x4dwjahgligrdmj7vm")) + (base32 "0fsjn74cmrchqgnj88yzdxyj1gm0i2vrzh69b9b9bi7y2wk9il5r")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 38f6217da2..a4a06c495a 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com> -;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com> +;;; Copyright © 2023, 2024 Kaelyn Takata <kaelyn.alexi@protonmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -79,7 +79,7 @@ (define-public wine-minimal (package (name "wine-minimal") - (version "8.18") + (version "9.0") (source (origin (method url-fetch) @@ -91,7 +91,7 @@ (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "1nv06awb3hv26v64nqnks9yiz7w368scxznj77vxa3zpmhafzyih")))) + (base32 "1vm61hrkinjqicxidhbhq3j8sb1iianfypdvjmnvgxcmac50kzbw")))) (properties '((upstream-name . "wine"))) (build-system gnu-build-system) (native-inputs (list bison flex)) @@ -304,7 +304,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "8.18") + (version "9.0") (source (origin (method git-fetch) @@ -313,7 +313,7 @@ integrate Windows applications into your desktop.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qabyw5139xdfsvzbwbrn1nnqssgwk8mn88mxnq2cdkk9gbjvq56")))) + (base32 "0xdinbj9byihy8snv6h1mcb79rh35zwhhld4g7mjg0k2wvjgskwl")))) (build-system trivial-build-system) (native-inputs (list coreutils)) @@ -359,7 +359,7 @@ integrate Windows applications into your desktop.") "wine-" wine-version ".tar.xz")) (file-name (string-append name "-" wine-version ".tar.xz")) (sha256 - (base32 "1nv06awb3hv26v64nqnks9yiz7w368scxznj77vxa3zpmhafzyih"))))) + (base32 "1vm61hrkinjqicxidhbhq3j8sb1iianfypdvjmnvgxcmac50kzbw"))))) (inputs (modify-inputs (package-inputs wine) (prepend autoconf ; for autoreconf ffmpeg diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a6f1ecd5c9..7d21d04094 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -187,13 +187,13 @@ xcb-util-keysyms xcb-util-wm)) (arguments - '(#:phases - (modify-phases %standard-phases - (delete 'configure)) ; no configure script - #:tests? #f ; no check target - #:make-flags - (list "CC=gcc" - (string-append "PREFIX=" %output)))) + (list #:phases + #~(modify-phases %standard-phases + (delete 'configure)) ; no configure script + #:tests? #f ; no check target + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)))) (home-page "https://github.com/baskerville/bspwm") (synopsis "Tiling window manager based on binary space partitioning") (description "bspwm is a tiling window manager that represents windows as @@ -1759,6 +1759,50 @@ modules for building a Wayland compositor.") (propagated-inputs (modify-inputs (package-propagated-inputs wlroots) (delete libdisplay-info))))) +(define-public wlroots-0.15 + (package + (inherit wlroots) + (name "wlroots-0.15") + (version "0.15.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/wlroots/wlroots") + (commit version))) + (file-name (git-file-name "wlroots" version)) + (sha256 + (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h")))))) + +(define-public wmenu + (package + (name "wmenu") + (version "0.1.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~adnano/wmenu") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wjn68r5cx4zvw7sby6sk2ip5h4fn0jbgb1nasm9nsgjpv63pnpm")))) + (build-system meson-build-system) + (native-inputs (append (if (%current-target-system) + ;; for wayland-scanner + (list pkg-config-for-build + wayland) + '()) + (list pkg-config scdoc))) + (inputs (list cairo pango wayland libxkbcommon wayland-protocols)) + (home-page "https://git.sr.ht/~adnano/wmenu") + (synopsis "Dynamic menu for Wayland") + (description "@command{wmenu} is a dynamic menu for Wayland, which reads a list +of newline-separated items from stdin. When the user selects an item and presses +Return, their choice is printed to stdout and wmenu terminates. Entering text will +narrow the items to those matching the tokens in the input.") + (license license:expat))) + (define-public sway (package (name "sway") @@ -1837,7 +1881,7 @@ corners, shadows, inactive window dimming, etc.") (define-public swayidle (package (name "swayidle") - (version "1.7.1") + (version "1.8.0") (source (origin (method git-fetch) @@ -1846,7 +1890,7 @@ corners, shadows, inactive window dimming, etc.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "06iq12p4438d6bv3jlqsf01wjaxrzlnj1bnicn41kad563aq41xl")))) + (base32 "0y0qdqzx90kvk6l80darldvizr7p5g65bnblhxlq5a2rgvs9hkpx")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Dlogind-provider=elogind"))) @@ -3219,7 +3263,7 @@ session. Nor does it depend on any UI toolkits such as Qt or GTK.") linux-pam pango wayland - wlroots-0.16)) + wlroots-0.15)) (arguments `(#:tests? #f ; no tests #:make-flags @@ -3524,20 +3568,24 @@ used for multimedia keys.") (define-public grimshot (package - (inherit sway) (name "grimshot") + (version "1.9-contrib.0") (source (origin - (inherit (package-source sway)) - (snippet #~(delete-file "contrib/grimshot.1")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/OctopusET/sway-contrib") + (commit version))) + (file-name (git-file-name name version)) + (snippet #~(delete-file "grimshot.1")) + (sha256 + (base32 + "16fa8l81zjy25nsky1i525hb7zjprqz74mbirm9b76pvksschdv5")))) (build-system copy-build-system) (arguments (list #:install-plan #~`(("grimshot" "bin/") ("grimshot.1" "share/man/man1/")) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "contrib"))) - (add-after 'chdir 'patch-script-dependencies + (add-after 'unpack 'patch-script-dependencies (lambda* (#:key inputs #:allow-other-keys) (substitute* "grimshot" (("\\b(date|grim|jq|notify-send|slurp|swaymsg|wl-copy)\\b" @@ -3559,11 +3607,13 @@ used for multimedia keys.") slurp sway wl-clipboard)) + (home-page "https://github.com/OctopusET/sway-contrib") (synopsis "Screenshot utility for the Sway window manager") (description "Grimshot is a screenshot utility for @code{sway}. It provides an interface over @code{grim}, @code{slurp} and @code{jq}, and supports storing the screenshot either directly to the clipboard using @code{wl-copy} or to a -file."))) +file.") + (license license:expat))) (define-public wld (let ((commit "6586736176ef50a88025abae835e29a7ca980126") diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c81c549736..514e5c7164 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -41,9 +41,9 @@ ;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com> ;;; Copyright © 2020 James Smith <jsubuntuxp@disroot.org> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> -;;; Copyright © 2020, 2021, 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2020, 2021, 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> -;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2021, 2022, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Renzo Poddighe <renzo@poddighe.nl> ;;; Copyright © 2021 Paul A. Patience <paul@apatience.com> @@ -1256,14 +1256,14 @@ transparent text on your screen.") (define-public wob (package (name "wob") - (version "0.14.2") + (version "0.15.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/francma/wob/releases/download/" version "/wob-" version ".tar.gz")) (sha256 - (base32 "12s9pc0dhqgawq6jiqhamj1zq9753kgpswny1rcsdx1lkpzrgaq1")))) + (base32 "1632y0yr1ig5nihs6kqyvfi117815zszhnfvaabm97qkf5blkj5p")))) (build-system meson-build-system) (native-inputs (list pkg-config scdoc)) @@ -1341,16 +1341,16 @@ Guile will work for XBindKeys.") (base32 "1winwzdy9yxvxnrv8gqpigl9y0c2px27mnms62bdilp4x6llrs9r")))) (build-system gnu-build-system) (inputs - (list asciidoc libxcb xcb-util xcb-util-keysyms xcb-util-wm)) + (list libxcb xcb-util xcb-util-keysyms xcb-util-wm)) (arguments - `(#:phases (modify-phases %standard-phases (delete 'configure)) - #:tests? #f ; no check target - #:make-flags - (list ,(string-append "CC=" (cc-for-target)) - (string-append "PREFIX=" %output) - ;; Keep the documentation where the build system installs LICENSE. - (string-append "DOCPREFIX=" %output - "/share/doc/" ,name "-" ,version)))) + (list #:phases #~(modify-phases %standard-phases (delete 'configure)) + #:tests? #f ; no check target + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) + ;; Keep the documentation where the build system installs LICENSE. + (string-append "DOCPREFIX=" #$output + "/share/doc/" #$name "-" #$version)))) (home-page "https://github.com/baskerville/sxhkd") (synopsis "Simple X hotkey daemon") (description "sxhkd is a simple X hotkey daemon with a powerful and diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 593226a740..e90689384f 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -471,7 +471,7 @@ applications menu, workspace switcher and more.") (define-public xfce4-clipman-plugin (package (name "xfce4-clipman-plugin") - (version "1.6.4") + (version "1.6.6") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -479,7 +479,7 @@ applications menu, workspace switcher and more.") "xfce4-clipman-plugin-" version ".tar.bz2")) (sha256 (base32 - "1v5c1z154a46426198m3pl0fyrlsgfiqy4x9rvzcwzlp6lg5iplz")))) + "083i9pbcqjkdzzjx055ld4gd4gn3xnc3rn10vpsqv1vg01dlgb88")))) (build-system gnu-build-system) (native-inputs (list intltool pkg-config)) @@ -498,7 +498,7 @@ matching them against regular expressions.") (define-public xfce4-pulseaudio-plugin (package (name "xfce4-pulseaudio-plugin") - (version "0.4.7") + (version "0.4.8") (source (origin (method url-fetch) @@ -507,7 +507,7 @@ matching them against regular expressions.") (version-major+minor version) "/" "xfce4-pulseaudio-plugin-" version ".tar.bz2")) (sha256 - (base32 "0b4fjvrrah0b97cbv8ds7r6cwnj392ya2r7703ixf724f43hkpah")))) + (base32 "0j037wnx0z22nw11mq0y3cnq1srr52zckjap3klj3hirghh2nx5x")))) (build-system gnu-build-system) (native-inputs (list intltool pkg-config dbus-glib dbus)) @@ -793,7 +793,7 @@ and import the new pictures from your camera.") (define-public thunar-archive-plugin (package (name "thunar-archive-plugin") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) @@ -801,7 +801,7 @@ and import the new pictures from your camera.") name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 - (base32 "1vcbbmh2vw43231c7vbkwc35pmhj7ixb65fvssrwfxydsfqkl6x8")))) + (base32 "1qxdsnwjy8z358yd0avi1h2r6y1izfv26dzlp5fsh3pwpivzhyb3")))) (build-system gnu-build-system) (native-inputs (list pkg-config intltool)) (inputs (list exo thunar gtk+)) @@ -836,7 +836,7 @@ Samba from Thunar (the Xfce file manager) without requiring root access.") (define-public thunar-media-tags-plugin (package (name "thunar-media-tags-plugin") - (version "0.3.0") + (version "0.4.0") (source (origin (method url-fetch) @@ -844,7 +844,7 @@ Samba from Thunar (the Xfce file manager) without requiring root access.") name "/" (version-major+minor version) "/" name "-" version ".tar.bz2")) (sha256 - (base32 "06sr7b4p9f585gian8vpx7j0pkzg0vvwcrjmrhvh7i5sb90w8rg2")))) + (base32 "02n99ymqs8msa798r63sy409pwrycg8p4pxx3yf497k924g134lm")))) (build-system gnu-build-system) (native-inputs (list pkg-config intltool)) (inputs (list exo gtk+ thunar taglib)) @@ -1032,7 +1032,7 @@ devices and folders.") (define-public gigolo (package (name "gigolo") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1040,7 +1040,7 @@ devices and folders.") "/" name "-" version ".tar.bz2")) (sha256 (base32 - "1hxv3lla567nnqxxly8xfi8fzmpcdhxb493x9hinr7szfnh1ljp3")))) + "1l1g9ljvyzir1jpjf0248nnwwf3sakwljlik6cj5wrj4azv88nfj")))) (build-system gnu-build-system) (native-inputs (list pkg-config intltool)) (inputs (list gtk+)) @@ -1136,7 +1136,7 @@ on your desktop.") (define-public xfce4-dict (package (name "xfce4-dict") - (version "0.8.5") + (version "0.8.6") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" name "/" @@ -1144,7 +1144,7 @@ on your desktop.") name "-" version ".tar.bz2")) (sha256 (base32 - "06xa7987azyx6y4mkmg58qv7gsg66szmr8ly29l9l1v1xl5sp7i9")))) + "0h8adjgb7126hafik7r1k9wr3g6d835ggsh8zj9k4k9mf35bfpdf")))) (build-system gnu-build-system) (native-inputs (list intltool pkg-config)) @@ -1300,7 +1300,7 @@ inhibit interface which allows applications to prevent automatic sleep.") (define-public ristretto (package (name "ristretto") - (version "0.13.1") + (version "0.13.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/ristretto/" @@ -1308,7 +1308,7 @@ inhibit interface which allows applications to prevent automatic sleep.") "ristretto-" version ".tar.bz2")) (sha256 (base32 - "07kraf6k18f53vgx98hvrb20hcm5134m7c958w96fl142nzzy6np")))) + "1nbxfm6ljcw45vn8hhjxwcv3k387hdah4jnn07n9w08n63g5x7vp")))) (build-system gnu-build-system) (native-inputs (list intltool desktop-file-utils @@ -1328,7 +1328,7 @@ the desktop wallpaper.") (define-public xfce4-taskmanager (package (name "xfce4-taskmanager") - (version "1.5.5") + (version "1.5.7") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1336,7 +1336,7 @@ the desktop wallpaper.") "xfce4-taskmanager-" version ".tar.bz2")) (sha256 (base32 - "1rcaalqv6sdsnc6ick8fifgkqcf2xiflw9yk5szqn2qs4jx02kzn")))) + "1fv83xcbnlwabi32z3fsdik1knh7v45ji529dx9kwlv4b8pq6dk7")))) (build-system gnu-build-system) (native-inputs (list intltool pkg-config)) @@ -1388,7 +1388,7 @@ several different time zones.") (define-public xfce4-notifyd (package (name "xfce4-notifyd") - (version "0.8.2") + (version "0.9.4") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1396,7 +1396,7 @@ several different time zones.") name "-" version ".tar.bz2")) (sha256 (base32 - "115fy87lcn9scwx52kjs0g250q2d3r10sahl6l8l38fs13dqm8p3")))) + "063qxbcy8djijsb0clzkai3mwg43mmlswwrg403vsi2w0n614v5f")))) (build-system glib-or-gtk-build-system) (arguments (list #:phases @@ -1409,7 +1409,9 @@ several different time zones.") (("\\$PKG_CONFIG --variable=glib_compile_resources gio-2.0") "which glib-compile-resources") (("\\$PKG_CONFIG --variable=glib_genmarshal glib-2.0") - "which glib-genmarshal"))))))) + "which glib-genmarshal") + (("\\$PKG_CONFIG --variable=glib_mkenums glib-2.0") + "which glib-mkenums"))))))) (native-inputs (list intltool pkg-config (list glib "bin") which)) (inputs @@ -1463,7 +1465,7 @@ of data to either CD/DVD/BD.") (define-public mousepad (package (name "mousepad") - (version "0.6.1") + (version "0.6.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/mousepad/" @@ -1471,7 +1473,7 @@ of data to either CD/DVD/BD.") version ".tar.bz2")) (sha256 (base32 - "0dpzzy03hlw6gljp7ywdi6np41r88p2nr7rypwzy6zdwqwv5832n")))) + "17fi33mkdz1nfmsgqlfa20l06wwy0s8lcj21cfg6ikdiihxwpjp7")))) (build-system gnu-build-system) (arguments '(#:configure-flags '(;; Use the GSettings keyfile backend rather than @@ -1502,7 +1504,7 @@ of data to either CD/DVD/BD.") (define-public xfce4-screenshooter (package (name "xfce4-screenshooter") - (version "1.10.4") + (version "1.10.5") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1512,7 +1514,7 @@ of data to either CD/DVD/BD.") version ".tar.bz2")) (sha256 (base32 - "1534h1a3a8b9pl20zpccaifrlsrbsihdcdjndn9nmqalgrl9kwd2")))) + "0732f1v6s1zkflq47rgdsimq73k7q94gwag1y9sza5smd8m1ywgs")))) (build-system gnu-build-system) (native-inputs (list pkg-config intltool @@ -1531,7 +1533,7 @@ A plugin for the Xfce panel is also available.") (define-public xfce4-screensaver (package (name "xfce4-screensaver") - (version "4.18.2") + (version "4.18.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1541,7 +1543,7 @@ A plugin for the Xfce panel is also available.") version ".tar.bz2")) (sha256 (base32 - "161bdsvkbknaf9fpz4b1r4amnm72hzfmx9c6krg2396k2k2d5z74")))) + "0f9sw703pcgz47689qgc550h2hpqlzvsfgggd7z9s6516rhk2wfi")))) (build-system gnu-build-system) (arguments `(#:phases @@ -1602,7 +1604,7 @@ A plugin for the Xfce panel is also available.") (define-public xfce4-cpugraph-plugin (package (name "xfce4-cpugraph-plugin") - (version "1.2.8") + (version "1.2.10") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1611,7 +1613,7 @@ A plugin for the Xfce panel is also available.") "/xfce4-cpugraph-plugin-" version ".tar.bz2")) (sha256 (base32 - "1gylfmpn36cm1b1kz0x8smy5hixzlhmdg5i53cj5fzgk4773id5z")))) + "05frfn3y009xndks9rsw90jgk0v5zfarn5jqaqci45v9ab82sy9p")))) (build-system gnu-build-system) (native-inputs (list intltool pkg-config)) @@ -1787,7 +1789,7 @@ be clicked to open the chosen mount point.") (define-public xfce4-genmon-plugin (package (name "xfce4-genmon-plugin") - (version "4.1.1") + (version "4.2.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1796,7 +1798,7 @@ be clicked to open the chosen mount point.") "/xfce4-genmon-plugin-" version ".tar.bz2")) (sha256 (base32 - "0d81npcqnmkw2qaqa8c6igh9j5r4ivgb15zcjwxjkyhrzz89y4dj")))) + "0qh3b818kbf5sc07dshkd54nhqncsk0inlwv21zq8h11bzp0i3cl")))) (build-system gnu-build-system) (native-inputs (list intltool pkg-config)) @@ -2195,7 +2197,7 @@ lan interface (signal state, signal quality, network name (SSID)).") (define-public xfce4-weather-plugin (package (name "xfce4-weather-plugin") - (version "0.11.1") + (version "0.11.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -2204,12 +2206,12 @@ lan interface (signal state, signal quality, network name (SSID)).") "/xfce4-weather-plugin-" version ".tar.bz2")) (sha256 (base32 - "0fajhibacccfw0rl8741iz7qkqls4ynn9760j78rbp6wl3wlcld4")))) + "0sw7p8xsgyc7b5w92abigqz9mii79w2vdlprm5c0hmb3g3zhmm35")))) (build-system gnu-build-system) (native-inputs (list intltool pkg-config)) (inputs - (list gtk+ libsoup-minimal-2 libxfce4ui libxml2 xfce4-panel)) + (list gtk+ json-c libsoup-minimal-2 libxfce4ui libxml2 xfce4-panel)) (home-page "https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin") (synopsis "Show information about local weather in the Xfce panel") @@ -2232,7 +2234,8 @@ local weather in the panel, using forecast data provided by the "10bnb8q7sj60ahzfwrb3av4ngr17wk1p6jsnfv0yn8l90kksnb41")))) (build-system gnu-build-system) (native-inputs - (list pkg-config)) + (list pkg-config + libxslt)) (inputs (list glib)) (home-page "https://docs.xfce.org/xfce/xfce4-dev-tools/") diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index 9702170b3e..a914d0f89e 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -427,6 +427,12 @@ See @url{https://prosody.im/doc/modules/mod_tls}." @url{https://prosody.im/doc/modules/mod_saslauth}." common) + (insecure-sasl-mechanisms + (string-list '("PLAIN" "LOGIN")) + "Set of mechanisms that will not be offered on unencrypted connections. +See @url{https://prosody.im/doc/modules/mod_saslauth}." + common) + (s2s-require-encryption? (boolean #f) "Whether to force all server-to-server connections to be encrypted or not. diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm index 69c737829b..48695e2806 100644 --- a/gnu/services/sddm.scm +++ b/gnu/services/sddm.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -328,7 +329,11 @@ Relogin=" (if (sddm-configuration-relogin? config) (service-extension account-service-type (const %sddm-accounts)) (service-extension profile-service-type - sddm-profile-service))) + sddm-profile-service) + (service-extension localed-service-type + (compose + xorg-configuration-keyboard-layout + sddm-configuration-xorg)))) (default-value (sddm-configuration)) (description "Run SDDM, a display and log-in manager for X11 and diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 66bd58c403..26902c0568 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2022 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2023 muradm <mail@muradm.net> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,6 +78,7 @@ xorg-configuration-extra-config xorg-configuration-server xorg-configuration-server-arguments + xorg-configuration-keyboard-layout %default-xorg-modules %default-xorg-fonts diff --git a/gnu/tests/messaging.scm b/gnu/tests/messaging.scm index 1e26c0ddea..dfcc92f7ed 100644 --- a/gnu/tests/messaging.scm +++ b/gnu/tests/messaging.scm @@ -145,7 +145,7 @@ (define %test-prosody (let* ((config (prosody-configuration - (disable-sasl-mechanisms '()) + (insecure-sasl-mechanisms '()) (virtualhosts (list (virtualhost-configuration diff --git a/guix/describe.scm b/guix/describe.scm index 65cd79094b..a4ca2462f4 100644 --- a/guix/describe.scm +++ b/guix/describe.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2018-2021, 2024 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +27,7 @@ sexp->channel manifest-entry-channel) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) #:use-module (ice-9 match) #:export (current-profile current-profile-date @@ -55,20 +56,49 @@ ;; later on. (program-arguments)) +(define (find-profile program) + "Return the profile created by 'guix pull' or 'guix time-machine' that +PROGRAM lives in; PROGRAM is expected to end in \"/bin/guix\". Return #f if +such a profile could not be found." + (and (string-suffix? "/bin/guix" program) + ;; Note: We want to do _lexical dot-dot resolution_. Using ".." for + ;; real would instead take us into the /gnu/store directory that + ;; ~/.config/guix/current/bin points to, whereas we want to obtain + ;; ~/.config/guix/current. + (let ((candidate (dirname (dirname program)))) + (and (file-exists? (string-append candidate "/manifest")) + (let ((manifest (guard (c ((profile-error? c) #f)) + (profile-manifest candidate)))) + (define (fallback) + (or (and=> (false-if-exception (readlink program)) + find-profile) + (and=> (false-if-exception (readlink (dirname program))) + (lambda (target) + (find-profile (in-vicinity target "guix")))))) + + ;; Is CANDIDATE the "right" profile--the one created by 'guix + ;; pull'? It might be that CANDIDATE itself contains a + ;; symlink to the "right" profile; this happens for instance + ;; when using 'guix shell -CW'. Thus, if CANDIDATE doesn't + ;; fit the bill, dereference PROGRAM or its parent directory + ;; and try again. + (match (and manifest + (manifest-lookup manifest + (manifest-pattern (name "guix")))) + (#f + (fallback)) + (entry + (if (assq 'source (manifest-entry-properties entry)) + candidate + (fallback))))))))) + (define current-profile (mlambda () "Return the profile (created by 'guix pull') the calling process lives in, or #f if this is not applicable." (match initial-program-arguments ((program . _) - (and (string-suffix? "/bin/guix" program) - ;; Note: We want to do _lexical dot-dot resolution_. Using ".." - ;; for real would instead take us into the /gnu/store directory - ;; that ~/.config/guix/current/bin points to, whereas we want to - ;; obtain ~/.config/guix/current. - (let ((candidate (dirname (dirname program)))) - (and (file-exists? (string-append candidate "/manifest")) - candidate))))))) + (find-profile program))))) (define (current-profile-date) "Return the creation date of the current profile (produced by 'guix pull'), diff --git a/guix/profiles.scm b/guix/profiles.scm index ccc96478aa..d41802422b 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013-2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2014, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> @@ -652,6 +652,8 @@ denoting a specific output of a package." vlist-null))) (_ (raise (condition + (&profile-error + (profile (and=> (source-property sexp 'filename) dirname))) (&message (message "unsupported manifest format"))))))) (define (read-manifest port) diff --git a/guix/scripts/git/authenticate.scm b/guix/scripts/git/authenticate.scm index 6ff5cee682..def4879e96 100644 --- a/guix/scripts/git/authenticate.scm +++ b/guix/scripts/git/authenticate.scm @@ -101,6 +101,8 @@ Authenticate the given Git checkout using COMMIT/SIGNER as its introduction.\n") -k, --keyring=REFERENCE load keyring from REFERENCE, a Git branch")) (display (G_ " + --end=COMMIT authenticate revisions up to COMMIT")) + (display (G_ " --stats display commit signing statistics upon completion")) (display (G_ " --cache-key=KEY cache authenticated commits under KEY")) |