From d623cc20407e0f3774ab8cdc1c7e6411a55ef5a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 21 Aug 2025 15:26:22 -0500 Subject: [PATCH] flake: catch up on inputs --- flake.lock | 89 ++++++++++----------------------- flake.nix | 9 ++-- nix/pre-commit/flake-module.nix | 2 +- 3 files changed, 31 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index 71425620..262104f7 100644 --- a/flake.lock +++ b/flake.lock @@ -4,15 +4,15 @@ "inputs": { "devenv": [], "flake-compat": [], - "nixpkgs": "nixpkgs", - "pre-commit-hooks": [] + "git-hooks": [], + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1709700175, - "narHash": "sha256-A0/6ZjLmT9qdYzKHmevnEIC7G+GiZ4UCr8v0poRPzds=", + "lastModified": 1752264895, + "narHash": "sha256-1zBPE/PNAkPNUsOWFET4J0cjlvziH8DOekesDmjND+w=", "owner": "cachix", "repo": "cachix", - "rev": "be97b37989f11b724197b5f4c7ffd78f12c8c4bf", + "rev": "47053aef762f452e816e44eb9a23fbc3827b241a", "type": "github" }, "original": { @@ -395,21 +395,27 @@ "type": "github" } }, - "flake-utils_5": { + "git-hooks": { "inputs": { - "systems": "systems_5" + "flake-compat": [ + "flake-compat" + ], + "gitignore": "gitignore_3", + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "lastModified": 1755446520, + "narHash": "sha256-I0Ok1OGDwc1jPd8cs2VvAYZsHriUVFGIUqW+7uSsOUM=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "4b04db83821b819bbbe32ed0a025b31e7971f22e", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "cachix", + "repo": "git-hooks.nix", "type": "github" } }, @@ -461,7 +467,7 @@ "gitignore_3": { "inputs": { "nixpkgs": [ - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -529,11 +535,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -678,34 +684,6 @@ "type": "github" } }, - "pre-commit-hooks_3": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-utils": "flake-utils_5", - "gitignore": "gitignore_3", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712055707, - "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "cachix": "cachix", @@ -713,9 +691,9 @@ "devshell": "devshell_3", "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", + "git-hooks": "git-hooks", "nix-test-runner": "nix-test-runner_3", - "nixpkgs": "nixpkgs_6", - "pre-commit-hooks": "pre-commit-hooks_3" + "nixpkgs": "nixpkgs_6" } }, "systems": { @@ -777,21 +755,6 @@ "repo": "default", "type": "github" } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 181f3785..859a3b36 100644 --- a/flake.nix +++ b/flake.nix @@ -42,18 +42,17 @@ # inputs.nixpkgs.follows = "nixpkgs"; inputs.devenv.follows = ""; inputs.flake-compat.follows = ""; - inputs.pre-commit-hooks.follows = ""; + inputs.git-hooks.follows = ""; }; - pre-commit-hooks = { - url = "github:cachix/pre-commit-hooks.nix"; + git-hooks = { + url = "github:cachix/git-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs-stable.follows = "nixpkgs"; inputs.flake-compat.follows = "flake-compat"; }; }; - outputs = inputs@{ nixpkgs, self, flake-parts, devshell, pre-commit-hooks, ... }: flake-parts.lib.mkFlake { inherit inputs; } { + outputs = inputs@{ nixpkgs, self, flake-parts, devshell, ... }: flake-parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ]; imports = [ diff --git a/nix/pre-commit/flake-module.nix b/nix/pre-commit/flake-module.nix index d7206080..b78ba616 100644 --- a/nix/pre-commit/flake-module.nix +++ b/nix/pre-commit/flake-module.nix @@ -1,6 +1,6 @@ { self, inputs, ... }: { imports = [ - inputs.pre-commit-hooks.flakeModule + inputs.git-hooks.flakeModule ]; config.perSystem = { config