From 10683f7d232d78ff82a8ad05746d4604b8ee75c1 Mon Sep 17 00:00:00 2001
From: Antti Harju <antti@harju.io>
Date: Sun, 5 Apr 2026 19:32:06 +0300
Subject: [PATCH 1/2] nix flake update

---
 flake.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6e1a135..c17b62a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1767077117,
-        "narHash": "sha256-tmVJMQC4aNUCME3ofKP2wWEBizabxwFZfLpZSi0S/4Q=",
+        "lastModified": 1775373929,
+        "narHash": "sha256-Elx3es3UvLova3YBdJTc9rju9ULl9+5XF4K5t5Ejsa8=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "f69c299a340f95776ddcfecfc0b1f6183c0c298e",
+        "rev": "221468471f762f355db24ce728012544561650f5",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766885793,
-        "narHash": "sha256-P6RVkrM9JLCW6xBjSwHfgTOQ1JwBUma5xe5LI8xAPC0=",
+        "lastModified": 1775002709,
+        "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9ef261221d1e72399f2036786498d78c38185c46",
+        "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767109291,
-        "narHash": "sha256-tdA8HmEOOko0eeRgrfk6K6jTa6qOMp41JiVpQh31lPY=",
+        "lastModified": 1775404430,
+        "narHash": "sha256-yuHJwlDPyXkfYYs5EH1MLkAA1PZnRVRynp6XBlo2kU8=",
         "owner": "anttiharju",
         "repo": "nur-packages",
-        "rev": "91778ffd7699dd1f72fdfc00bdfc5f54eab7f47f",
+        "rev": "58b5ebe929e5522c279f75e65d0deeccb81d0f8d",
         "type": "github"
       },
       "original": {
@@ -67,11 +67,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1767028829,
-        "narHash": "sha256-RZ5+NUYTkAZ0rtbR3xBxs3VX0yi0IgYfjL06NBbXipk=",
+        "lastModified": 1775228522,
+        "narHash": "sha256-+6eTD6EAabjow5gdjWRP6aI2UUwOZJEjzzsvvbVu8f8=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "d7117056a36c0f42a4deea1ac4a8e297db11cbb8",
+        "rev": "f4b77dc99d9925667246e2887783b79bdc46a50d",
         "type": "github"
       },
       "original": {

From b46bdcd1f6a3c9bc1377d29312f028e668c29a53 Mon Sep 17 00:00:00 2001
From: Antti Harju <antti@harju.io>
Date: Sun, 5 Apr 2026 19:33:22 +0300
Subject: [PATCH 2/2] Use latest action-validator

---
 .github/workflows/plan.yml | 9 ++++-----
 flake.nix                  | 2 +-
 lefthook.yml               | 6 ++----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/plan.yml b/.github/workflows/plan.yml
index c3700d1..ffa03b7 100644
--- a/.github/workflows/plan.yml
+++ b/.github/workflows/plan.yml
@@ -201,11 +201,10 @@ jobs:
             exit 1
           fi
 
-      # disabled because it uses glob instead of this library
-      #      - if: always() && !cancelled()
-      #        name: action-validator
-      #        run: |
-      #          git ls-files -z ".github/*/*.yml" "*/action.yml" | xargs --null action-validator --verbose
+      - if: always() && !cancelled()
+        name: action-validator
+        run: |
+          git ls-files -z ".github/*/*.yml" "*/action.yml" | xargs --null action-validator --verbose
 
       - if: always() && !cancelled() && (steps.changed.outputs.actionlint == 'true' || github.event_name == 'push')
         name: actionlint
diff --git a/flake.nix b/flake.nix
index 3f13f1c..85d0c5e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,7 +53,7 @@
           rustToolchain
           toml-cli
           nur-anttiharju.legacyPackages.${system}.zig."custom" # TODO: switch back to upstream Zig once 0.16 is available through stable nixpkgs (https://codeberg.org/ziglang/zig/pulls/30628)
-          # action-validator # disabled because it uses glob instead of this library
+          anttiharju.action-validator
           actionlint
           anttiharju.relcheck
           anttiharju.compare-changes
diff --git a/lefthook.yml b/lefthook.yml
index df497ca..d5fbc4e 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -25,10 +25,8 @@ pre-commit:
       run: cargo clippy --fix --allow-staged
       stage_fixed: true
 
-    # action-validator does not play well with nix-direnv (it scans all files instead of ones in version control)
-    # also disabled because it uses glob instead of this library
-    # - name: action-validator
-    #   run: git ls-files -z '.github/workflows/*.yml' '*/action.yml' | xargs --null action-validator --verbose
+    - name: action-validator
+      run: git ls-files -z '.github/workflows/*.yml' '*/action.yml' | xargs --null action-validator --verbose
 
     - name: actionlint
       glob: ".github/workflows/*.yml"