b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
489754 commits 2 branches 0 tags 3.3 GiB
Commit graph

3125 commits

Author SHA1 Message Date
7c6f434c 37ef1a3e46
Merge pull request #221192 from doronbehar/pkg/libreoffice 
libreoffice-fresh: 7.4.2.3 -> 7.5.2.1
 2023-04-03 13:57:21 +00:00
rewine a476a6dc8d
wpsoffice: mark meta.sourceProvenance 2023-04-03 16:52:32 +08:00
kilianar 6264caf76f fava: 1.24 -> 1.24.3 
https://github.com/beancount/fava/releases/tag/v1.24.3
 2023-04-03 15:06:29 +08:00
Doron Behar 6431dfbe0f libreoffice-fresh: 7.5.2.1 - > 7.5.2.2 2023-04-03 06:55:17 +03:00
Doron Behar 699d543e9e libreoffice.unwrapped: Remove $dev output 
It makes the build fail, and not package in Nixpkgs seems to be using
this.
 2023-04-02 18:17:02 +03:00
Doron Behar e0b64b3a82 libreoffice: Remove failing test 2023-04-02 18:15:53 +03:00
Doron Behar c613b68e4c libreoffice-still: 7.3.7.2 -> 7.4.6.2 2023-04-02 18:15:53 +03:00
Doron Behar 272f3d3914 libreoffice-fresh: 7.4.2.3 -> 7.5.2.1 2023-04-02 18:15:53 +03:00
Doron Behar 8218e8b457 libreoffice: generate-*-srcs.py Remove export prefix 
Needed for both fresh and still variants upcoming updates, in order to
parse the download.lst file correctly.
 2023-04-02 18:15:52 +03:00
kilianar 889acff738 portfolio: 0.61.4 -> 0.62.0 
https://github.com/buchen/portfolio/releases/tag/0.62.0
 2023-04-02 12:16:29 +02:00
DarkOnion0 35705ed7cb
appflowy: 0.1.1 -> 0.1.2 2023-04-02 10:28:45 +02:00
Sandro 3b513604f0
Merge pull request #223463 from zendo/upd/iotas 2023-04-02 01:05:35 +02:00
Sandro c454f04652
Merge pull request #214118 from MGlolenstine/beebeep 2023-04-01 23:17:36 +02:00
MGlolenstine d1380c07b1 beebeep: init at 5.8.6 2023-04-01 09:14:05 +02:00
kilianar ef518da0c3 zotero: 6.0.22 -> 6.0.23 
https://github.com/zotero/zotero/releases/tag/6.0.23
 2023-03-30 23:33:51 +02:00
Mario Rodas b427649abd ledger: 3.3.1 -> 3.3.2 
https://github.com/ledger/ledger/releases/tag/v3.3.2
 2023-03-30 04:20:00 +00:00
zendo a426ae8eea iotas: 0.1.9 -> 0.1.11 2023-03-28 08:49:35 +08:00
guangtao 59cf5102f0 onlyoffice-bin: fix icon location 2023-03-26 19:18:17 -07:00
Doron Behar d26b239493 libreoffice/wrapper: Don't --chdir 
Use lndir and replace it's relevant symlinks with wrappers.
 2023-03-26 16:25:46 +03:00
Romanos Skiadas 9c724505fa gnucash: Apply patches that compilation w/ newer glib/gcc 2023-03-25 09:50:30 -03:00
Weijia Wang 0aa34df4bc
Merge pull request #221990 from r-ryantm/auto-update/treesheets 
treesheets: unstable-2023-03-07 -> unstable-2023-03-18
 2023-03-24 19:15:31 +02:00
DarkOnion0 dd34d1fd52
appflowy: 0.1.0 -> 0.1.1 2023-03-22 15:02:27 +01:00
Weijia Wang 0dc63a4021
Merge pull request #221908 from wegank/timeline-wx 
timeline: fix build, migrate to wxPython_4_2
 2023-03-19 20:00:17 +02:00
Guillaume Girol ac77663c35
Merge pull request #221163 from e1mo/paperwork-fix-soffice 
paperwork: Patch broken libreoffice path
 2023-03-19 11:30:41 +00:00
