diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/dev-shell.nix | 1 | ||||
| -rw-r--r-- | nix/package.nix | 1 | ||||
| -rw-r--r-- | nix/pre-commit-checks.nix | 36 |
3 files changed, 4 insertions, 34 deletions
diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix index 7d21e9d..b9ede6c 100644 --- a/nix/dev-shell.nix +++ b/nix/dev-shell.nix @@ -12,7 +12,6 @@ mkShell { goEnv sd - templ modd brotli bleve diff --git a/nix/package.nix b/nix/package.nix index 081ddab..9bef057 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -37,7 +37,6 @@ buildGoApplication { patchPhase = '' rm -f frontend/static/base.css cp ${css} frontend/static/base.css - ${pkgs.templ}/bin/templ generate ''; tags = [ "embed" ]; ldflags = [ diff --git a/nix/pre-commit-checks.nix b/nix/pre-commit-checks.nix index 7e53f30..6bee0ae 100644 --- a/nix/pre-commit-checks.nix +++ b/nix/pre-commit-checks.nix @@ -4,38 +4,10 @@ rec { hooks = { gotest.enable = false; golangci-lint.enable = true; - staticcheck = - let - wrapper = pkgs.symlinkJoin { - name = "staticcheck-wrapped"; - paths = [ pkgs.go-tools ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; - postBuild = '' - wrapProgram $out/bin/staticcheck \ - --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.go ]} - ''; - }; - in - { - enable = true; - package = wrapper; - entry = - let - script = pkgs.writeShellScript "precommit-staticcheck" '' - err=0 - for dir in $(echo "$@" | xargs -n1 dirname | sort -u); do - ${hooks.staticcheck.package}/bin/staticcheck ./"$dir" - code="$?" - if [[ "$err" -eq 0 ]]; then - err="$code" - fi - done - exit $err - ''; - in - builtins.toString script; - }; + staticcheck = { + enable = true; + }; statix = { enable = true; # ignore is a glob @@ -57,7 +29,7 @@ rec { check-symlinks.enable = true; editorconfig-checker = { enable = true; - excludes = [ "\.md$" ]; + excludes = [ "\.md$" "\.ya?ml$" ]; }; prettier = { enable = true; |