Commit Graph

22610 Commits

Author SHA1 Message Date
Markus Kowalewski
c4e0154f80 hdf5-fortran: move F90 mod files to dev output; remove refs to gfortran 2024-06-03 10:28:27 +02:00
K900
0b2a090503
Merge pull request #316655 from raboof/grub2-deterministic-locales
grub2: make localization resources deterministic
2024-06-03 10:25:53 +03:00
Vinny Meller
6031652ebf
twm: 0.9.1 -> 0.10.2 2024-06-03 01:39:17 -04:00
github-actions[bot]
c987c730bb
Merge master into staging-next 2024-06-03 00:02:20 +00:00
Sandro
d0babee7c4
Merge pull request #314683 from trofi/diffoscope-update 2024-06-02 21:33:27 +02:00
éclairevoyant
2d57e1ce28
Merge pull request #316704 from babariviere/chore/remove-babariviere
remove 'babariviere' as a maintainer
2024-06-02 18:26:48 +00:00
github-actions[bot]
97d15b22bf
Merge master into staging-next 2024-06-02 18:01:10 +00:00
Weijia Wang
8fd753c251
Merge pull request #313346 from r-ryantm/auto-update/ipxe
ipxe: 1.21.1-unstable-2024-04-17 -> 1.21.1-unstable-2024-05-31
2024-06-02 19:45:22 +02:00
Bastien Riviere
40c9def80e
remove 'babariviere' as a maintainer 2024-06-02 18:49:26 +02:00
Weijia Wang
ba708dc765
Merge pull request #312476 from r-ryantm/auto-update/wootility
wootility: 4.6.18 -> 4.6.20
2024-06-02 18:11:26 +02:00
Weijia Wang
4a2a6fd1f6
Merge pull request #313047 from r-ryantm/auto-update/grass-sass
grass-sass: 0.13.2 -> 0.13.3
2024-06-02 18:07:09 +02:00
Weijia Wang
add5198a04
Merge pull request #313026 from r-ryantm/auto-update/godu
godu: 1.4.1 -> 1.5.2
2024-06-02 18:06:50 +02:00
Weijia Wang
3a31ed2e1b
Merge pull request #313290 from r-ryantm/auto-update/vtm
vtm: 0.9.81 -> 0.9.82
2024-06-02 18:00:19 +02:00
Sandro
4e400bafd1
Merge pull request #309843 from anthonyroussel/yubico-piv-tool_2_5_2 2024-06-02 17:07:35 +02:00
R. Ryantm
4412282fc0 ipxe: 1.21.1-unstable-2024-04-17 -> 1.21.1-unstable-2024-05-31 2024-06-02 14:44:33 +00:00
Nick Cao
a2945d1f11
Merge pull request #316557 from r-ryantm/auto-update/svu
svu: 1.12.0 -> 2.0.1
2024-06-02 10:22:13 -04:00
Nick Cao
f034f9659b
Merge pull request #316441 from r-ryantm/auto-update/mcfly
mcfly: 0.8.6 -> 0.9.0
2024-06-02 10:12:21 -04:00
h7x4
1f6c575fad
Merge pull request #315981 from Mynacol/leanify-check
leanify: add simple check
2024-06-02 15:13:31 +02:00
Arnout Engelen
db2b9eb139
grub2: make localization resources deterministic
by taking them from the release tarball instead
of from the (nondeterministic) translation portal.

