chore(nix): update flake lock & fix devshell+package (#1805)

This commit is contained in:
Jasmine Lowen 🦁
2026-02-15 11:01:58 +01:00
committed by GitHub
parent c7f1a18cc5
commit bffeacf1d2
3 changed files with 39 additions and 5 deletions

5
.gitignore vendored
View File

@@ -39,4 +39,7 @@ artifacts/
PR_DESCRIPTION.md
IMPLEMENTATION_PLAN.md
scripts/s3-tests/selected_tests.txt
docs
docs
# nix stuff
result*

2
flake.lock generated
View File

@@ -45,4 +45,4 @@
},
"root": "root",
"version": 7
}
}

View File

@@ -76,9 +76,9 @@
buildInputs = with pkgs; [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
pkgs.darwin.apple_sdk.frameworks.Security
pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
];
cargoBuildFlags = [
@@ -100,5 +100,36 @@
};
}
);
devShells = forAllSystems (
system:
let
overlays = [ (import rust-overlay) ];
pkgs = import nixpkgs { inherit system overlays; };
rustToolchain = pkgs.rust-bin.stable.latest.default.override {
extensions = [
"rust-src"
"rust-analyzer"
"clippy"
"rustfmt"
];
};
in
{
default = pkgs.mkShell {
packages = [
rustToolchain
pkgs.pkg-config
pkgs.protobuf
pkgs.openssl
] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
pkgs.darwin.apple_sdk.frameworks.Security
pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
];
PROTOC = "${pkgs.protobuf}/bin/protoc";
};
}
);
};
}