@@ -121,7 +121,8 @@
121121 then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
122122 else "$RUSTFLAGS";
123123 rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
124− craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
124+ craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain;
125+ craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;
125126 commonArgs =
126127 {
127128 inherit stdenv;
@@ -133,13 +134,13 @@
133134 doCheck = false;
134135 meta.mainProgram = "hx";
135136 }
136− // craneLib.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;};
137− cargoArtifacts = craneLib.buildDepsOnly commonArgs;
137+ // craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;};
138+ cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs;
138139 in {
139140 packages = {
140− helix-unwrapped = craneLib.buildPackage (commonArgs
141+ helix-unwrapped = craneLibStable.buildPackage (commonArgs
141142 // {
142− inherit cargoArtifacts;
143+ cargoArtifacts = craneLibStable.buildDepsOnly commonArgs;
143144 postInstall = ''
144145 mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/256x256/apps
145146 cp contrib/Helix.desktop $out/share/applications
@@ -155,20 +156,20 @@
155156 # Build the crate itself
156157 inherit (self.packages.${system}) helix;
157158
158− clippy = craneLib.cargoClippy (commonArgs
159+ clippy = craneLibMSRV.cargoClippy (commonArgs
159160 // {
160161 inherit cargoArtifacts;
161162 cargoClippyExtraArgs = "--all-targets -- --deny warnings";
162163 });
163164
164− fmt = craneLib.cargoFmt commonArgs;
165+ fmt = craneLibMSRV.cargoFmt commonArgs;
165166
166− doc = craneLib.cargoDoc (commonArgs
167+ doc = craneLibMSRV.cargoDoc (commonArgs
167168 // {
168169 inherit cargoArtifacts;
169170 });
170171
171− test = craneLib.cargoTest (commonArgs
172+ test = craneLibMSRV.cargoTest (commonArgs
172173 // {
173174 inherit cargoArtifacts;
174175 });