There is a new pull request by akierig against master on the void-packages repository

https://github.com/akierig/void-packages fish-3.6.1
https://github.com/void-linux/void-packages/pull/43015

fish-shell: update to 3.6.1, adopt
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64

A patch file from https://github.com/void-linux/void-packages/pull/43015.patch is attached