mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 00:53:57 +00:00
4f0dadbf38
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
34 lines
1.1 KiB
Nix
34 lines
1.1 KiB
Nix
lib: prev:
|
|
|
|
let
|
|
# Removing recurseForDerivation prevents derivations of aliased attribute
|
|
# set to appear while listing all the packages available.
|
|
removeRecurseForDerivations =
|
|
alias:
|
|
if alias.recurseForDerivations or false then
|
|
lib.removeAttrs alias [ "recurseForDerivations" ]
|
|
else
|
|
alias;
|
|
|
|
# Disabling distribution prevents top-level aliases for non-recursed package
|
|
# sets from building on Hydra.
|
|
removeDistribute = alias: if lib.isDerivation alias then lib.dontDistribute alias else alias;
|
|
|
|
# Make sure that we are not shadowing something from
|
|
# writers.
|
|
checkInPkgs =
|
|
n: alias: if builtins.hasAttr n prev then throw "Alias ${n} is still in writers" else alias;
|
|
|
|
mapAliases =
|
|
aliases:
|
|
lib.mapAttrs (
|
|
n: alias: removeDistribute (removeRecurseForDerivations (checkInPkgs n alias))
|
|
) aliases;
|
|
|
|
in
|
|
mapAliases ({
|
|
# Cleanup before 22.05, Added 2021-12-11
|
|
writePython2 = "Python 2 is EOL and the use of writers.writePython2 is deprecated.";
|
|
writePython2Bin = "Python 2 is EOL and the use of writers.writePython2Bin is deprecated.";
|
|
})
|