mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:
nix-build ci -A fmt.check
This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).
This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).
Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase
).
If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
This commit is contained in:
parent
2140bf39e4
commit
374e6bcc40
1523 changed files with 986047 additions and 513621 deletions
|
@ -125,30 +125,58 @@ rec {
|
|||
- Ordering the dependent phases of `system.userActivationScripts`
|
||||
|
||||
For further examples see: [NixOS activation script](https://nixos.org/manual/nixos/stable/#sec-activation-script)
|
||||
|
||||
*/
|
||||
textClosureList = predefined: arg:
|
||||
textClosureList =
|
||||
predefined: arg:
|
||||
let
|
||||
f = done: todo:
|
||||
if todo == [] then {result = []; inherit done;}
|
||||
f =
|
||||
done: todo:
|
||||
if todo == [ ] then
|
||||
{
|
||||
result = [ ];
|
||||
inherit done;
|
||||
}
|
||||
else
|
||||
let entry = head todo; in
|
||||
let
|
||||
entry = head todo;
|
||||
in
|
||||
if isAttrs entry then
|
||||
let x = f done entry.deps;
|
||||
y = f x.done (tail todo);
|
||||
in { result = x.result ++ [entry.text] ++ y.result;
|
||||
done = y.done;
|
||||
}
|
||||
else if done ? ${entry} then f done (tail todo)
|
||||
else f (done // listToAttrs [{name = entry; value = 1;}]) ([predefined.${entry}] ++ tail todo);
|
||||
in (f {} arg).result;
|
||||
let
|
||||
x = f done entry.deps;
|
||||
y = f x.done (tail todo);
|
||||
in
|
||||
{
|
||||
result = x.result ++ [ entry.text ] ++ y.result;
|
||||
done = y.done;
|
||||
}
|
||||
else if done ? ${entry} then
|
||||
f done (tail todo)
|
||||
else
|
||||
f (
|
||||
done
|
||||
// listToAttrs [
|
||||
{
|
||||
name = entry;
|
||||
value = 1;
|
||||
}
|
||||
]
|
||||
) ([ predefined.${entry} ] ++ tail todo);
|
||||
in
|
||||
(f { } arg).result;
|
||||
|
||||
textClosureMap = f: predefined: names:
|
||||
textClosureMap =
|
||||
f: predefined: names:
|
||||
concatStringsSep "\n" (map f (textClosureList predefined names));
|
||||
|
||||
noDepEntry = text: {inherit text; deps = [];};
|
||||
fullDepEntry = text: deps: {inherit text deps;};
|
||||
packEntry = deps: {inherit deps; text="";};
|
||||
noDepEntry = text: {
|
||||
inherit text;
|
||||
deps = [ ];
|
||||
};
|
||||
fullDepEntry = text: deps: { inherit text deps; };
|
||||
packEntry = deps: {
|
||||
inherit deps;
|
||||
text = "";
|
||||
};
|
||||
|
||||
stringAfter = deps: text: { inherit text deps; };
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue