Austin Horstman
933d1a51a3
yabai: 6.0.12 -> 6.0.13
2024-02-19 16:18:02 -06:00
github-actions[bot]
e49cc7f7ed
Merge staging-next into staging
2024-02-15 06:01:45 +00:00
Randy Eckenrode
f28c4bba5c
Merge pull request #282851 from stephank/feat/darwin-apinotes
...
darwin.Libsystem: add missing Darwin.apinotes
2024-02-14 06:34:45 -05:00
Austin Horstman
14aee9b7dc
yabai: 6.0.11 -> 6.0.12
2024-02-13 23:01:05 -06:00
Pol Dellaiera
92464134e0
Merge pull request #286322 from khaneliman/yabai
...
yabai: 6.0.7 -> 6.0.11
2024-02-12 03:20:35 +01:00
Pol Dellaiera
113bb026d5
Merge pull request #286850 from khaneliman/sketchybar
...
sketchybar: 2.20.0 -> 2.20.1
2024-02-12 03:19:51 +01:00
Austin Horstman
99a12fdbb0
yabai: 6.0.10 -> 6.0.11
2024-02-11 11:12:55 -06:00
Austin Horstman
adb9bde1cc
yabai: 6.0.9 -> 6.0.10
2024-02-10 17:45:59 -06:00
Austin Horstman
23b89f915b
sketchybar: 2.20.0 -> 2.20.1
2024-02-06 18:35:39 -06:00
github-actions[bot]
42e44c0583
Merge master into staging-next
2024-02-05 00:02:17 +00:00
Yifei Sun
9b6cd4bcb2
raycast: 1.64.4 -> 1.66.2
2024-02-04 13:47:15 -05:00
Austin Horstman
ac922d9f9a
yabai: 6.0.7 -> 6.0.9
2024-02-04 10:49:39 -06:00
github-actions[bot]
b0861ba3fd
Merge staging-next into staging
2024-02-01 12:01:23 +00:00
Martin Weinelt
27fa02d0f1
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
- pkgs/development/compilers/llvm/10/clang/default.nix
- pkgs/development/compilers/llvm/8/clang/default.nix
2024-02-01 12:25:11 +01:00
Pol Dellaiera
af8f1cbb3f
Merge pull request #284367 from khaneliman/sketchybar
...
sketchybar: 2.19.4 -> 2.20.0
2024-02-01 08:39:13 +01:00
Pol Dellaiera
aba86a0044
Merge pull request #284083 from khaneliman/yabai
...
yabai: 6.0.6 -> 6.0.7
2024-02-01 08:04:57 +01:00
Weijia Wang
939e432e46
Merge pull request #284840 from wegank/7zz-hdiutil
...
airbuddy, aldente: unpack with 7zz
2024-01-31 22:38:31 +01:00
Weijia Wang
3db9eb16df
aldente: unpack with 7zz
2024-01-29 22:18:16 +01:00
Weijia Wang
269b310508
airbuddy: unpack with 7zz
2024-01-29 22:18:08 +01:00
Weijia Wang
c7c64a8c72
darwin.apple_sdk_11_0.stdenv: set darwinSdkVersion on all platforms
2024-01-29 21:53:14 +01:00
madsbv
997f4a1c86
karabiner-elements: 14.11.0 -> 14.13.0
2024-01-29 14:15:29 -05:00
Austin Horstman
368ad19751
sketchybar: 2.19.4 -> 2.20.0
2024-01-27 17:38:49 -06:00
Weijia Wang
1eb10bd6bd
darwin.moltenvk: 1.2.4 -> 1.2.7
2024-01-27 14:46:04 +01:00
Austin Horstman
ac881414a6
yabai: 6.0.6 -> 6.0.7
2024-01-26 13:30:14 -06:00
Stéphan Kochen
e6f0d7250d
darwin.Libsystem: add missing Darwin.apinotes
...
This apparently affects imports from Swift and, at the time of writing,
contains mappings for `CLOCK_*` constants.
2024-01-22 10:54:58 +01:00
Pol Dellaiera
186e57d9b1
Merge pull request #279478 from khaneliman/yabai
...
yabai: 6.0.4 -> 6.0.6
2024-01-15 15:31:29 +01:00
Weijia Wang
12cbd754a5
Merge pull request #275928 from Ovyerus/xcode-15
...
darwin.xcode: add 15 and 15.1
2024-01-11 06:00:58 +01:00
Austin Horstman
0f9f5f484f
yabai: 6.0.5 -> 6.0.6
2024-01-08 08:07:39 -06:00
Austin Horstman
bb1d7fe0c3
yabai: 6.0.4 -> 6.0.5
2024-01-07 18:40:18 -06:00
Weijia Wang
0fa5a936f2
Merge pull request #278538 from nekowinston/bump-yabai-6.0.3
...
yabai: 6.0.2 -> 6.0.4
2024-01-06 00:29:19 +01:00
Yifei Sun
1bd7878c58
raycast: 1.61.2 -> 1.64.4
2024-01-03 15:36:28 -05:00
winston
f75c4c3061
yabai: 6.0.2 -> 6.0.4
2024-01-03 20:37:42 +01:00
Emily Trau
9aafa9b258
darwin.apple_sdk_11_0.libcompression: init at 11.0.0
2023-12-31 13:19:10 +11:00
winston
308f38826e
yabai: 6.0.1 -> 6.0.2
2023-12-23 22:38:33 +01:00
Ovyerus
d25cd80eca
darwin.xcode: add 15 and 15.1
2023-12-22 11:33:20 +11:00
Yifei Sun
7394781dde
aldente: 1.24 -> 1.24.1
2023-12-17 12:57:16 -05:00
Weijia Wang
01e35654ec
Merge pull request #273000 from h7x4/pkgs-update-asitop
...
asitop: 0.0.23 -> 0.0.24
2023-12-17 00:04:52 +01:00
Weijia Wang
65202f809c
utm: 4.4.4 -> 4.4.5
2023-12-14 10:10:08 +01:00
h7x4
6b0214711c
asitop: 0.0.23 -> 0.0.24
2023-12-08 23:16:30 +01:00
github-actions[bot]
9497a77fed
Merge master into staging-next
2023-12-05 18:00:57 +00:00
Weijia Wang
4d61ec245f
rectangle: 0.74 -> 0.75
2023-12-05 01:28:33 +01:00
Vladimír Čunát
305cd929fd
Merge branch 'staging' into staging-next
2023-12-01 07:33:49 +01:00
Adam Joseph
e30975f832
darwin.iosSdkPkgs: fix broken eval
2023-11-30 09:36:05 +01:00
Weijia Wang
fe1b43530b
Merge pull request #270298 from stepbrobd/aldente
...
aldente: 1.22.3 -> 1.24
2023-11-30 04:09:10 +01:00
github-actions[bot]
d5776afdf5
Merge staging-next into staging
2023-11-27 00:02:41 +00:00
Yifei Sun
604a5a083e
aldente: 1.22.3 -> 1.24
2023-11-26 18:36:42 -05:00
Austin Horstman
f9bc643137
yabai: fix x86_64 build
2023-11-26 12:54:58 -06:00
github-actions[bot]
bb547494d0
Merge staging-next into staging
2023-11-19 18:01:21 +00:00
Artturi
46e98ccc96
Merge pull request #268519 from boltzmannrain/coresymbolication_c99_fix
2023-11-19 18:42:32 +02:00
Dmitry Ivankov
9ce73e272f
darwin.CoreSymbolication: fix C99 compilation
...
https://hydra.nixos.org/build/241116326/nixlog/1
```
build flags: SHELL=/nix/store/x1xxsh1gp6y389hyl40a0i74dkxiprl7-bash-5.2-p15/bin/bash PREFIX=\$\(out\) CC=cc
cc -F/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include -fblocks -c -o CoreSymbolication.o CoreSymbolication.c
In file included from CoreSymbolication.c:1:
./CoreSymbolication.h:393:1: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
CSSymbolOwnerSetTransientUserData(CSSymbolOwnerRef owner, uint32_t gen);
^
int
1 error generated.
```
Also submitted patch upstream at
https://github.com/matthewbauer/CoreSymbolication/pull/1
ZHF: #265948
2023-11-19 15:59:22 +01:00
github-actions[bot]
a24f483a6b
Merge staging-next into staging
2023-11-19 00:02:52 +00:00
Nikolay Korotkiy
8faa5b03ce
Merge pull request #268326 from wegank/libiconv-main-program
...
darwin.libiconv: set mainProgram
2023-11-18 23:52:44 +04:00
github-actions[bot]
39c5241474
Merge staging-next into staging
2023-11-18 18:01:23 +00:00
Weijia Wang
39951cddc7
darwin.libiconv: set mainProgram
2023-11-18 16:57:39 +01:00
Austin Horstman
7628e3d00f
sketchybar: 2.19.3 -> 2.19.4
2023-11-17 20:59:26 -06:00
github-actions[bot]
cd58dff98b
Merge staging-next into staging
2023-11-18 00:02:40 +00:00
fortuneteller2k
740d990ce7
skhd: silence implicit-function-declaration warning on Darwin
2023-11-17 23:43:48 +08:00
github-actions[bot]
991a07725b
Merge staging-next into staging
2023-11-17 12:01:30 +00:00
Adam Joseph
c7e0f6b905
treewide: s_targetPlatform_hostPlatform_ in non-compiler packages
...
stdenv.targetPlatform really shouldn't be used by software that
doesn't generate or manipulate binaries. I reviewed all uses of
targetPlatform outside of pkgs/development/compilers and pkgs/stdenv
and replaced those which weren't involved in something which fits
these criteria.
2023-11-17 08:07:34 +00:00
Weijia Wang
a187c6998e
Merge pull request #267307 from reckenrode/corevideo-fix
...
darwin.apple_sdk_11_0.frameworks.CoreVideo: switch to sed
2023-11-17 00:35:24 +01:00
Martin Weinelt
3c336a1647
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/development/libraries/gdcm/default.nix
2023-11-14 13:16:34 +01:00
OTABI Tomoya
1b05a9b81b
Merge pull request #267342 from khaneliman/sketchybar
...
sketchybar: 2.19.2 -> 2.19.3
2023-11-14 18:54:22 +09:00
Pol Dellaiera
ebc36f09d7
Merge pull request #267126 from khaneliman/yabai-update
...
yabai: 6.0.0 -> 6.0.1
2023-11-14 07:25:51 +01:00
Austin Horstman
99cfb55694
sketchybar: 2.19.2 -> 2.19.3
2023-11-13 20:01:18 -06:00
Randy Eckenrode
5d608cc925
darwin.apple_sdk_11_0.frameworks.CoreVideo: switch to sed
...
CoreVideo is failing to build during the bootstrap because the bootstrap
awk lacks support for in-place editing. Fix it by using sed instead.
2023-11-13 16:30:38 -05:00
Fabián Heredia Montiel
884449105e
Merge remote-tracking branch 'origin/master' into staging-next
2023-11-13 14:31:51 -06:00
Bernardo Meurer
edfad58322
Merge pull request #267200 from klchen0112/raycast
...
raycast: 1.60.1 -> 1.61.2
2023-11-13 11:09:30 -03:00
klchen0112
83217c6fe1
raycast: 1.60.1 -> 1.61.2
2023-11-13 19:48:04 +08:00
Austin Horstman
eea2498560
sketchybar: 2.19.1 -> 2.19.2
2023-11-12 21:02:05 -06:00
Austin Horstman
94b09ce439
yabai: 6.0.0 -> 6.0.1
2023-11-12 19:13:28 -06:00
Randy Eckenrode
55bf8aa8c1
Revert "configd: fix build with clang 16"
...
This reverts commit 550137e330
2023-11-12 10:45:22 -05:00
Randy Eckenrode
a678c55faf
darwin.mDNSResponder: patch header to match SDK
...
The upstream source release for 765.50.9 defines `_DNS_SD_LIBDISPATCH`
to `0` in `dns_sd.h`, but the SDK version of that header actually
defines it to `1`. Having it defined to `0` causes packages that expect
to use libdispatch-based symbols such as `DNSServiceSetDispatchQueue` to
fail to build. Define it to match the SDK to fix those packages.
2023-11-12 10:45:22 -05:00
Randy Eckenrode
940180423a
Merge pull request #265102 from reckenrode/darwin-corefoundation
...
darwin.stdenv: use CoreFoundation instead of CF
2023-11-11 12:10:10 -05:00
github-actions[bot]
46679c6a02
Merge master into staging-next
2023-11-11 06:01:00 +00:00
Austin Horstman
8b3fc63382
sketchybar: 2.18.0 -> 2.19.1
2023-11-10 19:56:58 -06:00
github-actions[bot]
e112f9b8bb
Merge master into staging-next
2023-11-09 18:00:56 +00:00
Rick van Schijndel
304b2a3908
Merge pull request #262354 from stepbrobd/aldente
...
aldente: 1.22.2 -> 1.22.3
2023-11-09 18:07:31 +01:00
Randy Eckenrode
daa4cd2c2a
darwin.text_cmds: fix build with clang 16
2023-11-07 09:17:04 -05:00
github-actions[bot]
bb38778356
Merge master into staging-next
2023-11-05 18:00:55 +00:00
Yuriy Taraday
908c9e6834
dark-mode-notify: migrate to pkgs/by-name
2023-11-04 08:40:35 +01:00
github-actions[bot]
3c43b804d4
Merge master into staging-next
2023-11-03 18:01:23 +00:00
Randy Eckenrode
6b62554356
darwin.swift-corelibs-foundation: avoid infinite recursion
...
Drop ninja and use a minimal Python to avoid an infinite recursion due
to dependencies that depend on configd, which also depends on this.
2023-11-02 17:45:59 -04:00
Randy Eckenrode
080f7cc41e
darwin.configd: fix build with CoreFoundation
2023-11-02 17:45:59 -04:00
Randy Eckenrode
448aed9e81
darwin.apple_sdk: drop unnecessary dependencies
2023-11-02 17:45:58 -04:00
Austin Horstman
51c024de65
apple-sdk-11.0: add Apple80211 private framework
2023-11-02 14:56:59 -05:00
github-actions[bot]
0d2063b693
Merge master into staging-next
2023-11-01 00:02:16 +00:00
Weijia Wang
d92e1be455
rectangle: 0.73 -> 0.74
2023-10-31 19:09:49 +01:00
github-actions[bot]
3f274c7328
Merge master into staging-next
2023-10-29 06:01:18 +00:00
Zhong Jianxin
508da65355
sketchybar: 2.17.1 -> 2.18.0
2023-10-28 22:21:13 +08:00
Randy Eckenrode
b810da025f
darwin.diskdev_cmds: fix build with clang 16
...
Fix an implicit `int` on argc, which is an error with newer clangs.
2023-10-27 08:40:47 -04:00
Vladimír Čunát
d811555465
Merge branch 'staging' into staging-next
2023-10-26 10:36:50 +02:00
Bernardo Meurer
eb4559b1d6
Merge pull request #262355 from stepbrobd/raycast
...
raycast: 1.59.0 -> 1.60.1
2023-10-24 08:25:54 -04:00
github-actions[bot]
df9eab6771
Merge staging-next into staging
2023-10-23 00:03:00 +00:00
h7x4
0b6077fb7b
darwin.CoreSymbolication: refactor, unstable-2018-04-08 -> unstable-2018-06-17 ( #262363 )
...
* darwin.CoreSymbolication: refactor
Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>
* darwin.CoreSymbolication: unstable-2018-04-08 -> unstable-2018-06-17
---------
Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>
2023-10-23 00:18:16 +02:00
Weijia Wang
0c707cc99a
Merge pull request #262612 from wegank/utm-bump
...
utm: 4.4.3 -> 4.4.4
2023-10-23 00:01:34 +02:00
github-actions[bot]
4312247c19
Merge staging-next into staging
2023-10-22 12:01:52 +00:00
Weijia Wang
ca1f8c6b78
utm: 4.4.3 -> 4.4.4
2023-10-21 23:03:52 +02:00
Randy Eckenrode
1974a25301
darwin.Libm: add missing function declarations
...
The patch in this commit is based on the SDK header, which has an ASPL
license header even though the updated header is not part of the source
distribution of Libm. Adding the missing declarations allows packages
such as jq, Ruby, and Guile to build without requiring an SDK that is
not built from the source releases.
2023-10-21 12:05:09 -04:00
Austin Horstman
0b63ac6561
sketchybar: 2.17.0 -> 2.17.1
2023-10-20 21:52:24 -05:00
Yifei Sun
a3a8bb09a8
raycast: 1.59.0 -> 1.60.1
2023-10-20 14:22:16 -04:00
Yifei Sun
c0efb92592
aldente: 1.22.2 -> 1.22.3
2023-10-20 14:18:21 -04:00
github-actions[bot]
bb7c6d7a79
Merge staging-next into staging
2023-10-19 00:02:54 +00:00
Weijia Wang
fb8c33f8ef
utm: 4.3.5 -> 4.4.3
2023-10-18 16:02:10 +02:00
github-actions[bot]
de49fc16bc
Merge staging-next into staging
2023-10-16 12:01:54 +00:00
auxves
8de225d11e
yabai: 5.0.9 -> 6.0.0
2023-10-14 18:02:56 -07:00
Weijia Wang
83cb70d8c1
Merge pull request #260544 from reckenrode/darwintools-cross
...
DarwinTools: fix Darwin cross-compilation
2023-10-13 23:16:00 +02:00
Randy Eckenrode
fd70154fca
DarwinTools: fix Darwin cross-compilation
2023-10-11 18:23:52 -04:00
Austin Horstman
a4054b4916
sketchybar: 2.16.3 -> 2.17.0
2023-10-11 12:12:40 -05:00
Weijia Wang
7cd63c3232
Merge pull request #259508 from wegank/ios-deploy-refactor
...
darwin.ios-deploy: 1.11.0 -> 1.12.2, refactor
2023-10-08 21:26:33 +02:00
Weijia Wang
6b5f9dde02
darwin.ios-deploy: 1.11.0 -> 1.12.2, refactor
2023-10-07 05:46:25 +02:00
Austin Horstman
3a50c2dac5
yabai: 5.0.8 -> 5.0.9
2023-10-01 09:25:05 -05:00
Weijia Wang
7c18990342
Merge pull request #257816 from wegank/rectangle-bump
...
rectangle: 0.72 -> 0.73
2023-09-28 16:58:35 +02:00
Weijia Wang
f2161538da
rectangle: 0.72 -> 0.73
2023-09-28 12:29:49 +02:00
Yifei Sun
78fb58888f
coconutbattery: 3.9.12 -> 3.9.14
2023-09-27 15:30:36 -04:00
Daniel Bonofiglio
e937f7ded6
raycast: 1.57.1 -> 1.59.0
2023-09-27 14:52:55 -04:00
Weijia Wang
38d386cf9e
rectangle: 0.71 -> 0.72
2023-09-25 23:01:19 +02:00
Weijia Wang
5925c27bb7
Merge pull request #255878 from wegank/rectangle-bump
...
rectangle: 0.70 -> 0.71
2023-09-19 12:09:53 +02:00
Austin Horstman
ad07cd4fc2
treewide: add version tests ( #255781 )
2023-09-18 22:58:14 +03:00
Weijia Wang
0850dcb318
rectangle: 0.70 -> 0.71
2023-09-18 14:27:39 +02:00
Weijia Wang
d368bcfc4b
utm: 4.2.5 -> 4.3.5
2023-09-18 14:00:19 +02:00
Austin Horstman
191f3e6f5d
yabai: 5.0.7 -> 5.0.8
2023-09-13 17:20:47 -05:00
山下
f41a52de42
sensible-side-buttons: init at 1.0.6
2023-09-06 18:20:34 +09:00
Austin Horstman
85cd8caee8
sketchybar: 2.16.1 -> 2.16.3
2023-09-04 09:06:06 -05:00
Pol Dellaiera
5f28414c6c
Merge pull request #251789 from khaneliman/yabai
...
yabai: 5.0.6 -> 5.0.7
2023-08-28 22:18:26 +02:00
Austin Horstman
87456a91cc
yabai: chore remove unused input
2023-08-28 13:24:55 -05:00
Austin Horstman
1ac67f7b20
yabai: add khaneliman to maintainers
2023-08-28 13:24:55 -05:00
Austin Horstman
f92eaa934e
yabai: 5.0.6 -> 5.0.7
2023-08-28 13:24:55 -05:00
github-actions[bot]
47ae3f6c28
Merge master into staging-next
2023-08-27 00:02:24 +00:00
Austin Horstman
38b9aaf668
sketchybar: add meta.mainProgram
2023-08-26 23:53:51 +00:00
Austin Horstman
75683e2839
sketchybar: 2.15.2 -> 2.16.1
2023-08-26 23:53:51 +00:00
github-actions[bot]
3503eea847
Merge master into staging-next
2023-08-26 18:00:55 +00:00
Austin Horstman
8f1e764551
treewide: add meta.mainProgram ( #251487 )
...
* skhd: add meta.mainProgram
* yabai: add meta.mainProgram
* kitty: add meta.mainProgram
* alacritty: add meta.mainProgram
* thunar: add meta.mainProgram
* looking-glass-client: add meta.mainProgram
* thunderbird: add meta.mainProgram
* ckb-next: add meta.mainProgram
* virt-manager: add meta.mainProgram
* gh: add meta.mainProgram
2023-08-26 15:03:52 +03:00
Theodore Ni
ece0953571
Merge branch 'staging-next' into staging
2023-08-18 16:02:27 -07:00
github-actions[bot]
1949ef2080
Merge master into staging-next
2023-08-18 18:00:57 +00:00
StepBroBD
3cf97b6ed5
raycast: 1.55.2 -> 1.57.1
2023-08-18 09:21:01 -04:00
Jan Tojnar
86797b2008
Merge branch 'staging-next' into staging
...
Conflicts:
- pkgs/development/libraries/qt-6/default.nix
Merge a5b92645f10597d865ef
2023-08-16 19:37:11 +02:00
github-actions[bot]
a5a93e1107
Merge master into staging-next
2023-08-16 06:01:05 +00:00
Pol Dellaiera
8737f92137
Merge pull request #249290 from Enzime/add/apparency
...
apparency: init at 1.5.1
2023-08-16 02:52:12 +02:00
Michael Hoang
afd4607cf4
apparency: init at 1.5.1
2023-08-16 09:27:14 +10:00
github-actions[bot]
87c2ad303d
Merge staging-next into staging
2023-08-13 06:01:19 +00:00
github-actions[bot]
f5eb026a2a
Merge master into staging-next
2023-08-13 06:00:52 +00:00
Nick Cao
b86547b3e6
Merge pull request #247887 from Intuinewin/rectangle/0.70
...
rectangle: 0.68 -> 0.70
2023-08-12 23:51:44 -06:00
Weijia Wang
3a1c19dba8
Merge pull request #248722 from reckenrode/corefoundation-tbd-fix
...
CoreFoundation: specify the tbd explicitly
2023-08-12 21:07:37 +02:00
Randy Eckenrode
8e56a2635f
CoreFoundation: specify the tbd explicitly
...
The current hook specifies the path to the framework library, but
nixpkgs does not actually provide the library when linking against the
system framework. It provides a text-based stub (`.tbd`) instead. ld64
will find the stub and use it, but lld will not when the full path is
specified. Both linkers work if the extension is included, so do that
for compatibility with both. This fixes using lld with CoreFoundation
(e.g., to support LTO on Darwin).
2023-08-12 09:17:13 -04:00
github-actions[bot]
9cc6a98540
Merge master into staging-next
2023-08-11 18:00:55 +00:00
Silvan Mosberger
dcb50597cb
Merge pull request #243280 from YorikSar/dark-mode-notify-init
...
dark-mode-notify: init at 2022-07-18
2023-08-11 16:06:55 +02:00
Antoine Labarussias
abb86ecde0
rectangle: 0.68 -> 0.70
2023-08-08 09:53:10 +02:00
Yuriy Taraday
c97c45612c
dark-mode-notify: init at 2022-07-18
...
`dark-mode-notify` is a small too that calls a binary whenever dark
mode status changes in macOS.
2023-08-08 00:34:38 +02:00
github-actions[bot]
687b501234
Merge staging-next into staging
2023-08-05 18:01:37 +00:00
github-actions[bot]
e329dc70ee
Merge master into staging-next
2023-08-05 18:01:09 +00:00
