fix erroneous output warning, remove vscode json file from check
vscode json files allow comments, but check-json only allows regular json. the check now ignores settings.json moves inherit for outputs to the let, as it was attempting to output the outputs variable. Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
parent
af7a901bbf
commit
262c18e03b
@ -24,7 +24,11 @@ forEachSystem (system: {
|
|||||||
statix.enable = false;
|
statix.enable = false;
|
||||||
|
|
||||||
# json hooks
|
# json hooks
|
||||||
check-json.enable = true;
|
check-json = {
|
||||||
|
enable = true;
|
||||||
|
# exclude vscode json files as they allow comments and check-json doesn't
|
||||||
|
excludes = [ "settings.json$" ];
|
||||||
|
};
|
||||||
|
|
||||||
# git hooks
|
# git hooks
|
||||||
check-merge-conflicts.enable = true;
|
check-merge-conflicts.enable = true;
|
||||||
|
@ -154,9 +154,9 @@
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
inherit (lib.rad-dev.systems) genSystems;
|
inherit (lib.rad-dev.systems) genSystems;
|
||||||
|
inherit (self) outputs; # for hydra
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
inherit (self) outputs; # for hydra
|
|
||||||
inherit lib; # for allowing use of custom functions in nix repl
|
inherit lib; # for allowing use of custom functions in nix repl
|
||||||
|
|
||||||
hydraJobs = import ./hydra/jobs.nix { inherit inputs outputs; };
|
hydraJobs = import ./hydra/jobs.nix { inherit inputs outputs; };
|
||||||
|
Loading…
x
Reference in New Issue
Block a user