diff --git a/deployment/check/common/deployerNode.nix b/deployment/check/common/deployerNode.nix index 5802793c..987a0a7c 100644 --- a/deployment/check/common/deployerNode.nix +++ b/deployment/check/common/deployerNode.nix @@ -60,6 +60,7 @@ in sources.flake-parts sources.flake-inputs + sources.git-hooks pkgs.stdenv pkgs.stdenvNoCC diff --git a/deployment/check/common/nixosTest.nix b/deployment/check/common/nixosTest.nix index d15203cb..10e775e3 100644 --- a/deployment/check/common/nixosTest.nix +++ b/deployment/check/common/nixosTest.nix @@ -149,8 +149,6 @@ in inputs.nixops4-nixos.inputs.nixops4.packages.${system}.flake-in-a-bottle } \ --override-input nixops4-nixos/git-hooks-nix ${emptyFlake} \ - \ - --override-input git-hooks ${inputs.git-hooks} \ ; """) diff --git a/flake.lock b/flake.lock index c98744f9..ce37c4bf 100644 --- a/flake.lock +++ b/flake.lock @@ -59,22 +59,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1733328505, @@ -90,7 +74,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -183,32 +167,12 @@ "type": "github" } }, - "git-hooks": { + "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": "nixpkgs" }, - "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks-nix": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_2" - }, "locked": { "lastModified": 1737465171, "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", @@ -263,27 +227,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "nixops4-nixos", @@ -323,7 +266,7 @@ }, "nix": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_3", "git-hooks-nix": "git-hooks-nix_2", "nixfmt": "nixfmt", @@ -401,7 +344,7 @@ "flake-parts": "flake-parts_2", "nix": "nix", "nix-cargo-integration": "nix-cargo-integration", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-old": "nixpkgs-old" }, "locked": { @@ -535,22 +478,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1738410390, "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", @@ -591,7 +518,7 @@ }, "purescript-overlay": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixops4-nixos", "nixops4", @@ -634,7 +561,6 @@ }, "root": { "inputs": { - "git-hooks": "git-hooks", "nixops4": [ "nixops4-nixos", "nixops4" diff --git a/flake.nix b/flake.nix index 75c0ba95..9eca940e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,5 @@ { inputs = { - git-hooks.url = "github:cachix/git-hooks.nix"; nixops4.follows = "nixops4-nixos/nixops4"; nixops4-nixos.url = "github:nixops4/nixops4-nixos"; }; @@ -8,10 +7,10 @@ outputs = inputs: import ./mkFlake.nix inputs ( - { inputs, ... }: + { inputs, sources, ... }: { imports = [ - "${inputs.git-hooks}/flake-module.nix" + "${sources.git-hooks}/flake-module.nix" inputs.nixops4.modules.flake.default ./deployment/flake-part.nix