From b1ae941560f2af26d2f742a643fc9ad3b8064649 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Thu, 28 Jul 2022 13:24:41 +0200
Subject: [PATCH] WIP

---
 .drone.yml |  2 +-
 flake.nix  | 72 ++++++++++++++++++++++++++++--------------------------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 8fb7774..6a9ddd2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,7 +6,7 @@ name: abacus checks
 steps:
 - name: pre commit check
   commands:
-  - nix develop . --command pre-commit run --all
+  - nix develop . --command cargo vendor
 
 - name: flake check
   commands:
diff --git a/flake.nix b/flake.nix
index c8e7566..22a05e4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -80,42 +80,44 @@
         rustc = my-rust;
       };
       inherit (pkgs) lib;
-      pre-commit =
-        let
-          # See https://github.com/cachix/pre-commit-hooks.nix/issues/126
-          rust-env = pkgs.buildEnv {
-            name = "rust-env";
-            buildInputs = [ pkgs.makeWrapper ];
-            paths = [ my-rust ];
-            pathsToLink = [ "/" "/bin" ];
-            postBuild = ''
-              for i in $out/bin/*; do
-                wrapProgram "$i" --prefix PATH : "$out/bin"
-              done
-            '';
-          };
-        in
-        pre-commit-hooks.lib.${system}.run {
-          src = self;
-
-          hooks = {
-            clippy = {
-              enable = true;
-              entry = lib.mkForce "${rust-env}/bin/cargo-clippy clippy";
-            };
-
-            nixpkgs-fmt = {
-              enable = true;
-            };
-
-            rustfmt = {
-              enable = true;
-              entry = lib.mkForce "${rust-env}/bin/cargo-fmt fmt -- --check --color always";
-            };
-          };
-        };
     in
     rec {
+      checks = {
+        pre-commit =
+          let
+            # See https://github.com/cachix/pre-commit-hooks.nix/issues/126
+            rust-env = pkgs.buildEnv {
+              name = "rust-env";
+              buildInputs = [ pkgs.makeWrapper ];
+              paths = [ my-rust ];
+              pathsToLink = [ "/" "/bin" ];
+              postBuild = ''
+                for i in $out/bin/*; do
+                  wrapProgram "$i" --prefix PATH : "$out/bin"
+                done
+              '';
+            };
+          in
+          pre-commit-hooks.lib.${system}.run {
+            src = self;
+
+            hooks = {
+              clippy = {
+                enable = true;
+                entry = lib.mkForce "${rust-env}/bin/cargo-clippy clippy";
+              };
+
+              nixpkgs-fmt = {
+                enable = true;
+              };
+
+              rustfmt = {
+                enable = true;
+                entry = lib.mkForce "${rust-env}/bin/cargo-fmt fmt -- --check --color always";
+              };
+            };
+          };
+      };
 
       devShells = {
         default = pkgs.mkShell {
@@ -129,7 +131,7 @@
             my-rust
           ];
 
-          inherit (pre-commit) shellHook;
+          inherit (checks.pre-commit) shellHook;
 
           RUST_SRC_PATH = "${my-rust}/lib/rustlib/src/rust/library";
         };