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>
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
This was achieved using the following command:
sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b')
And then manually reverted the following changes:
- alias in top-level.nix
- function name in wrap-gapps-hook.sh
- comment in postFixup of at-spi2-core
- comment in gtk4
- comment in preFixup of 1password-gui/linux.nix
- comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix
- comment in postFixup of telegram-desktop
- comment in postFixup of fwupd
- buildCommand of mongodb-compass
- postFixup of xflux-gui
- comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config
- description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild)
The nixpkgs-unstable channel's programs.sqlite was used to identify
packages producing exactly one binary, and these automatically added
to their package definitions wherever possible.
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/ibus-table/versions.
These checks were done:
- built on NixOS
- ran ‘/nix/store/k3qfsk06xxrm7sp4fwv7h5shdq7j1msk-ibus-table-1.9.20/bin/ibus-table-createdb -h’ got 0 exit code
- ran ‘/nix/store/k3qfsk06xxrm7sp4fwv7h5shdq7j1msk-ibus-table-1.9.20/bin/ibus-table-createdb --help’ got 0 exit code
- found 1.9.20 with grep in /nix/store/k3qfsk06xxrm7sp4fwv7h5shdq7j1msk-ibus-table-1.9.20
- directory tree listing: https://gist.github.com/ace63b0dd5941c9f17222549a08ee23c
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- ran `/nix/store/mrix6kd1pgli5i7hji39f1pigx0d7s5z-ibus-table-1.9.18/bin/ibus-table-createdb -h` got 0 exit code
- ran `/nix/store/mrix6kd1pgli5i7hji39f1pigx0d7s5z-ibus-table-1.9.18/bin/ibus-table-createdb --help` got 0 exit code
- found 1.9.18 with grep in /nix/store/mrix6kd1pgli5i7hji39f1pigx0d7s5z-ibus-table-1.9.18
- directory tree listing: https://gist.github.com/8f2d6146d5348401ca9117762e2befbc