R. Ryantm 4ed9586edf treesheets: unstable-2023-03-07 -> unstable-2023-03-18 2023-03-19 09:51:20 +00:00
Rhys Davies 5e30b82dab
micropad: 4.2.0 -> 4.2.1 2023-03-19 13:33:07 +13:00
Weijia Wang 4d7acf6184 timeline: migrate to wxPython_4_2 2023-03-19 00:18:42 +02:00
Moritz 'e1mo' Fromm bba33d60fc
paperwork: Patch broken libreoffice path 
Due to the changes in #219166, no suitable path to libreoffice was
found
 2023-03-18 11:32:17 +01:00
Weijia Wang 9943682b02
Merge pull request #221585 from r-ryantm/auto-update/portfolio 
portfolio: 0.61.3 -> 0.61.4
 2023-03-17 22:09:05 +02:00
Weijia Wang 499cf2dffa
Merge pull request #209454 from r-ryantm/auto-update/timeular 
timeular: 4.8.0 -> 5.7.8
 2023-03-17 17:24:42 +02:00
Weijia Wang be0f4240cc
Merge pull request #221664 from wegank/kitsas-bump 
kitsas: 3.2.1 -> 4.0.3
 2023-03-17 17:20:18 +02:00
Weijia Wang bbe6e6da9b kitsas: 3.2.1 -> 4.0.3 2023-03-17 16:23:56 +02:00
R. Ryantm 7b400e8d38 portfolio: 0.61.3 -> 0.61.4 2023-03-17 02:47:38 +00:00
Weijia Wang 64034f6572 beamerpresenter: unbreak on darwin 2023-03-16 21:29:14 +02:00
Nick Cao 971b301bfe
Merge pull request #221356 from eliandoran/feature/trilium_update 
trilium-{desktop,server}: 0.59.1 -> 0.59.2
 2023-03-16 09:54:41 +08:00
Weijia Wang 43ae2a7a1f
Merge pull request #221269 from r-ryantm/auto-update/treesheets 
treesheets: unstable-2023-03-05 -> unstable-2023-03-07
 2023-03-15 22:48:09 +02:00
Elian Doran 21b774ea0f trilium-{desktop,server}: 0.59.1 -> 0.59.2 2023-03-15 19:56:07 +02:00
Vladimír Čunát a86610144f
Merge #219444: staging-next 2023-03-04 2023-03-15 17:35:39 +01:00
R. Ryantm ca35626d2e treesheets: unstable-2023-03-05 -> unstable-2023-03-07 2023-03-15 05:53:42 +00:00
Moritz 'e1mo' Fromm 825a34ea3b
libreoffice: improve out/share looping in wrapper 
The copying/linking implemented in #220694 resulted in a higher
maintenance burden (need to manually add all new folders in $out/share).
The introduced loop will continue linking everything but the .desktop
files.
 2023-03-14 11:53:31 +01:00
Martin Weinelt 6b67186fe9
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
- pkgs/development/python-modules/crownstone-cloud/default.nix
- pkgs/development/python-modules/exrex/default.nix
- pkgs/development/python-modules/mkdocs-minify/default.nix
- pkgs/development/python-modules/myjwt/default.nix
- pkgs/development/tools/analysis/checkov/default.nix
 2023-03-14 08:14:26 +01:00
Weijia Wang 7f8ed0ced2
Merge pull request #220197 from r-ryantm/auto-update/super-productivity 
super-productivity: 7.12.2 -> 7.13.1
 2023-03-13 20:44:08 +02:00
Vladimír Čunát 1f7eeea8ee
Merge branch 'master' into staging-next 2023-03-12 17:21:00 +01:00
Moritz 'e1mo' Fromm 7d15a39781
libreoffice: Fix invalid desktop files 
Fixes a regression introduced in #219166 by again setting the correct
binary name in the Exec filed for the .desktop files.

Fixes #220693
 2023-03-12 16:08:26 +01:00
Weijia Wang 7f436901f1 libreoffice-still: fix build on aarch64-linux 2023-03-12 00:11:48 +02:00
github-actions[bot] 140a35879a
Merge master into staging-next 2023-03-11 12:01:11 +00:00
Nick Cao 3419078483
Merge pull request #220611 from chuangzhu/karlender 
karlender: 0.9.0 -> 0.9.1; unbreak
 2023-03-11 18:47:11 +08:00
