From 3f8bd4cb7e929b6c80b42386a747f56f78e572a0 Mon Sep 17 00:00:00 2001 From: William Date: Sat, 19 Aug 2023 11:23:48 -0300 Subject: [PATCH] removed pre-commit-hook input --- flake.lock | 113 +---------------------------------------------------- flake.nix | 29 +++----------- 2 files changed, 7 insertions(+), 135 deletions(-) diff --git a/flake.lock b/flake.lock index 496aec5..a0a5f69 100644 --- a/flake.lock +++ b/flake.lock @@ -116,22 +116,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -154,24 +138,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1689068808, "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", @@ -186,27 +152,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -377,22 +322,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1692174805, @@ -409,30 +338,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1692274144, - "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -445,7 +350,6 @@ "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", - "pre-commit-hooks": "pre-commit-hooks", "yousable": "yousable" } }, @@ -479,21 +383,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1667395993, @@ -511,7 +400,7 @@ }, "yousable": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 939bff1..5306dea 100644 --- a/flake.nix +++ b/flake.nix @@ -37,11 +37,6 @@ flake = false; }; - pre-commit-hooks = { - url = "github:cachix/pre-commit-hooks.nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nix-minecraft = { url = "github:Infinidoge/nix-minecraft"; inputs.nixpkgs.follows = "nixpkgs"; @@ -55,7 +50,7 @@ outputs = inputs@{ self, nixpkgs, home-manager, baduhai-nur, kmonad , nixpkgs-stable, deploy-rs, agenix, nixos-generators, homepage - , pre-commit-hooks, nix-minecraft, yousable, ... }: { + , nix-minecraft, yousable, ... }: { nixosConfigurations = { rotterdam = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -170,28 +165,16 @@ }; }; - checks = { - "x86_64-linux" = { - pre-commit-check = pre-commit-hooks.lib."x86_64-linux".run { - src = ./.; - hooks = { nixfmt.enable = true; }; - }; - }; - "aarch64-linux" = { - pre-commit-check = pre-commit-hooks.lib."aarch64-linux".run { - src = ./.; - hooks = { nixfmt.enable = true; }; - }; - }; - }; - devShells = { "x86_64-linux".default = nixpkgs.legacyPackages."x86_64-linux".mkShell { - inherit (self.checks."x86_64-linux".pre-commit-check) shellHook; + packages = with nixpkgs.legacyPackages."x86_64-linux"; [ nil nixfmt ]; }; "aarch64-linux".default = nixpkgs.legacyPackages."aarch64-linux".mkShell { - inherit (self.checks."aarch64-linux".pre-commit-check) shellHook; + packages = with nixpkgs.legacyPackages."aarch64-linux"; [ + nil + nixfmt + ]; }; };