Commit Graph

2446 Commits

Author SHA1 Message Date
Joachim Breitner
ea4d2f7e61
ploticus: Fix PREFAB settings, add test
Previously, I would get

    pl: error 22: Cannot open specified scriptfile (@out@/share/ploticus/prefabs/chron.pl)

and it seems the PREFAB setting last changed in
fbc4b41e69
didn't quite work.

So this adds a test to demonstrate the issue, and fixes it by substituting the placeholder.
2023-02-18 21:34:52 +01:00
github-actions[bot]
c4fe2133de
Merge staging-next into staging 2023-02-15 06:01:44 +00:00
Sandro
c9fbcf0416
Merge pull request #215074 from dotlambda/vips-8.14.1 2023-02-15 01:09:07 +01:00
Alyssa Ross
200610b849
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/libraries/gtest/default.nix
	pkgs/development/libraries/hidapi/default.nix
2023-02-14 09:53:03 +00:00
Sebastian Neubauer
25f34241cd vulkan-cts: 1.3.4.1 -> 1.3.5.0 2023-02-13 20:56:08 +01:00
github-actions[bot]
29c2637dda
Merge staging-next into staging 2023-02-13 12:02:05 +00:00
github-actions[bot]
fd8daee7c2
Merge master into staging-next 2023-02-13 12:01:30 +00:00
Kerstin
4b6792fb6f
Merge pull request #216105 from r-ryantm/auto-update/wgpu-utils
wgpu-utils: 0.15.0 -> 0.15.1
2023-02-13 12:48:55 +01:00
github-actions[bot]
29cdca7736
Merge staging-next into staging 2023-02-13 06:02:02 +00:00
R. Ryantm
d9cf62f012 wgpu-utils: 0.15.0 -> 0.15.1 2023-02-13 02:25:37 +00:00
Alyssa Ross
c6c7493c3b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/pyarrow/default.nix
2023-02-13 00:15:28 +00:00
Robert Scott
ba40f8ea1c
Merge pull request #210409 from r-ryantm/auto-update/leptonica
leptonica: 1.82.0 -> 1.83.0
2023-02-12 19:04:25 +00:00
R. Ryantm
c70c35601a graphviz: 7.0.2 -> 7.1.0 2023-02-12 08:16:58 +00:00
github-actions[bot]
0417b0e54f
Merge staging-next into staging 2023-02-10 00:03:00 +00:00
github-actions[bot]
71c0c6d984
Merge master into staging-next 2023-02-10 00:02:27 +00:00
Robert Schütz
ac17c2b4b3 pgf_graphics: 6.14.12 -> 7.21.7 2023-02-09 09:17:26 -08:00
github-actions[bot]
bd14a95898
Merge staging-next into staging 2023-02-09 06:01:47 +00:00
github-actions[bot]
73fe6149d4
Merge master into staging-next 2023-02-09 06:01:10 +00:00
R. Ryantm
9599df6f37 resvg: 0.28.0 -> 0.29.0 2023-02-08 19:02:00 +00:00
Robert Schütz
b872c2ad6a vips: don't build gtk_doc on Darwin
Otherwise the build hangs.
2023-02-06 23:23:33 -08:00
Robert Schütz
152204b08c vips: 8.13.3 -> 8.14.1
Diff: https://github.com/libvips/libvips/compare/v8.13.3...v8.14.1

Changelog: https://github.com/libvips/libvips/blob/v8.14.1/ChangeLog
2023-02-06 23:10:44 -08:00
Jan Tojnar
3fb9672b71 vips: Switch to Meson
Meson is the preferred build system since 8.13.
2023-02-06 23:08:22 -08:00
github-actions[bot]
7f765c49f6
Merge staging-next into staging 2023-02-05 18:01:54 +00:00
Vladimír Čunát
cfc056287c
treewide: another round of gcc12 fixups 2023-02-05 18:34:47 +01:00
github-actions[bot]
7c824bb1b1
Merge staging-next into staging 2023-02-04 00:02:42 +00:00
Vladimír Čunát
d0d8c15bad
Merge branch 'master' into staging-next
pkgs/development/web/nodejs/v18.nix conflict:
  the fetched patch was already included in this release.
