Mostly just some mechanical find-and-replace with the following
commands(run from the `plugins/` directory:
```sh
# qtbase -> qt6.qtbase
find ./ -type f -exec sed -i -e 's/qtbase,/qt6,/g' {} \;
find ./ -type f -exec sed -i -e 's/qtbase/qt6.qtbase/g' {} \;
# <package>/default.nix -> <package>/package.nix, as required by
packagesFromDirectoryRecursive
find ./ -name 'default.nix' -exec bash -c 'mv $0 ${0/default/package}'
{} \;
# Rename since ez solution
mv ./package.nix ./default.nix
```
You'll also need to remove `wrapQtAppsHook` from obs-tuna and use
`qt6.wrapQtAppsHook` instead.(I did this manually.) There's also the
change in obs-vkcapture.nix which I hope is self-explanatory, and is
gated behind x86_64-linux so doesn't impact other platforms
This commit was created by a combination of scripts and tools:
- an ast-grep script to prefix things in meta with `lib.`,
- a modified nixf-diagnose / nixf combination to remove unused `with
lib;`, and
- regular nixfmt.
Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
Inherits platforms from obs-studio.meta so most builds on aarch64-linux.
Skips the following due to not supporting aarch64-linux:
- looking-glass-obs
- waveform
This reverts commit 65a333600d.
This wasn't tested for correctness with something like fodwatch [0],
and should not have been (self-)merged so quickly, especially without
further review.
It also resulted in the breakage of at least one package [1] (and that's
the one we know of and was caught).
A few packages that were updated in between this commit and this revert
were not reverted back to using `rev`, but other than that, this is a
1:1 revert.
[0]: https://codeberg.org/raphaelr/fodwatch
[1]: https://github.com/NixOS/nixpkgs/pull/396904 / 758551e458
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
