Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update toolchain folder path #44

Merged
merged 1 commit into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
inherit (pkgs) lib;

# Language toolchains
rustToolchain = pkgs.callPackage ./dev/rust-toolchain.nix { inherit fenix versatus; };
haskellToolchain = pkgs.callPackage ./dev/haskell-toolchain.nix pkgs;
rustToolchain = pkgs.callPackage ./toolchains/rust-toolchain.nix { inherit fenix versatus; };
haskellToolchain = pkgs.callPackage ./toolchains/haskell-toolchain.nix pkgs;

# Overrides the default crane rust-toolchain with fenix.
craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain.fenix-pkgs;
Expand Down Expand Up @@ -332,7 +332,7 @@
rust = final: prev: {
# This contains a lot of policy decisions which rust toolchain is used
craneLib = (self.inputs.crane.mkLib prev).overrideToolchain final.rustToolchain.fenix-pkgs;
rustToolchain = prev.callPackage ./dev/rust-toolchain.nix {
rustToolchain = prev.callPackage ./toolchains/rust-toolchain.nix {
inherit (self.inputs) fenix versatus;
};

Expand Down
File renamed without changes.
File renamed without changes.
Loading