2023-02-03 23:02:19 +01:00
Nick Cao
7c72674285
Merge pull request #213631 from PedroHLC/vulkan-1.3.239.0
vulkan-sdk: 1.3.236.0 -> 1.3.239.0
2023-02-03 21:23:36 +08:00
Weijia Wang
882bd79418
Merge pull request #214116 from r-ryantm/auto-update/gfxreconstruct
gfxreconstruct: 0.9.17 -> 0.9.18
2023-02-03 14:10:25 +01:00
PedroHLC ☭
44a1fb1b9c
spirv-cross: 1.3.236.0 -> 1.3.239.0 2023-02-03 09:23:30 -03:00
PedroHLC ☭
7a5a9bbf9e
vulkan-tools-lunarg: 1.3.236.0 -> 1.3.239.0 2023-02-03 09:23:30 -03:00
PedroHLC ☭
c171fe67c3
vulkan-tools: 1.3.236.0 -> 1.3.239.0 2023-02-03 09:23:30 -03:00
PedroHLC ☭
51b8f73d57
vulkan-extension-layer: 1.3.236.0 -> 1.3.239.0 2023-02-03 09:23:30 -03:00
github-actions[bot]
61687cbd42
Merge master into staging-next 2023-02-03 00:02:29 +00:00
Weijia Wang
c8a3dfe5fb
Merge pull request #214160 from r-ryantm/auto-update/agi
agi: 3.2.1 -> 3.3.0
2023-02-02 22:49:48 +01:00
Weijia Wang
6498bee324
Merge pull request #214244 from r-ryantm/auto-update/astc-encoder
astc-encoder: 4.3.0 -> 4.3.1
2023-02-02 21:56:02 +01:00
R. Ryantm
b5200b8b70 astc-encoder: 4.3.0 -> 4.3.1 2023-02-02 20:05:40 +00:00
K900
059556ab3e gmic-qt-krita: drop
Doesn't actually build, was removed upstream.
2023-02-02 20:41:16 +03:00
R. Ryantm
28de6f20b4 agi: 3.2.1 -> 3.3.0 2023-02-02 10:48:22 +00:00
github-actions[bot]
ffbbb55ee2
Merge master into staging-next 2023-02-02 06:01:28 +00:00
R. Ryantm
9e12e474ef gfxreconstruct: 0.9.17 -> 0.9.18 2023-02-02 05:36:52 +00:00
Tomo
55df49ae73 sanjuuni: add changelog 2023-02-02 04:10:57 +01:00
Tomo
66a4cc6a23 sanjuuni: 0.2 -> 0.3
Changelog: https://github.com/MCJack123/sanjuuni/releases/tag/0.3
2023-02-02 04:10:57 +01:00
Vladimír Čunát
9e2af38827
Merge branch 'staging' into staging-next 2023-02-01 17:05:25 +01:00
R. Ryantm
d405afb221 glmark2: 2021.12 -> 2023.01 2023-01-31 22:26:39 +00:00
github-actions[bot]
56b467d467
Merge staging-next into staging 2023-01-30 18:02:05 +00:00
R. Ryantm
1ec241e150 wgpu-utils: 0.14.1 -> 0.15.0 2023-01-30 14:50:45 +01:00
Francesco Gazzetta
6ad639f20a
Merge pull request #211550 from fgaz/pikchr/tcl
pikchr: enable tcl support (and related stuff)
2023-01-30 10:36:37 +00:00
github-actions[bot]
e043f89f93
Merge staging-next into staging 2023-01-29 12:01:54 +00:00
Mario Rodas
61b46e0082
Merge pull request #208256 from r-ryantm/auto-update/netpbm
netpbm: 11.0.2 -> 11.1.0
2023-01-29 06:57:39 -05:00
github-actions[bot]
fd893034cb
Merge staging-next into staging 2023-01-29 06:01:55 +00:00
R. Ryantm
2d260cac49 gifski: 1.9.0 -> 1.10.0 2023-01-29 02:15:38 +00:00
Robert Scott
24afb0125d jbig2enc: move to pkgs/development/libraries 2023-01-28 16:20:52 +00:00
Robert Scott
b573c6a116 jbig2enc: 0.28 -> 0.29
add patch for building with leptonica 1.83
2023-01-28 16:20:42 +00:00
github-actions[bot]
03e9b9c92c
Merge staging-next into staging 2023-01-26 18:02:05 +00:00
Francesco Gazzetta
7f0ebaecd1 pikchr: enable tcl support 2023-01-26 14:47:31 +01:00
PedroHLC ☭
41e1a672c6
vulkan-caps-viewer: add changelog and fmt 2023-01-26 07:07:06 -03:00
PedroHLC ☭
7d2325a774
vulkan-caps-viewer: 3.27 -> 3.28 2023-01-26 07:02:15 -03:00
github-actions[bot]
5c74f3f8e5
Merge staging-next into staging 2023-01-26 06:02:08 +00:00
Weijia Wang
d036804335
Merge pull request #212345 from reckenrode/moltenvk-1.2.1
moltenvk: 1.2.0 -> 1.2.1
2023-01-26 01:28:58 +01:00
github-actions[bot]
0a0068baab
Merge staging-next into staging 2023-01-25 18:01:57 +00:00
Anderson Torres
e9c4598ccb wallutils: 5.12.4 -> 5.12.5
Also, add myself as maintainer.
2023-01-25 10:21:24 -03:00
github-actions[bot]
588d9ab6e2
Merge staging-next into staging 2023-01-25 12:02:09 +00:00
Ninjatrappeur
973699b349
Merge pull request #211600 from LibreCybernetics/update-gmic
gmic: 3.1.6 → 3.2.0
2023-01-25 09:13:26 +01:00
github-actions[bot]
a9a713c9ac
Merge staging-next into staging 2023-01-24 18:01:31 +00:00
Shawn8901
133fa5f867 treewide: remove global with lib; in pkgs/tools 2023-01-24 17:41:44 +01:00
Randy Eckenrode
7ae669fb78
spirv-cross: MoltenVK-1.1.5 -> 1.3.236.0 2023-01-23 19:44:18 -05:00
John Ericson
8240bc77e8
Merge pull request #212275 from alyssais/libdl
treewide: remove -ldl linker flags
2023-01-23 16:28:21 -05:00
Alyssa Ross
12d2821bf5
treewide: remove -ldl linker flags
With all libcs I'm aware of, libdl is now either empty (Glibc, musl,
uclibc, illumos), a symlink to libc or equivalent (Apple), or does not
exist (FreeBSD, NetBSD).  So explicitly linking libdl now does nothing
for the former platforms, and breaks the build for the latter
platforms.

