From 262c18e03b108b55d399c88a9b4f5b199ee3e79a Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Sun, 19 May 2024 23:44:59 -0400 Subject: [PATCH] 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 --- checks.nix | 6 +++++- flake.nix | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/checks.nix b/checks.nix index 65cb936..397d9ab 100644 --- a/checks.nix +++ b/checks.nix @@ -24,7 +24,11 @@ forEachSystem (system: { statix.enable = false; # 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 check-merge-conflicts.enable = true; diff --git a/flake.nix b/flake.nix index 206d8a9..e9a6960 100644 --- a/flake.nix +++ b/flake.nix @@ -154,9 +154,9 @@ } ); inherit (lib.rad-dev.systems) genSystems; + inherit (self) outputs; # for hydra in rec { - inherit (self) outputs; # for hydra inherit lib; # for allowing use of custom functions in nix repl hydraJobs = import ./hydra/jobs.nix { inherit inputs outputs; };