From 9681a86ac1ec3866e946c49bc7d9b74f8e16bd5e Mon Sep 17 00:00:00 2001 From: Smaug123 <3138005+Smaug123@users.noreply.github.com> Date: Sun, 14 Jul 2024 14:58:58 +0100 Subject: [PATCH] Add cargo-fmt --- .woodpecker/.build.yml | 2 +- flake.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 37c2c4b..89c8772 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -4,7 +4,7 @@ steps: commands: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf # Lint - - nix develop --command cargo -- fmt --all -- --check + - nix develop .#ci --command cargo -- fmt --all -- --check - nix develop --command cargo -- clippy -- -D warnings -W clippy::must_use_candidate - nix develop .#ci --command alejandra -- --check . - nix develop .#ci --command markdown-link-check README.md diff --git a/flake.nix b/flake.nix index 6a9a294..c276a0e 100644 --- a/flake.nix +++ b/flake.nix @@ -63,7 +63,7 @@ }; # Configuration for the non-Rust dependencies - buildInputs = with pkgs; [openssl.dev]; + buildInputs = [pkgs.openssl.dev]; nativeBuildInputs = with pkgs; [rustc cargo pkg-config]; buildEnvVars = { PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig"; @@ -86,7 +86,7 @@ ci = pkgs.mkShell { inherit nativeBuildInputs; - buildInputs = [pkgs.nodePackages.markdown-link-check pkgs.alejandra] ++ buildInputs; + buildInputs = [pkgs.cargo-fmt pkgs.nodePackages.markdown-link-check pkgs.alejandra] ++ buildInputs; RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}"; } // buildEnvVars;