Skip to content

Fix channel detection for rust-toolchain.toml #343

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.

Sign up for GitHub

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

Open
scholzp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix channel detection for rust-toolchain.toml #343

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion rust-overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,17 @@ let
# Parse *.toml files as TOML
else if self.lib.strings.hasSuffix ".toml" file then
({ channel ? null, date ? null, ... }: { inherit channel date; })
(fromTOML (readFile file)).toolchain
(let
channel_regex = "(stable|beta|nightly).*";
date_regex = ".*([0-9]{4}-[0-9]{2}-[0-9]{2})";
toolchain = (fromTOML (readFile file)).toolchain;
channel_str = toolchain.channel;
channel = head (match channel_regex channel_str);
date = head (match date_regex channel_str);
in {
inherit channel;
inherit date;
})
else
# Otherwise, assume the file contains just a rust version string
let
Expand Down