Sandro f0728b4d0a
Merge pull request #205299 from linsui/jabref 2023-03-11 08:54:37 +01:00
Chuang Zhu a2a612b9d9 karlender: 0.9.0 -> 0.9.1; unbreak 2023-03-11 14:01:42 +08:00
Martin Weinelt da1a690688 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-10 01:50:42 +01:00
Sandro 663d1aab23
Merge pull request #220356 from GabrielDougherty/pdfmixtool-update-1.1.1 2023-03-09 23:11:13 +01:00
7c6f434c 28c1aac72e
Merge pull request #219166 from doronbehar/pkg/libreoffice 
libreoffice: wrapper rewrite
 2023-03-09 20:08:43 +00:00
Gabriel Dougherty 1a032cd8e7 pdfmixtool: 1.1 -> 1.1.1 2023-03-09 11:04:43 -05:00
R. Ryantm 1312c2db13 super-productivity: 7.12.2 -> 7.13.1 2023-03-08 19:17:18 +00:00
Martin Weinelt 3c902cd3e4 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-08 03:36:07 +01:00
Robert Schütz 8bde91a3ab kbibtex: 0.9.3.1 -> 0.9.3.2 
Changelog: https://invent.kde.org/office/kbibtex/-/raw/v0.9.3.2/ChangeLog
 2023-03-07 16:15:30 -08:00
github-actions[bot] d4187810f9
Merge master into staging-next 2023-03-08 00:02:34 +00:00
Ilan Joselevich ea53dd8d8e
Merge pull request #219553 from Zahrun/update/wpsoffice 
wpsoffice: 11.1.0.11664 -> 11.1.0.11691
 2023-03-07 22:06:47 +02:00
linsui 20b50b7a8f jabref: 5.7 -> 5.9 2023-03-07 19:27:03 +08:00
github-actions[bot] fa94414f70
Merge master into staging-next 2023-03-07 00:02:41 +00:00
Doron Behar 3966519d12 libreoffice: wrapper.nix rewrite 
Cleanup the unwrapped derivation's postInstall. Delete wrapper.sh, and
put it's contents in the wrapped derivation via configurable
`makeWrapper`. Also, always install dolphin templates in the unwrapped
derivation.
 2023-03-07 01:23:22 +02:00
Weijia Wang 7c072e43dc
Merge pull request #219738 from r-ryantm/auto-update/treesheets 
treesheets: unstable-2023-02-25 -> unstable-2023-03-05
 2023-03-06 22:30:16 +02:00
R. Ryantm 1511944c6f treesheets: unstable-2023-02-25 -> unstable-2023-03-05 2023-03-06 19:10:21 +00:00
R. Ryantm 58306ceb17 morgen: 2.6.6 -> 2.6.7 2023-03-05 05:14:17 +00:00
Aroun 7143599139 wpsoffice: 11.1.0.11664 -> 11.1.0.11691 2023-03-05 01:01:40 +05:30
Martin Weinelt d0286ecd24 Merge remote-tracking branch 'origin/staging' into staging-next 2023-03-04 01:42:06 +00:00
Weijia Wang 7db1b5f79a
Merge pull request #219132 from r-ryantm/auto-update/p3x-onenote 
p3x-onenote: 2022.10.117 -> 2023.4.117
 2023-03-03 22:29:48 +02:00
Weijia Wang 3fafd45061
Merge pull request #219265 from r-ryantm/auto-update/zk 
zk: 0.12.0 -> 0.13.0
 2023-03-03 21:57:01 +02:00
github-actions[bot] a74c8d03ea
Merge staging-next into staging 2023-03-03 18:01:44 +00:00
Mario Rodas 019b6d9e35 ledger: 3.3.0 -> 3.3.1 
https://github.com/ledger/ledger/releases/tag/v3.3.1
 2023-03-03 04:20:00 +00:00
