ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

nix: s/rust-version/ourRustVersion/g

Browse source 
This naming is just more consistent with the surrounding code.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2024-02-24 17:35:17 -06:00 committed by Martin von Zweigbergk
parent 1d4860c9b5
commit 29e959d18c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.nix
View file

@ -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
@ -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"