diff --git a/.woodpecker/debug.yaml b/.woodpecker/debug.yaml index b6603bc3..65dab9ab 100644 --- a/.woodpecker/debug.yaml +++ b/.woodpecker/debug.yaml @@ -8,7 +8,7 @@ when: - manual steps: - - name: fmt + - name: check formatting image: nixpkgs/nix:nixos-22.05 commands: - nix-shell --attr devShell --run "cargo fmt -- --check" diff --git a/flake.lock b/flake.lock index 59ff5c67..aff248fe 100644 --- a/flake.lock +++ b/flake.lock @@ -80,16 +80,17 @@ ] }, "locked": { - "lastModified": 1738376888, - "narHash": "sha256-S6ErHxkSm0iA7ZMsjjDaASWxbELYcdfv8BhOkkj1rHw=", + "lastModified": 1736649126, + "narHash": "sha256-XCw5sv/ePsroqiF3lJM6Y2X9EhPdHeE47gr3Q8b0UQw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "83284068670d5ae4a43641c4afb150f3446be70d", + "rev": "162ab0edc2936508470199b2e8e6c444a2535019", "type": "github" }, "original": { "owner": "oxalica", "repo": "rust-overlay", + "rev": "162ab0edc2936508470199b2e8e6c444a2535019", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 2675b303..ccaeba29 100644 --- a/flake.nix +++ b/flake.nix @@ -6,14 +6,15 @@ inputs.nixpkgs.url = "github:NixOS/nixpkgs/7c4869c47090dd7f9f1bdfb49a22aea026996815"; - inputs.flake-compat.url = "github:nix-community/flake-compat"; - - inputs.flake-utils.url = "github:numtide/flake-utils"; + # Rust overlay as of 2025-01-12 + inputs.rust-overlay.url = + "github:oxalica/rust-overlay/162ab0edc2936508470199b2e8e6c444a2535019"; + inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; inputs.crane.url = "github:ipetkov/crane"; - inputs.rust-overlay.url = "github:oxalica/rust-overlay"; - inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-compat.url = "github:nix-community/flake-compat"; + inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, flake-utils, crane, rust-overlay, ... }: let @@ -68,6 +69,9 @@ full = pkgs.mkShell { buildInputs = with pkgs; [ targets.toolchain + protobuf + clang + mold # ---- extra packages for dev tasks ---- rust-analyzer cargo-audit