With this patch I've removed -ldl from all overridden linker flags for
all free packages in Nixpkgs.  Everything still seems to build.
2023-01-23 15:34:53 +00:00
Weijia Wang
0b0195ff82
Merge pull request #204402 from r-ryantm/auto-update/imgurbash2
imgurbash2: 3.2 -> 3.3
2023-01-23 07:41:37 +01:00
Weijia Wang
68faeff7fa
Merge pull request #195036 from r-ryantm/auto-update/agi
agi: 3.0.1 -> 3.2.1
2023-01-22 22:55:20 +01:00
Sandro
206c845cef
Merge pull request #202854 from Flakebi/vulkan-cts 2023-01-22 22:21:45 +01:00
figsoda
7740e5a6bd
Merge pull request #211975 from figsoda/sic
sic-image-cli: 0.21.0 -> 0.21.1
2023-01-22 14:47:54 -05:00
Mario Rodas
b9b0231db9
Merge pull request #212045 from r-ryantm/auto-update/gifski
gifski: 1.8.0 -> 1.9.0
2023-01-22 12:08:03 -05:00
Weijia Wang
f7cf1d58bf
Merge pull request #192937 from r-ryantm/auto-update/gromit-mpx
gromit-mpx: 1.4.2 -> 1.4.3
2023-01-22 16:01:03 +01:00
Jonas Heinrich
72fcb85b47
Merge pull request #211919 from r-ryantm/auto-update/astc-encoder
astc-encoder: 4.2.0 -> 4.3.0
2023-01-22 07:57:33 +01:00
R. Ryantm
5b187c3252 gifski: 1.8.0 -> 1.9.0 2023-01-22 04:43:29 +00:00
Weijia Wang
218c4c526e
Merge pull request #212002 from mothsART/feature/replace_http_by_https
treewide: replace http by https when https is a permanent redirection
2023-01-22 03:26:02 +01:00
Nick Cao
c89cb35211
Merge pull request #211710 from r-ryantm/auto-update/gfxreconstruct
gfxreconstruct: 0.9.16.1 -> 0.9.17
2023-01-22 09:59:28 +08:00
Ferry Jérémie
65d7e87fdb treewide: replace http by https when https is a permanent redirection 2023-01-22 02:46:49 +01:00
figsoda
9e2c8d4d8e sic-image-cli: 0.21.0 -> 0.21.1
Diff: https://github.com/foresterre/sic/compare/v0.21.0...v0.21.1