See also https://github.com/NixOS/nixpkgs/issues/245356
Fixes https://github.com/NixOS/nixpkgs/issues/263095
2024-06-02 14:45:36 +02:00
github-actions[bot]
c56c306bc3
Merge master into staging-next 2024-06-02 12:01:17 +00:00
Michele Guerini Rocco
739b96e3b0
Merge pull request #316564 from r-ryantm/auto-update/bdf2psf
bdf2psf: 1.226 -> 1.227
2024-06-02 10:45:10 +02:00
R. Ryantm
ee6268297c goaccess: 1.9.2 -> 1.9.3 2024-06-02 04:04:00 +00:00
R. Ryantm
30758e7011 bdf2psf: 1.226 -> 1.227 2024-06-02 01:55:24 +00:00
R. Ryantm
136562bbdd svu: 1.12.0 -> 2.0.1 2024-06-02 01:43:02 +00:00
github-actions[bot]
39c82b1a85
Merge master into staging-next 2024-06-02 00:02:38 +00:00
Sergei Trofimovich
553c41f9f9 diffoscope: 267 -> 269
Changes:
- https://diffoscope.org/news/diffoscope-268-released/
- https://diffoscope.org/news/diffoscope-269-released/
2024-06-01 21:56:33 +01:00
github-actions[bot]
f4392ae842
Merge master into staging-next 2024-06-01 18:01:06 +00:00
R. Ryantm
7ed4f8c990 mcfly: 0.8.6 -> 0.9.0 2024-06-01 14:23:29 +00:00
Markus Kowalewski
762574dd59 panoply: 5.4.0 -> 5.4.1 2024-06-01 15:58:09 +02:00
R. Ryantm
6af33172f6 broot: 1.38.0 -> 1.39.0 2024-06-01 00:30:17 +00:00
github-actions[bot]
738e64a2f9
Merge master into staging-next 2024-06-01 00:02:18 +00:00
Nick Cao
f6a6e3386c
Merge pull request #300581 from imadnyc/pandoc-include
pandoc-include: add update.sh
2024-05-31 16:24:59 -04:00
Nick Cao
79cf68bf46
Merge pull request #316191 from r-ryantm/auto-update/phrase-cli
phrase-cli: 2.27.0 -> 2.27.1
2024-05-31 15:10:29 -04:00
github-actions[bot]
c0b9a61616
Merge master into staging-next 2024-05-31 18:01:21 +00:00
ajs124
54d557c0b9
Merge pull request #315902 from ajs124/upd/thin-provisioning-tools
thin-provisioning-tools: 0.9.0 -> 1.0.12
2024-05-31 18:12:42 +02:00
R. Ryantm
ce28e96db0 phrase-cli: 2.27.0 -> 2.27.1 2024-05-31 15:42:14 +00:00
Mynacol
1a2fc30c43 leanify: Add simple check
Check that the executable is where it's expected and that it can be
executed. The command is expected to fail with `Map file error: Invalid argument`.
However, it returns with return value 0.
2024-05-31 17:34:14 +02:00
OTABI Tomoya
307d036348
Merge pull request #314772 from natsukium/scdl/update
scdl: 2.7.7 -> 2.7.9
2024-05-31 23:35:47 +09:00
Vladimír Čunát
5804775d03
Merge branch 'staging' into staging-next 2024-05-31 07:30:41 +02:00
Doron Behar
3b964ec0da
Merge pull request #315916 from r-ryantm/auto-update/pistol
pistol: 0.4.2 -> 0.4.3
2024-05-31 00:29:35 +03:00
R. Ryantm
d3ff60f8c9 pistol: 0.4.2 -> 0.4.3 2024-05-30 14:48:33 +00:00
ajs124
acca103f2b thin-provisioning-tools: 0.9.0 -> 1.0.12
https://github.com/jthornber/thin-provisioning-tools/blob/v1.0.12/CHANGES
2024-05-30 15:53:44 +02:00
Rafael Fernández López
b3f065d48c
wasm-tools: 1.208.1 -> 1.209.1 2024-05-29 22:28:50 +02:00
Nick Cao
307011741f
Merge pull request #315630 from r-ryantm/auto-update/krapslog
krapslog: 0.5.4 -> 0.6.0
2024-05-29 13:33:46 -04:00
R. Ryantm
12dbde9476 lokalise2-cli: 2.6.10 -> 2.6.14 2024-05-29 13:19:33 +00:00
R. Ryantm
0bddd325ff krapslog: 0.5.4 -> 0.6.0 2024-05-29 13:17:34 +00:00
github-actions[bot]
a21afc1d92
Merge staging-next into staging 2024-05-29 12:01:33 +00:00
Sandro
1cab1e10a4
Merge pull request #315076 from SuperSandro2000/yt-dlp
yt-dlp: 2024.4.9 -> 2024.5.27
2024-05-29 10:36:48 +02:00
Weijia Wang
47633b1ed0
Merge pull request #314861 from r-ryantm/auto-update/plantuml-server
plantuml-server: 1.2024.4 -> 1.2024.5
2024-05-29 08:47:27 +02:00
github-actions[bot]
88d9d40017
Merge staging-next into staging 2024-05-29 00:02:38 +00:00
Nick Cao
114570ece7
Merge pull request #315298 from mweinelt/esphome-2024.5.4
esphome: 2024.5.3 -> 2024.5.4
2024-05-28 15:19:02 -04:00
github-actions[bot]
77347136f6
Merge staging-next into staging 2024-05-28 18:02:01 +00:00
Sandro Jäckel
fe830d2855
yt-dlp: 2024.4.9 -> 2024.5.27
Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2024.05.26
Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.05.27
2024-05-28 11:11:30 +02:00
Martin Weinelt
c3da36c2a7
esphome: 2024.5.3 -> 2024.5.4
https://github.com/esphome/esphome/releases/tag/2024.5.4
2024-05-28 10:47:38 +02:00
R. Ryantm
46909595ad fluent-bit: 3.0.4 -> 3.0.6 2024-05-28 05:33:51 +00:00
github-actions[bot]
1116b2e0c6
Merge staging-next into staging 2024-05-28 00:02:32 +00:00
John Ericson
d863884130
Merge pull request #313496 from rhelmot/freebsd-minimal3/gnu-config
various: Enable updateAutotoolsGnuConfigScriptsHook
2024-05-27 15:25:43 -04:00
Pol Dellaiera
1febaefa05
Merge pull request #314534 from isabelroses/fix/gh-eco
gh-eco: added fetchpatch; modernize
2024-05-27 21:16:19 +02:00
github-actions[bot]
12993f1c4a
Merge staging-next into staging 2024-05-27 18:01:17 +00:00
Audrey Dutcher
846de80d1c various: Enable updateAutotoolsGnuConfigScriptsHook
Prior to August 2023, any config.guess generated by autoconf will
include a hardcoded /usr/bin/uname invocation for FreeBSD on any
architecture other than arm. This clearly doesn't work under nix.
We must then update or otherwise patch each old config.guess.
2024-05-27 11:09:28 -04:00
lucasew
3a3f6e1288 pmbootstrap: move to by-name, add update script
Signed-off-by: lucasew <lucas59356@gmail.com>
2024-05-27 10:33:22 -03:00
github-actions[bot]
31a1f60b7f
Merge staging-next into staging 2024-05-27 12:01:36 +00:00
Markus Kowalewski
9291c0d452
Merge pull request #314673 from r-ryantm/auto-update/ethtool
ethtool: 6.7 -> 6.9
2024-05-27 11:06:24 +00:00
isabel
072363fc3e
gh-eco: added fetchpatch; modernize 2024-05-27 10:44:04 +01:00
Pol Dellaiera
e32580d9d1
Merge pull request #314851 from r-ryantm/auto-update/lazydocker
lazydocker: 0.23.1 -> 0.23.3
2024-05-27 09:12:46 +02:00
github-actions[bot]
7b88bc39ef
Merge staging-next into staging 2024-05-27 00:02:54 +00:00
Robert Helgesson
a7b6a4663a trash-cli: 0.24.4.17 -> 0.24.5.26
Diff: https://github.com/andreafrancia/trash-cli/compare/0.24.4.17...0.24.5.26

