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 0128fbb0a5
result/bin/apply-formatting $NIXPKGS_PATH
In preparation for the deprecation of `stdenv.isX`.
These shorthands are not conducive to cross-compilation because they
hide the platforms.
Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way
One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059
There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.
```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
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)
sdl-config has an issue on hydra where it will hang when run on
Darwin. This is probably related to the headless mode that is set up &
the sdl-config program waiting for a graphical to finish.
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.
This update was made based on information from https://repology.org/metapackage/freeciv-gtk/versions.
These checks were done:
- built on NixOS
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server -h` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server --help` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server help` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server -V` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server -v` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server --version` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server version` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server -h` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server --help` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server help` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-gtk2 -h` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-gtk2 --help` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-gtk2 -v` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-gtk2 --version` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-manual -h` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-manual --help` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-manual -v` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-manual --version` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-mp-gtk2 -h` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-mp-gtk2 --help` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-mp-gtk2 -v` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-mp-gtk2 --version` and found version 2.5.11
- found 2.5.11 with grep in /nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11
- directory tree listing: https://gist.github.com/02a6a0c73fce1c016f7e3dc7111c76b3