Changelog: https://github.com/foresterre/sic/blob/v0.21.1/CHANGELOG.md
2023-01-21 14:16:06 -05:00
R. Ryantm
02197a1ae3 astc-encoder: 4.2.0 -> 4.3.0 2023-01-21 12:20:29 +00:00
figsoda
a1e0ac49e9
Merge pull request #211613 from figsoda/sic
sic-image-cli: 0.20.1 -> 0.21.0
2023-01-20 19:01:52 -05:00
Fabián Heredia Montiel
5fba98444b gmic-qt: 3.1.6 → 3.2.0 2023-01-20 09:38:49 -06:00
Sandro
6e44c2f0d7
Merge pull request #211555 from fgaz/pikchr/2022-12-07 2023-01-20 14:13:21 +01:00
R. Ryantm
a7ed7f1fed gfxreconstruct: 0.9.16.1 -> 0.9.17 2023-01-20 04:43:05 +00:00
figsoda
7c4a55dab9 sic-image-cli: 0.20.1 -> 0.21.0
Diff: https://github.com/foresterre/sic/compare/v0.20.1...v0.21.0

Changelog: https://github.com/foresterre/sic/blob/v0.21.0/CHANGELOG.md
2023-01-19 12:06:40 -05:00
Fabián Heredia Montiel
2dd0b25e16 gmic: 3.1.6 → 3.2.0 2023-01-19 10:03:37 -06:00
Francesco Gazzetta
4dcc68db48 pikchr: unstable-2022-06-20 -> unstable-2022-12-07
use fetchfossil
2023-01-19 11:40:31 +01:00
figsoda
d25a152de8 texture-synthesis: fix build on aarch64-darwin 2023-01-18 18:15:47 -05:00
figsoda
122499234b shotgun: fix build, add figsoda as a maintainer 2023-01-17 12:06:52 -05:00
André Silva
d664fb98b6
gmic-qt: fix build error on filter translation scripts 2023-01-15 15:32:45 +00:00
Martin Weinelt
2895576165 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-11 15:37:38 +01:00
Ellie Hermaszewska
a9a2798ac6
Merge pull request #207128 from Flakebi/dxc
directx-shader-compiler: 1.7.2207 -> 1.7.2212
2023-01-11 14:26:00 +08:00
github-actions[bot]
33aa224777
Merge master into staging-next 2023-01-09 18:01:24 +00:00
R. Ryantm
0b38e52c56 gfxreconstruct: 0.9.15 -> 0.9.16.1 2023-01-09 08:11:23 -06:00
github-actions[bot]
0789ea69b1
Merge master into staging-next 2023-01-07 00:02:25 +00:00
Thomas Gerbet
17e0a37381
Merge pull request #209104 from risicle/ris-openimageio-1-to-2
openimageio: default to openimageio2, rename 1.x to openimageio_1
2023-01-06 23:52:03 +01:00
Weijia Wang
5947344587 libyafaray: remove boost from dependencies 2023-01-06 20:39:20 +01:00
Robert Scott
a1deb65b09 openimageio: default to openimageio2, rename 1.x to openimageio_1
keep a couple of packages "using" openimageio_1 - both are broken
anyway, but as such we have no evidence that they work with 2.x.
all are liable to get removed in the near future anyway.
2023-01-05 20:26:49 +00:00
github-actions[bot]
03e830eb69
Merge staging-next into staging 2023-01-03 00:02:53 +00:00
Artturi
e4c38ad4e6
Merge pull request #208770 from wegank/barcode-darwin 2023-01-02 20:18:46 +02:00
github-actions[bot]
d8b859a780
Merge staging-next into staging 2023-01-02 18:01:43 +00:00
Anderson Torres
131aff3f5e
Merge pull request #208462 from tomodachi94/sanjuuni
sanjuuni: init at 0.2
2023-01-02 14:53:18 -03:00
Tomo
10b497b1ea sanjuuni: init at 0.2 2023-01-02 08:57:19 -08:00
Weijia Wang
667ab43f31 barcode: add darwin support 2023-01-02 16:47:33 +01:00
Jan Tojnar
5810109b42 Merge branch 'staging-next' into staging
- readline6 attribute removed from all-packages.nix in d879125d61
- readline attribute was bumped to readline82 in 50adabdd60
2023-01-02 03:04:32 +01:00
R. Ryantm
bd000ffb9d svg2pdf: 0.4.0 -> 0.4.1 2023-01-01 14:14:31 +00:00
Vladimír Čunát
4237877304
Merge #205327: mesa-demos: fix build on Darwin
...into staging
2022-12-31 10:55:22 +01:00
R. Ryantm
199b12ad3d netpbm: 11.0.2 -> 11.1.0 2022-12-31 01:19:18 +00:00
Sergei Trofimovich
092d57c076 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
    pkgs/development/tools/language-servers/ansible-language-server/default.nix
