From 4dce40bbaa962e3c93ab61217ae4387794640401 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Wed, 28 Apr 2021 16:50:17 +0200 Subject: [PATCH] feat(flake): switch to upstream pre-commit-hooks.nix --- flake.lock | 125 +++++++++-------------------------------------------- flake.nix | 7 ++- 2 files changed, 23 insertions(+), 109 deletions(-) diff --git a/flake.lock b/flake.lock index 6b94f55..f776c4e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,45 +1,12 @@ { "nodes": { - "cabal-fmt-src": { - "flake": false, - "locked": { - "lastModified": 1598802028, - "narHash": "sha256-5yUORdBD9mtL7vPnqs+MGnHvQ7y7OGx5VeMHx0pIe2U=", - "owner": "phadej", - "repo": "cabal-fmt", - "rev": "0c716667848e0a6f2b5f999b60b067e36b0495ce", - "type": "github" - }, - "original": { - "owner": "phadej", - "ref": "master", - "repo": "cabal-fmt", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1600853454, - "narHash": "sha256-EgsgbcJNZ9AQLVhjhfiegGjLbO+StBY9hfKsCwc8Hw8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "94cf59784c73ecec461eaa291918eff0bfb538ac", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { - "lastModified": 1618217525, - "narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=", + "lastModified": 1619345332, + "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", "owner": "numtide", "repo": "flake-utils", - "rev": "c6169a2772643c4a93a0b5ac1c61e296cba68544", + "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28", "type": "github" }, "original": { @@ -48,55 +15,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1600209923, - "narHash": "sha256-zoOWauTliFEjI++esk6Jzk7QO5EKpddWXQm9yQK24iM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cd06d3c1df6879c9e41cb2c33113df10566c760", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore-nix-src": { - "flake": false, - "locked": { - "lastModified": 1594969032, - "narHash": "sha256-nbZfz02QoVe1yYK7EtCV7wMi4VdHzZEoPg20ZSDo9to=", - "owner": "hercules-ci", - "repo": "gitignore", - "rev": "c4662e662462e7bf3c2a968483478a665d00e717", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore", - "type": "github" - } - }, - "hindent-src": { - "flake": false, - "locked": { - "lastModified": 1599403541, - "narHash": "sha256-Js9uf2JSID3Ny5DVJbJ/cAbOPthcb1fKXCfyk+uoLT0=", - "owner": "chrisdone", - "repo": "hindent", - "rev": "a75d4033969ecf7d4d0a5eb985d3d1abb3b9301f", - "type": "github" - }, - "original": { - "owner": "chrisdone", - "ref": "master", - "repo": "hindent", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -104,11 +22,11 @@ ] }, "locked": { - "lastModified": 1618469593, - "narHash": "sha256-fNdt+Q3irnT3pId7PKSSVeR8/9inBrAEg4gpItoRowU=", + "lastModified": 1619558193, + "narHash": "sha256-DljP5/9EX0eXEPhzCUFqFEHkkcFuXJBx1PTgcv0OgyM=", "owner": "nix-community", "repo": "home-manager", - "rev": "ebbbd4f2b50703409543941e7445138dc1e7392e", + "rev": "18ad12d52b8cebbb57013865eec2be5125de050a", "type": "github" }, "original": { @@ -120,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1618343055, - "narHash": "sha256-yux3woyNtMt6ynYRq7+DYe19CC+SoI/LJW+zSJd0UOs=", + "lastModified": 1619464443, + "narHash": "sha256-R7WAb8EnkIJxxaF6GTHUPytjonhB4Zm0iatyWoW169A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e019872af81e4013fd518fcacfba74b1de21a50e", + "rev": "8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17", "type": "github" }, "original": { @@ -151,11 +69,11 @@ }, "nur": { "locked": { - "lastModified": 1618493194, - "narHash": "sha256-C0VVgrGuRt3zr8svMd+eWPr4FX9qjgsAGkHsUTjRtAk=", + "lastModified": 1619617127, + "narHash": "sha256-A5+xGeftQfhcjMVGqWFYfjZZX1EaBBqkirVQe1ZyaXk=", "owner": "nix-community", "repo": "NUR", - "rev": "316dd07171830a86b19a79ddb39969501d8fc4a9", + "rev": "96572c099b8c13b520e764a2a8f516bc81ffcb2c", "type": "github" }, "original": { @@ -219,27 +137,24 @@ }, "pre-commit-hooks": { "inputs": { - "cabal-fmt-src": "cabal-fmt-src", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "gitignore-nix-src": "gitignore-nix-src", - "hindent-src": "hindent-src", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1600939022, - "narHash": "sha256-TDyYQGP2x+LDU2hHUtXI9hrwN2iQByLBfq39rXBq1cA=", - "owner": "Myhlamaeus", + "lastModified": 1619616710, + "narHash": "sha256-NIXeFf3zKsULIOx61P/vVsS30BD2YoshduSw680nJkM=", + "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "8d48a4cd434a6a6cc8f2603b50d2c0b2981a7c55", + "rev": "c33f92d9d69a73c77061e4fd47234662625cbdf9", "type": "github" }, "original": { - "owner": "Myhlamaeus", + "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "8d48a4cd434a6a6cc8f2603b50d2c0b2981a7c55", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 67bb37d..87bb704 100644 --- a/flake.nix +++ b/flake.nix @@ -22,10 +22,9 @@ }; inputs.pre-commit-hooks = { - url = - # "github:Myhlamaeus/pre-commit-hooks.nix/feat/flake"; - "github:Myhlamaeus/pre-commit-hooks.nix/8d48a4cd434a6a6cc8f2603b50d2c0b2981a7c55"; + url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; }; outputs = { self, nixpkgs, flake-utils, home-manager, nur, obelisk @@ -114,7 +113,7 @@ } // flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; - pre-commit-check = pre-commit-hooks.defaultPackage.${system} { + pre-commit-check = pre-commit-hooks.lib.${system}.run { src = ./.; hooks = { nixfmt.enable = true; }; };