Also add explicit update script.
2024-05-27 00:09:01 +02:00
github-actions[bot]
7537b40813
Merge staging-next into staging 2024-05-26 18:01:42 +00:00
R. Ryantm
5faa416d1d plantuml: 1.2024.4 -> 1.2024.5 2024-05-26 19:05:50 +02:00
John Ericson
db07eff231
Merge pull request #313517 from rhelmot/freebsd-minimal3/coreutils2
coreutils: enable single-binary build on FreeBSD
2024-05-26 11:51:30 -04:00
R. Ryantm
7429b37a8d plantuml-server: 1.2024.4 -> 1.2024.5 2024-05-26 14:11:33 +00:00
R. Ryantm
4a1def6959 lazydocker: 0.23.1 -> 0.23.3 2024-05-26 13:11:58 +00:00
Matthias Beyer
928b443328
Merge pull request #314667 from r-ryantm/auto-update/you-get
you-get: 0.4.1650 -> 0.4.1700
2024-05-26 14:24:25 +02:00
github-actions[bot]
d0f5d1af6a
Merge staging-next into staging 2024-05-26 12:01:46 +00:00
Matthias Beyer
2eb2678978
Merge pull request #314581 from r-ryantm/auto-update/faketty
faketty: 1.0.16 -> 1.0.17
2024-05-26 10:56:04 +02:00
natsukium
9d19167e4e
scdl: 2.7.7 -> 2.7.9 2024-05-26 15:34:54 +09:00
R. Ryantm
18a29caf93 ethtool: 6.7 -> 6.9 2024-05-25 20:22:26 +00:00
R. Ryantm
e1dd6534c6 you-get: 0.4.1650 -> 0.4.1700 2024-05-25 19:38:48 +00:00
github-actions[bot]
edcb881454
Merge staging-next into staging 2024-05-25 18:01:21 +00:00
R. Ryantm
2ca6dde52f faketty: 1.0.16 -> 1.0.17 2024-05-25 13:00:58 +00:00
Nick Cao
444abfeba4
Merge pull request #314370 from mweinelt/esphome-2024.5.3
esphome: 2024.5.2 -> 2024.5.3
2024-05-25 08:59:19 -04:00
Nick Cao
f67c6a1f68
Merge pull request #314303 from r-ryantm/auto-update/goreleaser
goreleaser: 1.26.1 -> 1.26.2
2024-05-25 08:42:23 -04:00
Nick Cao
7fe411f7de
Merge pull request #314216 from loicreynier/feat-license-generator-update
license-generator: 1.0.0 -> 1.1.0
2024-05-25 08:35:03 -04:00
Robert Scott
eab02dd04c
Merge pull request #314543 from paparodeo/foma-update-fix
foma: 0.10.0alpha -> 0.10.0alpha-unstable-03-13-2024; fix darwin
2024-05-25 13:18:49 +01:00
github-actions[bot]
77670642a2
Merge staging-next into staging 2024-05-25 12:01:46 +00:00
Nikolay Korotkiy
74847b0b68
Merge pull request #314420 from sikmir/ili2c
ili2c: enable on unix
2024-05-25 13:54:09 +04:00
paparodeo
57a2ace07e
foma: 0.10.0alpha -> 0.10.0alpha-unstable-03-13-2024
- 82f9acdef2...e0d8122bda
- build switched from make to cmake
- fixes darwin
2024-05-25 09:45:46 +00:00
github-actions[bot]
3837f153d8
Merge staging-next into staging 2024-05-25 00:02:45 +00:00
Nikolay Korotkiy
23f4fbb9c0
ili2c: enable on unix 2024-05-25 02:49:08 +04:00
Martin Weinelt
24decc1ea8
esphome: 2024.5.2 -> 2024.5.3
https://github.com/esphome/esphome/releases/tag/2024.5.3
2024-05-24 22:28:13 +02:00
a-kenji
e597be5687 gh-dash: 3.14.0 -> 4.0.0 2024-05-24 19:02:02 +02:00
R. Ryantm
df00ee5514 goreleaser: 1.26.1 -> 1.26.2 2024-05-24 14:44:22 +00:00
github-actions[bot]
a73d2d9b62
Merge staging-next into staging 2024-05-24 12:01:26 +00:00
Weijia Wang
a64a502cd7
Merge pull request #313251 from lucc/nvimpager
nvimpager: 0.12.0 -> 0.13.0
2024-05-24 10:14:29 +02:00
Loïc Reynier
7e53420165
license-generator: 1.0.0 -> 1.1.0 2024-05-24 07:40:45 +00:00
github-actions[bot]
3254cacae4
Merge staging-next into staging 2024-05-24 00:02:38 +00:00
Nick Cao
322afdff5a
Merge pull request #313874 from r-ryantm/auto-update/tmux-mem-cpu-load
tmux-mem-cpu-load: 3.8.0 -> 3.8.1
2024-05-23 14:14:46 -04:00
Nick Cao
95aeea59c5
Merge pull request #313767 from r-ryantm/auto-update/svtplay-dl
svtplay-dl: 4.73 -> 4.79
2024-05-23 14:13:03 -04:00
github-actions[bot]
7655996362
Merge staging-next into staging 2024-05-23 18:02:28 +00:00
Marcus Ramberg
d7daf63a4f
Merge pull request #313719 from MarcelCoding/mrtg-ipv6 2024-05-23 17:19:36 +02:00
Franz Pletz
998ab56db3
Merge pull request #313398 from r-ryantm/auto-update/fluent-bit 2024-05-23 15:50:50 +02:00
Lucas Hoffmann
eff2e77eee nvimpager: 0.12.0 -> 0.13.0 2024-05-23 14:57:33 +02:00
Martin Weinelt
1db599972d
Merge pull request #311871 from mweinelt/esphome-2024.5.0
esphome: 2024.4.2 -> 2024.5.2
2024-05-23 14:36:15 +02:00
github-actions[bot]
044fbf6429
Merge staging-next into staging 2024-05-23 12:02:05 +00:00
K900
5085728341 calamares-nixos-extensions: 0.3.15 -> 0.3.16
Diff: https://github.com/NixOS/calamares-nixos-extensions/compare/0.3.15...0.3.16
2024-05-23 10:03:46 +03:00
R. Ryantm
724e4680a8 tmux-mem-cpu-load: 3.8.0 -> 3.8.1 2024-05-23 06:04:35 +00:00
github-actions[bot]
221ad4ab54
Merge staging-next into staging 2024-05-23 06:01:39 +00:00
Nick Cao
2ec29782d1
Merge pull request #313804 from r-ryantm/auto-update/ttyplot
ttyplot: 1.6.4 -> 1.6.5
2024-05-22 21:16:03 -04:00
Nick Cao
161727cca5
Merge pull request #313715 from r-ryantm/auto-update/hunt
hunt: 2.3.0 -> 2.4.0
2024-05-22 21:03:30 -04:00
github-actions[bot]
e86d339640
Merge staging-next into staging 2024-05-23 00:02:52 +00:00
Martin Weinelt
97d379347b
esphome: 2024.4.2 -> 2024.5.2
https://github.com/esphome/esphome/releases/tag/2024.5.0
https://github.com/esphome/esphome/releases/tag/2024.5.1
https://github.com/esphome/esphome/releases/tag/2024.5.2
2024-05-23 01:07:19 +02:00
nicoo
279542437e
coreboot-{toolchain, utils}: 3
Coreboot 24.05 updates
2024-05-22 22:30:29 +00:00
R. Ryantm
77d685bc82 ttyplot: 1.6.4 -> 1.6.5 2024-05-22 22:06:14 +00:00
Robert Scott
5a414f74b0
Merge pull request #313739 from pluiedev/zhf-24.05/mods
mods: unbreak, modernize
2024-05-22 22:55:04 +01:00
Audrey Dutcher
52fd0f93df coreutils: enable single-binary build on FreeBSD 2024-05-22 14:25:27 -07:00
John Ericson
a0564731be
Merge pull request #311771 from rhelmot/freebsd-minimal3/findutils
findutils: Fix build on native FreeBSD
2024-05-22 15:39:34 -04:00
R. Ryantm
4474e40f3b svtplay-dl: 4.73 -> 4.79 2024-05-22 19:35:03 +00:00
Leah Amelia Chen
caf25eb523 mods: unbreak, modernize
There were two tests that required internet access, and so we just skip
them. Also moved to `pkgs/by-name` and reformatted with
`nixfmt-rfc-style`.
2024-05-22 19:14:22 +02:00
Marcel
c95f967105
mrtg: add ipv6-required perl packages 2024-05-22 18:23:44 +02:00
R. Ryantm
4ee52f7c86 hunt: 2.3.0 -> 2.4.0 2024-05-22 16:13:13 +00:00
Martin Weinelt
42493b30b7
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
-	pkgs/development/python-modules/curio/default.nix
-	pkgs/development/python-modules/pytest-httpbin/default.nix
-	pkgs/development/python-modules/xtensor-python/default.nix
2024-05-22 18:08:30 +02:00
github-actions[bot]
985c7f2729
Merge staging-next into staging 2024-05-22 12:01:52 +00:00
Isa
330ef94574 graylog-5_1: 5.1.11 -> 5.1.13 2024-05-22 13:22:55 +02:00
Matthias Beyer
ac8289ada5
Merge pull request #313556 from r-ryantm/auto-update/rpm-ostree
rpm-ostree: 2024.5 -> 2024.6
2024-05-22 10:11:37 +02:00
Uri Baghin
80233a8758
Merge pull request #313415 from r-ryantm/auto-update/opentelemetry-collector
opentelemetry-collector: 0.100.0 -> 0.101.0
2024-05-22 14:57:10 +08:00
R. Ryantm
e3ab272778 rpm-ostree: 2024.5 -> 2024.6 2024-05-22 02:56:43 +00:00
R. Ryantm
a74fffe58b opentelemetry-collector-contrib: 0.100.0 -> 0.101.0 2024-05-22 02:09:42 +00:00
github-actions[bot]
949e5b9d89
Merge staging-next into staging 2024-05-22 00:02:35 +00:00
Peder Bergebakken Sundt
a33aa5d368
Merge pull request #312304 from vinnymeller/add-update-script-to-twm
twm: 0.9.0 -> 0.9.1, add updateScript
2024-05-22 01:13:08 +02:00
Nick Cao
3dc89a6592
Merge pull request #313429 from r-ryantm/auto-update/upterm
upterm: 0.13.5 -> 0.14.3
2024-05-21 19:06:59 -04:00
Nick Cao
6b9c4bae33
Merge pull request #313177 from ereslibre/bump-wasm-tools
wasm-tools: 1.207.0 -> 1.208.1
2024-05-21 18:06:13 -04:00
github-actions[bot]
32de4bcbf0
Merge staging-next into staging 2024-05-21 18:01:28 +00:00
Peder Bergebakken Sundt
f15b763c61
Merge pull request #312394 from wentasah/gtkterm-1.3.1
gtkterm: 1.3.0 -> 1.3.1
2024-05-21 18:11:15 +02:00
R. Ryantm
1a2f3e286e upterm: 0.13.5 -> 0.14.3 2024-05-21 16:01:08 +00:00
Peder Bergebakken Sundt
1eb4105497
Merge pull request #311379 from bddvlpr/vrc-get/1.8.1
vrc-get: 1.8.0 -> 1.8.1
2024-05-21 17:43:36 +02:00
R. Ryantm
5f41c75fdd opentelemetry-collector: 0.100.0 -> 0.101.0 2024-05-21 14:36:58 +00:00
R. Ryantm
e8bf617348 fluent-bit: 3.0.3 -> 3.0.4 2024-05-21 13:18:36 +00:00
R. Ryantm
fd9684a507 vtm: 0.9.81 -> 0.9.82 2024-05-21 02:58:14 +00:00
github-actions[bot]
af402f7b70
Merge staging-next into staging 2024-05-21 00:02:42 +00:00
Rafael Fernández López
b061be6a61 wasm-tools: 1.207.0 -> 1.208.1 2024-05-20 21:28:42 +02:00
Audrey Dutcher
4cb9ec8a1e coreutils: make autoreconfHook dependency conditional 2024-05-20 19:18:29 +02:00
Audrey Dutcher
d0e553dafe coreutils: disable single-binary on native FreeBSD
Upstream bug report:
https://lists.gnu.org/archive/html/bug-coreutils/2024-05/msg00033.html
2024-05-20 19:18:29 +02:00
R. Ryantm
4e02e079bf psw: 0.2.0 -> 0.2.1 2024-05-20 14:06:46 +00:00
R. Ryantm
5f56e7bcf7 grass-sass: 0.13.2 -> 0.13.3 2024-05-20 03:11:19 +00:00
R. Ryantm
e415bc4b94 godu: 1.4.1 -> 1.5.2 2024-05-20 01:08:34 +00:00
github-actions[bot]
68b5bb0cf5
Merge staging-next into staging 2024-05-20 00:02:41 +00:00
Weijia Wang
50397f05ec
Merge pull request #312830 from r-ryantm/auto-update/pandoc-include
pandoc-include: 1.3.1 -> 1.3.2
2024-05-19 22:40:46 +02:00
abysssol
82193f4df5
Merge pull request #312608 from abysssol/ollama-update-0.1.38
ollama: 0.1.31 -> 0.1.38
2024-05-19 20:33:30 +00:00
Yt
158a547d88
Merge pull request #312924 from joshbainbridge/update-mods
mods: 1.2.2 -> 1.3.1
2024-05-19 18:26:17 +00:00
github-actions[bot]
6ace3c7cf5
Merge staging-next into staging 2024-05-19 16:02:23 +00:00