2022-12-28 09:35:37 +00:00
figsoda
a211d94291 treewide: remove attrPath from nix-update-script calls
after https://github.com/Mic92/nix-update/pull/120 and https://github.com/NixOS/nixpkgs/pull/207703, `attrPath` can now be omitted when using `nix-update-script`
2022-12-26 12:39:21 -05:00
Jan Tojnar
72c37eddec Merge branch 'staging-next' into staging 2022-12-25 01:30:47 +01:00
maralorn
bb7f53d185
Merge pull request #202022 from NixOS/haskell-updates
haskellPackages: stackage LTS 19 -> 20; GHC 9.0.2 -> 9.2.4
2022-12-24 19:27:16 +01:00
kilianar
e6cc2d4aa7 oxipng: 7.0.0 -> 8.0.0
https://github.com/shssoichiro/oxipng/releases/tag/v8.0.0
2022-12-24 17:09:34 +01:00
Dennis Gosnell
fb337aedd8
haskellPackages.ldgallery-compiler: mark broken with ghc-9.2 2022-12-24 11:58:07 +09:00
Sebastian Neubauer
4e3db444a5 directx-shader-compiler: 1.7.2207 -> 1.7.2212 2022-12-20 23:36:37 +01:00
Sebastian Neubauer
0b7ec912c9 vulkan-cts: init at 1.3.4.1 2022-12-20 14:06:26 +01:00
Anderson Torres
adc00941d3
Merge pull request #202858 from Flakebi/gfxreconstruct
gfxreconstruct: init at 0.9.15
2022-12-19 18:50:08 -03:00
Sebastian Neubauer
265690e335 gfxreconstruct: init at 0.9.15 2022-12-19 20:42:40 +01:00
PedroHLC ☭
d9f6f43d2b
vulkan-tools-lunarg: 1.3.231.0 -> 1.3.236.0 2022-12-16 18:52:49 -03:00
PedroHLC ☭
eaaafb7866
vulkan-extension-layer: 1.3.231.0 -> 1.3.236.0 2022-12-16 18:52:49 -03:00
PedroHLC ☭
4beaa32eae
vulkan-tools: 1.3.231.0 -> 1.3.236.0 2022-12-16 18:52:49 -03:00
Thiago Kenji Okada
cd5e437409
Merge pull request #206364 from KiruyaMomochi/vulkan-tools-lunarg-cmake
vulkan-tools-lunarg: fix CMake include path
2022-12-16 14:36:17 +00:00
百地 希留耶
af2f4acd8f
vulkan-tools-lunarg: fix CMake include path 2022-12-16 21:34:01 +08:00
AndersonTorres
e6bac9563a steghide: init at 0.5.1.1 2022-12-14 20:09:56 -03:00
PedroHLC ☭
1c3d404e30
vkbasalt: 0.3.2.6 -> 0.3.2.8 2022-12-14 09:12:26 -03:00
figsoda
80160e530d
Merge pull request #205845 from figsoda/sic
sic-image-cli: 0.20.0 -> 0.20.1
2022-12-13 17:39:59 -05:00
Rick van Schijndel
9833d56c24 treewide: mark packages broken that never built on PLATFORM
Done with the help of https://github.com/Mindavi/nixpkgs-mark-broken
Tool is still WIP but this is one of the first results.

