Deuxfleurs/garage
31
60
Fork 80
Code Issues 100 Pull requests 17 Releases 30 Wiki Activity

nix & ci fixes
All checks were successful
ci/woodpecker/pr/debug Pipeline was successful
Details
ci/woodpecker/push/debug Pipeline was successful
Details

Browse source
This commit is contained in:
Alex 2025-02-03 15:55:21 +01:00
parent edc40242a4
commit 4f04550664
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.woodpecker/debug.yaml
View file

@ -8,7 +8,7 @@ when:
- manual - manual
steps: steps:
- name: fmt - name: check formatting
image: nixpkgs/nix:nixos-22.05 image: nixpkgs/nix:nixos-22.05
commands: commands:
- nix-shell --attr devShell --run "cargo fmt -- --check" - nix-shell --attr devShell --run "cargo fmt -- --check"

7
flake.lock generated
View file

@ -80,16 +80,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738376888, "lastModified": 1736649126,
"narHash": "sha256-S6ErHxkSm0iA7ZMsjjDaASWxbELYcdfv8BhOkkj1rHw=", "narHash": "sha256-XCw5sv/ePsroqiF3lJM6Y2X9EhPdHeE47gr3Q8b0UQw=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "83284068670d5ae4a43641c4afb150f3446be70d", "rev": "162ab0edc2936508470199b2e8e6c444a2535019",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "162ab0edc2936508470199b2e8e6c444a2535019",
"type": "github" "type": "github"
} }
}, },

14
flake.nix
View file

@ -6,14 +6,15 @@
inputs.nixpkgs.url = inputs.nixpkgs.url =
"github:NixOS/nixpkgs/7c4869c47090dd7f9f1bdfb49a22aea026996815"; "github:NixOS/nixpkgs/7c4869c47090dd7f9f1bdfb49a22aea026996815";
inputs.flake-compat.url = "github:nix-community/flake-compat"; # Rust overlay as of 2025-01-12
inputs.rust-overlay.url =
inputs.flake-utils.url = "github:numtide/flake-utils"; "github:oxalica/rust-overlay/162ab0edc2936508470199b2e8e6c444a2535019";
inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
inputs.crane.url = "github:ipetkov/crane"; inputs.crane.url = "github:ipetkov/crane";
inputs.rust-overlay.url = "github:oxalica/rust-overlay"; inputs.flake-compat.url = "github:nix-community/flake-compat";
inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.url = "github:numtide/flake-utils";
outputs = { self, nixpkgs, flake-utils, crane, rust-overlay, ... }: outputs = { self, nixpkgs, flake-utils, crane, rust-overlay, ... }:
let let
@ -68,6 +69,9 @@
full = pkgs.mkShell { full = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
targets.toolchain targets.toolchain
protobuf
clang
mold
# ---- extra packages for dev tasks ---- # ---- extra packages for dev tasks ----
rust-analyzer rust-analyzer
cargo-audit cargo-audit