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 commit should cause no rebuilds.**
# Moving Java overrides out of all-packages
All usages of this pattern have been moved to
'let ... in' blocks.
Patterns I searched for:
* `jdk =`
* `jdk_headless =`
* `jre =`
* `jfx =`
The `jing` alias has been moved to aliases.nix, so
update the usage of `jing` in `xmloscopy` to
`jing-trang`.
cassandra was ignored because that derivation
involves code generation.
I ignored grails, because jdk is set to null by
default by an override in all-packages.nix. That
package would need a slightly larger refactor to
deal with.
Packages with a *-native variant were ignored because
those would need to be refactored.
jetbrains was ignored because that might be a special case?
I ignored virtualbox, because I did not want
to touch the usages of the pattern for other
dependencies.
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
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
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.
optifinePackages.optifine-latest: 1.18.1_HD_U_H4 -> 1.19.2_HD_U_H9
optifinePackages.optifine_1_19_2: init at 1.19.2_HD_U_H9
optifinePackages.optifine_1_19_1: init at 1.19.1_HD_U_H9
optifinePackages.optifine_1_19: init at 1.19_HD_U_H9
optifinePackages.optifine_1_18_2: init at 1.18.2_HD_U_H7
optifinePackages.optifine_1_18_1: 1.18.1_HD_U_H4 -> 1.18.1_HD_U_H6
optifinePackages.optifine_1_18: init at 1.18_HD_U_H3
optifinePackages.optifine_1_16_4: init at 1.16.4_HD_U_G7
optifinePackages.optifine_1_16_3: init at 1.16.3_HD_U_G5
optifinePackages.optifine_1_16_2: init at 1.16.2_HD_U_G5
optifinePackages.optifine_1_16_1: init at 1.16.1_HD_U_G2
optifinePackages.optifine_1_15_2: 1.16.5_HD_U_G8 -> 1.15.2_HD_U_G6
optifinePackages.optifine_1_14_3: init at 1.14.3_HD_U_F2
optifinePackages.optifine_1_14_2: init at 1.14.2_HD_U_F1
optifinePackages.optifine_1_13_1: init at 1.13.1_HD_U_E4
optifinePackages.optifine_1_13: init at 1.13_HD_U_E4
optifinePackages.optifine_1_12_1: init at 1.12.1_HD_U_G5
optifinePackages.optifine_1_12: init at 1.12_HD_U_G5
optifinePackages.optifine_1_11: init at 1.11_HD_U_G5
optifinePackages.optifine_1_10_2: init at 1.10.2_HD_U_I5
optifinePackages.optifine_1_9_2: init at 1.9.2_HD_U_E3
optifinePackages.optifine_1_9_0: init at 1.9.0_HD_U_I5
optifinePackages.optifine_1_8_8: init at 1.8.8_HD_U_I7
optifinePackages.optifine_1_8_0: init at 1.8.0_HD_U_I7
optifinePackages.optifine_1_7_2: init at 1.7.2_HD_U_F7
