Skip to content

Commit

Permalink
nix: s/rust-version/ourRustVersion/g
Browse files Browse the repository at this point in the history
This naming is just more consistent with the surrounding code.

Signed-off-by: Austin Seipp <[email protected]>
  • Loading branch information
thoughtpolice authored and martinvonz committed Feb 28, 2024
1 parent 1d4860c commit 29e959d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
pkgs.lib.all (re: builtins.match re relPath == null) regexes;
};

rust-version = pkgs.rust-bin.stable."1.76.0".default;
ourRustVersion = pkgs.rust-bin.stable."1.76.0".default;

ourRustPlatform = pkgs.makeRustPlatform {
rustc = rust-version;
cargo = rust-version;
rustc = ourRustVersion;
cargo = ourRustVersion;
};

# these are needed in both devShell and buildInputs
Expand Down Expand Up @@ -137,14 +137,14 @@
devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [
# The CI checks against the latest nightly rustfmt, so we should too.
# NOTE (aseipp): include this FIRST before the rust-version override
# below; otherwise, it will be overridden by the rust-version and
# NOTE (aseipp): include this FIRST before the ourRustVersion override
# below; otherwise, it will be overridden by the ourRustVersion and
# we'll get stable rustfmt instead.
(rust-bin.selectLatestNightlyWith (toolchain: toolchain.rustfmt))

# Using the minimal profile with explicit "clippy" extension to avoid
# two versions of rustfmt
(rust-version.override {
(ourRustVersion.override {
extensions = [
"rust-src" # for rust-analyzer
"clippy"
Expand Down

0 comments on commit 29e959d

Please sign in to comment.