Martin Weinelt 0580d85143 Merge remote-tracking branch 'origin/staging-next' into staging 2023-03-03 04:46:31 +01:00
R. Ryantm 20d78e9acf zk: 0.12.0 -> 0.13.0 2023-03-02 23:49:56 +00:00
Bobby Rong d492265f47
Merge pull request #219046 from eliandoran/dev/trilium_update 
trilium-{desktop,server}: 0.58.8 -> 0.59.1
 2023-03-02 22:38:53 +08:00
github-actions[bot] 6c8444842c
Merge staging-next into staging 2023-03-02 12:02:00 +00:00
R. Ryantm 50da886be4 timeular: 4.8.0 -> 5.7.8 2023-03-02 10:18:57 +00:00
Luke Granger-Brown b3c09089e4
Merge pull request #215750 from puppe/fix-paperless 
nixos/paperless: download NLTK data
 2023-03-02 10:00:46 +00:00
R. Ryantm 3c3433550c p3x-onenote: 2022.10.117 -> 2023.4.117 2023-03-02 09:08:38 +00:00
Elian Doran aa66a84dc6 trilium-{desktop,server}: 0.58.8 -> 0.59.1 2023-03-01 22:12:22 +02:00
github-actions[bot] e3dc1573ff
Merge staging-next into staging 2023-03-01 06:01:52 +00:00
Luke Granger-Brown d41b43a6f2
Merge pull request #218094 from kilianar/portfolio-0.61.3 
portfolio: 0.61.0 -> 0.61.3
 2023-03-01 01:09:29 +00:00
Martin Weinelt 3686005e6e Merge remote-tracking branch 'origin/staging-next' into staging 2023-02-28 21:17:51 +00:00
Luke Granger-Brown 723a8c9eac
Merge pull request #218661 from e1mo/paperless-ngx-1-13 
paperless-ngx: 1.12.2 -> 1.13.0
 2023-02-28 14:12:02 +00:00
Weijia Wang 74422033aa mmex: 1.6.1 -> 1.6.3 2023-02-28 12:52:35 +02:00
github-actions[bot] 51c18e4be1
Merge staging-next into staging 2023-02-28 06:01:38 +00:00
Nick Cao 0bee00c523
Merge pull request #218593 from kouyk/update/zotero 
zotero: 6.0.20 -> 6.0.22
 2023-02-28 11:01:12 +08:00
github-actions[bot] 387a5e220d
Merge staging-next into staging 2023-02-28 00:03:08 +00:00
Weijia Wang 5d732ac041
Merge pull request #218475 from r-ryantm/auto-update/treesheets 
treesheets: unstable-2023-02-14 -> unstable-2023-02-25
 2023-02-27 21:32:22 +02:00
