Skip to content

Commit

Permalink
build: update rust
Browse files Browse the repository at this point in the history
  • Loading branch information
SergioRibera committed Aug 29, 2024
1 parent 6666bd5 commit 525b972
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 30 deletions.
36 changes: 18 additions & 18 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ in
# toolchain = fenix.${system}.fromToolchainFile { dir = ./..; };
toolchain = fenix.${system}.fromToolchainFile {
file = ./../rust-toolchain.toml;
sha256 = "sha256-SXRtAuO4IqNOQq+nLbrsDFbVk+3aVA8NNpSZsKlVH/8=";
sha256 = "sha256-3jVIIf5XPnUU1CRaTyAiO0XHVbJl12MSx3eucTXCjtE=";
};
# crane: cargo and artifacts manager
craneLib = crane.${system}.overrideToolchain toolchain;
# cranix: extends crane building system with workspace bin building and Mold + Cranelift integrations
cranixLib = craneLib.overrideScope' (cranix.${system}.craneOverride);
cranixLib = craneLib.overrideScope (cranix.${system}.craneOverride);

# buildInputs for SSS
buildInputs = with pkgs; [
Expand Down
13 changes: 3 additions & 10 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
[toolchain]
channel = "1.75.0"
profile = "default"
components = [
"rust-analyzer",
"rustc",
"cargo",
"clippy",
"rustfmt",
"rust-std",
]
channel = "stable"
profile = "minimal"
components = ["rustc", "cargo", "clippy", "rustfmt", "rust-std"]

0 comments on commit 525b972

Please sign in to comment.