git.iko.soy/helix
on master help sign in
Build flake packages with stable Rust (#8133)
7cf775dMichael Davis
flake.nix+10−9
compare with master
unifiedsplit
@@ -121,7 +121,8 @@
121 then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
121 then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
122 else "$RUSTFLAGS";
122 else "$RUSTFLAGS";
123 rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
123 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;
125 commonArgs =
126 commonArgs =
126 {
127 {
127 inherit stdenv;
128 inherit stdenv;
@@ -133,13 +134,13 @@
133 doCheck = false;
134 doCheck = false;
134 meta.mainProgram = "hx";
135 meta.mainProgram = "hx";
135 }
136 }
136− // craneLib.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;};
137+ // craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;};
137− cargoArtifacts = craneLib.buildDepsOnly commonArgs;
138+ cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs;
138 in {
139 in {
139 packages = {
140 packages = {
140− helix-unwrapped = craneLib.buildPackage (commonArgs
141+ helix-unwrapped = craneLibStable.buildPackage (commonArgs
141 // {
142 // {
142− inherit cargoArtifacts;
143+ cargoArtifacts = craneLibStable.buildDepsOnly commonArgs;
143 postInstall = ''
144 postInstall = ''
144 mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/256x256/apps
145 mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/256x256/apps
145 cp contrib/Helix.desktop $out/share/applications
146 cp contrib/Helix.desktop $out/share/applications
@@ -155,20 +156,20 @@
155 # Build the crate itself
156 # Build the crate itself
156 inherit (self.packages.${system}) helix;
157 inherit (self.packages.${system}) helix;
157
158
158− clippy = craneLib.cargoClippy (commonArgs
159+ clippy = craneLibMSRV.cargoClippy (commonArgs
159 // {
160 // {
160 inherit cargoArtifacts;
161 inherit cargoArtifacts;
161 cargoClippyExtraArgs = "--all-targets -- --deny warnings";
162 cargoClippyExtraArgs = "--all-targets -- --deny warnings";
162 });
163 });
163
164
164− fmt = craneLib.cargoFmt commonArgs;
165+ fmt = craneLibMSRV.cargoFmt commonArgs;
165
166
166− doc = craneLib.cargoDoc (commonArgs
167+ doc = craneLibMSRV.cargoDoc (commonArgs
167 // {
168 // {
168 inherit cargoArtifacts;
169 inherit cargoArtifacts;
169 });
170 });
170
171
171− test = craneLib.cargoTest (commonArgs
172+ test = craneLibMSRV.cargoTest (commonArgs
172 // {
173 // {
173 inherit cargoArtifacts;
174 inherit cargoArtifacts;
174 });
175 });