Gabriel Fontes 2d0a4d55c7
onlyoffice-bin: add gcc lib to runtimeInputs 
OnlyOffice is currently not launching
(https://github.com/NixOS/nixpkgs/issues/218238), due to a missing
library (libstdc++.so.6).

I used nix-locate to see which outputs provide it, and
`gcc-unwrapped.lib` is the one that makes more sense to me, but I'm not
sure if there's a better way to supply that lib.
 2023-02-27 15:59:28 -03:00
Moritz 'e1mo' Fromm 3ee30ec402
paperless-ngx: 1.12.2 -> 1.13.0 2023-02-27 19:35:01 +01:00
github-actions[bot] 40707bbbb3
Merge staging-next into staging 2023-02-27 18:02:06 +00:00
Steven Kou 6bc9107566
zotero: 6.0.20 -> 6.0.22 
https://www.zotero.org/support/changelog#changes_in_6022_february_22_2023
 2023-02-27 18:45:00 +08:00
Alyssa Ross 2bfa93e01c
treewide: python{ => .pythonForBuild}.interpreter 
It won't be enough to fix cross in all cases, but it is in at least
one: pywayland.  I've only made the change in cases I'm confident it's
correct, as it would be wrong to change this when python.interpreter
is used in wrappers, and possibly when it's used for running tests.
 2023-02-26 20:26:17 +00:00
R. Ryantm 0ec0b1ad0d treesheets: unstable-2023-02-14 -> unstable-2023-02-25 2023-02-26 17:11:57 +00:00
Jan Tojnar 9bb986284f Merge branch 'staging-next' into staging 
# Conflicts:
#	pkgs/development/python-modules/mdp/default.nix
#	pkgs/top-level/python-aliases.nix
 2023-02-26 01:13:37 +01:00
github-actions[bot] 79a47b8646
Merge master into staging-next 2023-02-25 12:01:29 +00:00
davidak 6dcf81061a p3x-onenote: set supported platforms 
fixing build issue on not supported platforms
 2023-02-25 11:19:31 +01:00
github-actions[bot] 78fc07ec20
Merge master into staging-next 2023-02-25 00:02:47 +00:00
kilianar 20121a6117 portfolio: 0.61.0 -> 0.61.3 
https://github.com/buchen/portfolio/releases/tag/0.61.3
 2023-02-24 22:56:43 +01:00
Weijia Wang 806075be2b
Merge pull request #216711 from r-ryantm/auto-update/morgen 
morgen: 2.6.4 -> 2.6.6
 2023-02-24 20:08:35 +02:00
github-actions[bot] 55aecca307
Merge staging-next into staging 2023-02-24 00:02:56 +00:00
github-actions[bot] 7fb1a9172f
Merge master into staging-next 2023-02-24 00:02:22 +00:00
Sandro 2d415debb7
Merge pull request #216869 from DarkOnion0/appflowy 2023-02-24 00:28:33 +01:00
Martin Puppe 7be1ecb2dc paperless-ngx: update homepage URL 2023-02-23 21:34:49 +01:00
github-actions[bot] 3cdd771820
Merge staging-next into staging 2023-02-23 18:01:49 +00:00
Alyssa Ross 52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
 2023-02-23 13:51:34 +00:00
Artturin 3251013cc1 treewide: env.NIX_CFLAGS_COMPILE use toString on result of optionals 
env values must be strings
 2023-02-22 21:23:05 +02:00
Artturin f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset 
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
 2023-02-22 21:23:04 +02:00
Artturin 6f6cc4a22d treewide: use toString on list NIX_CFLAGS_COMPILE 
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
 2023-02-22 21:23:04 +02:00
github-actions[bot] 67e4f6dde0
Merge staging-next into staging 2023-02-22 12:02:05 +00:00
github-actions[bot] 0f910f5664
Merge master into staging-next 2023-02-22 12:01:31 +00:00
Bobby Rong bfc4fea848
Merge pull request #217114 from bobby285271/upd/goffice 
goffice: 0.10.54 → 0.10.55, gnumeric: 1.12.54 → 1.12.55
 2023-02-22 16:52:16 +08:00
github-actions[bot] f95edd46da
Merge staging-next into staging 2023-02-22 06:01:53 +00:00
github-actions[bot] 77f501b5df
Merge master into staging-next 2023-02-22 06:01:21 +00:00
kilianar a6c59a5fc0 fava: 1.23.1 -> 1.24 
https://github.com/beancount/fava/releases/tag/v1.24
 2023-02-21 23:27:06 +01:00
github-actions[bot] 8e4dd5face
Merge staging-next into staging 2023-02-20 06:02:09 +00:00
github-actions[bot] b629ad5e83
Merge master into staging-next 2023-02-20 06:01:33 +00:00
Nick Cao 1f8ac70db8
Merge pull request #217189 from johnjameswhitman/johnjameswhitman/todoman-skip-flaky-test 
todoman: skip flaky test
 2023-02-20 10:19:15 +08:00
John Whitman 864ce60ec1 todoman: skip flaky test 
The `icalendar` dependency of `todoman` changed how it serializes datetimes, which broke one of its tests (but didn't break any functionality). `todoman` [updated the test back in November](b3f3b63552) but hasn't pushed a new release yet, so figure it's worth skipping the broken test for now.
 2023-02-19 20:51:02 -05:00
github-actions[bot] 539195e509
Merge staging-next into staging 2023-02-20 00:03:04 +00:00
github-actions[bot] 4a14359163
Merge master into staging-next 2023-02-20 00:02:26 +00:00
R. Ryantm 24ffb538e5 qownnotes: 23.2.0 -> 23.2.4 2023-02-19 14:34:05 +00:00
Bobby Rong f71ede1693
gnumeric: 1.12.54 → 1.12.55 
https://gitlab.gnome.org/GNOME/gnumeric/-/compare/GNUMERIC_1_12_54...GNUMERIC_1_12_55
 2023-02-19 17:27:46 +08:00
Artturi cdcca1cdcd
Merge pull request #215715 from Artturin/removegirworkarounds2 2023-02-18 20:12:57 +02:00
github-actions[bot] 05782cfb75
Merge master into staging-next 2023-02-18 18:01:22 +00:00
Sandro c954a09fb8
Merge pull request #214729 from zendo/iotas 2023-02-18 17:39:07 +01:00
github-actions[bot] 54adb1d4b1
Merge master into staging-next 2023-02-18 06:01:29 +00:00
DarkOnion0 af9f449fc1
appflowy: 0.0.9 -> 0.1.0 2023-02-17 22:04:30 +01:00
Artturin cadffcfe50 treewide: remove issue #56943 workarounds 
checked with diffoscope+difflog and launching the programs

i have fixed that issue in my other gir PRs
 2023-02-17 20:26:13 +02:00
R. Ryantm 8de374b132 morgen: 2.6.4 -> 2.6.6 2023-02-16 22:46:35 +00:00
Elian Doran 9aa9c5e792 trilium-{desktop,server}: 0.58.7 -> 0.58.8 2023-02-16 22:44:44 +02:00
github-actions[bot] 164a7e44c7
Merge master into staging-next 2023-02-16 18:01:12 +00:00
Weijia Wang db865361bb
Merge pull request #216275 from r-ryantm/auto-update/super-productivity 
super-productivity: 7.12.1 -> 7.12.2
 2023-02-16 15:44:08 +01:00
github-actions[bot] f38c4cce4a
Merge master into staging-next 2023-02-16 06:01:07 +00:00
R. Ryantm 8642e02a56 treesheets: unstable-2023-01-31 -> unstable-2023-02-14 2023-02-15 07:26:18 +00:00
zendo 0a283ab00e iotas: init at 0.1.9 2023-02-15 09:34:02 +08:00
R. Ryantm 118758d71f super-productivity: 7.12.1 -> 7.12.2 2023-02-14 07:23:36 +00:00
github-actions[bot] 29cdca7736
Merge staging-next into staging 2023-02-13 06:02:02 +00:00
github-actions[bot] 0d7cb3a2aa
Merge master into staging-next 2023-02-13 06:01:30 +00:00
Nick Cao 2fa7e8d5ab
Merge pull request #215982 from symphorien/paperwork_2_1_2 
paperwork: 2.1.1 -> 2.1.2
 2023-02-13 09:25:34 +08:00
github-actions[bot] 2dac3f9f96
Merge staging-next into staging 2023-02-12 12:02:07 +00:00
github-actions[bot] 95d2ac73cc
Merge master into staging-next 2023-02-12 12:01:29 +00:00
Guillaume Girol 9466cb1ca9 paperwork: 2.1.1 -> 2.1.2 
changelog: https://forum.openpaper.work/t/paperwork-2-1-2/281/1
 2023-02-12 12:00:00 +00:00
github-actions[bot] f72b07e57d
Merge staging-next into staging 2023-02-10 06:01:53 +00:00
github-actions[bot] bff8e74964
Merge master into staging-next 2023-02-10 06:01:18 +00:00
R. Ryantm d552f79186 qownnotes: 23.1.2 -> 23.2.0 2023-02-09 07:24:31 +00:00
Mario Rodas d1d75855af ledger: add option to build with gpgme support 2023-02-08 04:20:00 +00:00
Mario Rodas 253e69362e ledger: update meta 2023-02-08 04:20:00 +00:00
Mario Rodas 1d421778b7 ledger: do not build with python by default 2023-02-08 04:20:00 +00:00
Mario Rodas 751b64d656 ledger: 3.2.1 -> 3.3.0 
https://github.com/ledger/ledger/releases/tag/v3.3.0
 2023-02-08 04:20:00 +00:00
github-actions[bot] 99cce0e1f1
Merge staging-next into staging 2023-02-07 06:02:00 +00:00