I manually audited the results and removed some results that were not valid.

Note that some of these packages maybe should have more constrained platforms set
instead of broken set, but I think not being perfectly correct is better than
just keep trying to build all these things and never succeeding.

Some observations:

- Some darwin builds require XCode tools
- aarch64-linux builds sometimes suffer from using gcc9
  - gcc9 is getting older and misses some new libraries/features
- Sometimes tools try to do system detection or expect some explicit settings for
  platforms that are not x86_64-linux
2022-12-13 21:40:12 +01:00
figsoda
32e71f7f2a sic-image-cli: 0.20.0 -> 0.20.1
Diff: https://github.com/foresterre/sic/compare/v0.20.0...v0.20.1

Changelog: https://github.com/foresterre/sic/blob/v0.20.1/CHANGELOG.md
2022-12-12 16:59:49 -05:00
R. Ryantm
a5717f4f9a adriconf: 2.5.0 -> 2.5.1 2022-12-10 22:21:23 +08:00
Alyssa Ross
e79dbb918a
mesa-demos: fix build on Darwin 2022-12-09 17:31:28 +00:00
Martino Fontana
d6fe5fdad2 vkbasalt-cli: init at 3.1.1 2022-12-08 19:36:52 +01:00
Martino Fontana
f2521e084d vkbasalt: install default configuration file
Needed for programs like vkbasalt-cli.
For vkbasalt itself, this configuration has last priority.
2022-12-08 19:36:51 +01:00
Martino Fontana
c0da4fb02b vkBasalt: rename to vkbasalt
https://nixos.org/manual/nixpkgs/stable/#sec-package-naming
2022-12-08 19:36:51 +01:00
kilianar
2b760397bb oxipng: 6.0.1 -> 7.0.0
https://github.com/shssoichiro/oxipng/releases/tag/v7.0.0
2022-12-07 21:42:31 +01:00
github-actions[bot]
a440592932
Merge master into staging-next 2022-12-06 06:01:16 +00:00
Weijia Wang
4619e1c05b zbar: fix build on darwin 2022-12-05 23:27:51 +01:00
github-actions[bot]
d267d26578
Merge master into staging-next 2022-12-05 06:01:36 +00:00
Pierre Bourdon
f16be35641
Merge pull request #204564 from SuperSandro2000/zbar-nox
nixos/no-x-libs: add zbar
2022-12-05 02:55:25 +01:00
Sandro Jäckel
4312ffd16a
zbar: add option to disable Xorg 2022-12-05 02:07:00 +01:00
Sandro Jäckel
e22198417d
zbar: fix enableVideo not fully removing gtk/qt 2022-12-05 02:07:00 +01:00
R. Ryantm
ec2c253ddd resvg: 0.27.0 -> 0.28.0 2022-12-04 23:21:01 +00:00
Martin Weinelt
fe8eef1ae4 Merge remote-tracking branch 'origin/master' into staging-next 2022-12-04 22:06:42 +01:00
Anderson Torres
b6955675d4
Merge pull request #204314 from muscaln/vkmark-init
vkmark: init at unstable-2022-09-09
2022-12-04 11:21:03 -03:00
Felix Bühler
a2d2f70b82
Merge pull request #201170 from r-ryantm/auto-update/findimagedupes
findimagedupes: 2.19.1 -> 2.20.1
2022-12-04 11:09:46 +01:00
R. Ryantm
3587d6881d imgurbash2: 3.2 -> 3.3 2022-12-04 05:15:54 +00:00
github-actions[bot]
e1399a2156
Merge master into staging-next 2022-12-03 18:01:02 +00:00
Mustafa Çalışkan
b3752fe3bb
vkmark: init at unstable-2022-09-09 2022-12-03 19:31:28 +03:00
Robert Scott
259c543e7f lepton: add CVE-2022-4104 to knownVulnerabilities 2022-12-02 22:03:31 +00:00
github-actions[bot]
541466e966
Merge master into staging-next 2022-11-30 00:02:24 +00:00