From ad9addaed15d8e301617fdfbc92228254a8f0547 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 16 Dec 2024 22:01:59 -0600 Subject: [PATCH] flake.nix: pre-commit-hooks-nix -> git-hooks-nix --- checks/pre-commit-hooks/default.nix | 4 +- flake.lock | 202 ++++++++++++++-------------- flake.nix | 4 +- 3 files changed, 105 insertions(+), 105 deletions(-) diff --git a/checks/pre-commit-hooks/default.nix b/checks/pre-commit-hooks/default.nix index 49752ab5..8be054ee 100644 --- a/checks/pre-commit-hooks/default.nix +++ b/checks/pre-commit-hooks/default.nix @@ -4,9 +4,9 @@ ... }: let - inherit (inputs) pre-commit-hooks-nix; + inherit (inputs) git-hooks-nix; in -pre-commit-hooks-nix.lib.${pkgs.system}.run { +git-hooks-nix.lib.${pkgs.system}.run { src = ./.; hooks = { clang-tidy.enable = true; diff --git a/flake.lock b/flake.lock index 80a1f113..1e7c932d 100644 --- a/flake.lock +++ b/flake.lock @@ -293,43 +293,43 @@ } }, "flake-compat_3": { + "flake": false, "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" } }, "flake-compat_4": { - "flake": false, "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -341,11 +341,11 @@ "flake-compat_6": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -691,7 +691,7 @@ "nixvim", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore_3", "nixpkgs": [ "khanelivim", "nixvim", @@ -717,11 +717,31 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_4", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1734379367, + "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ - "hyprland", - "pre-commit-hooks", + "git-hooks-nix", "nixpkgs" ] }, @@ -742,9 +762,8 @@ "gitignore_2": { "inputs": { "nixpkgs": [ - "khanelivim", - "nixvim", - "git-hooks", + "hyprland", + "pre-commit-hooks", "nixpkgs" ] }, @@ -765,8 +784,9 @@ "gitignore_3": { "inputs": { "nixpkgs": [ - "lanzaboote", - "pre-commit-hooks-nix", + "khanelivim", + "nixvim", + "git-hooks", "nixpkgs" ] }, @@ -787,6 +807,7 @@ "gitignore_4": { "inputs": { "nixpkgs": [ + "lanzaboote", "pre-commit-hooks-nix", "nixpkgs" ] @@ -824,7 +845,7 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1734344598, @@ -1141,11 +1162,11 @@ "inputs": { "blink-cmp-copilot": "blink-cmp-copilot", "blink-compat": "blink-compat", - "nixpkgs": "nixpkgs_6", - "nixvim": "nixvim", - "pre-commit-hooks-nix": [ - "pre-commit-hooks-nix" + "git-hooks-nix": [ + "git-hooks-nix" ], + "nixpkgs": "nixpkgs_7", + "nixvim": "nixvim", "snowfall-flake": [ "snowfall-flake" ], @@ -1154,11 +1175,11 @@ ] }, "locked": { - "lastModified": 1734373956, - "narHash": "sha256-KhRvMQJSm5NQg6Q+8KM7Ym0vy5Q/SPWwWtqDjcpz/jY=", + "lastModified": 1734408025, + "narHash": "sha256-S32zuEj9go1zJkWkZ6XbcarQhGl4JAscdIZa/WHAm+U=", "owner": "khaneliman", "repo": "khanelivim", - "rev": "da4f4222b50a2ac312e618645de589331943629c", + "rev": "5e88c85c2f5546b6fb447a302f18b87a6ec557e4", "type": "github" }, "original": { @@ -1170,7 +1191,7 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_4", "flake-utils": "flake-utils_3", "nixpkgs": [ @@ -1255,7 +1276,7 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" @@ -1327,32 +1348,32 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -1375,16 +1396,16 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", - "owner": "NixOS", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1466,6 +1487,22 @@ } }, "nixpkgs_4": { + "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_5": { "locked": { "lastModified": 1733212471, "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", @@ -1481,7 +1518,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -1497,7 +1534,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1734126203, "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", @@ -1513,7 +1550,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1734119587, "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", @@ -1529,22 +1566,6 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_9": { "locked": { "lastModified": 1734119587, @@ -1564,12 +1585,12 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, @@ -1590,7 +1611,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -1633,13 +1654,13 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", + "flake-compat": "flake-compat_3", + "gitignore": "gitignore_2", "nixpkgs": [ "hyprland", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1734379367, @@ -1661,12 +1682,12 @@ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore_3", + "gitignore": "gitignore_4", "nixpkgs": [ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1717664902, @@ -1682,27 +1703,6 @@ "type": "github" } }, - "pre-commit-hooks-nix_2": { - "inputs": { - "flake-compat": "flake-compat_6", - "gitignore": "gitignore_4", - "nixpkgs": "nixpkgs_10", - "nixpkgs-stable": "nixpkgs-stable_3" - }, - "locked": { - "lastModified": 1734379367, - "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "anyrun": "anyrun", @@ -1712,6 +1712,7 @@ "darwin": "darwin", "deploy-rs": "deploy-rs", "disko": "disko", + "git-hooks-nix": "git-hooks-nix", "home-manager": "home-manager", "hypr-socket-watch": "hypr-socket-watch", "hyprland": "hyprland", @@ -1719,10 +1720,9 @@ "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", - "pre-commit-hooks-nix": "pre-commit-hooks-nix_2", "snowfall-flake": "snowfall-flake", "snowfall-lib": "snowfall-lib_2", "sops-nix": "sops-nix", @@ -1735,7 +1735,7 @@ "rust-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1714529851, diff --git a/flake.nix b/flake.nix index d564be17..bc70f467 100644 --- a/flake.nix +++ b/flake.nix @@ -57,7 +57,7 @@ inputs = { # nixpkgs.follows = "nixpkgs"; - pre-commit-hooks-nix.follows = "pre-commit-hooks-nix"; + git-hooks-nix.follows = "git-hooks-nix"; snowfall-lib.follows = "snowfall-lib"; snowfall-flake.follows = "snowfall-flake"; }; @@ -90,7 +90,7 @@ # Nix User Repository (master) nur.url = "github:nix-community/NUR"; - pre-commit-hooks-nix.url = "github:cachix/pre-commit-hooks.nix"; + git-hooks-nix.url = "github:cachix/git-hooks.nix"; # Snowfall Lib snowfall-lib = {