robin/mill-scale
1
0
Fork 0
mirror of https://codeberg.org/icewind/mill-scale.git synced 2026-06-03 09:54:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix cargo-semver-checks toolchain version

Browse source
This commit is contained in:
Robin Appelman 2025-10-19 15:41:41 +02:00
commit f48e7501a7
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mill-scale.nix
View file

@ -142,6 +142,11 @@ in
default = pkgs: pkgs.rust-bin.stable.${msrv}.default; default = pkgs: pkgs.rust-bin.stable.${msrv}.default;
description = "rust toolchain to use for msrv check"; description = "rust toolchain to use for msrv check";
}; };
semverToolchain = mkOption {
type = function;
default = pkgs: pkgs.rust-bin.stable."1.86.0".default;
description = "rust toolchain to use for cargo-semver-checks";
};
miriToolchain = mkOption { miriToolchain = mkOption {
type = function; type = function;
default = pkgs: default = pkgs:
@ -216,6 +221,8 @@ in
rustToolchain = config.toolchain prev; rustToolchain = config.toolchain prev;
msrvRustToolchain = config.msrvToolchain prev; msrvRustToolchain = config.msrvToolchain prev;
miriRustToolchain = config.miriToolchain prev; miriRustToolchain = config.miriToolchain prev;
msrvToolchain = config.msrvToolchain prev;
semverToolchain = config.semverToolchain prev;
cargo-expand = writeShellApplication { cargo-expand = writeShellApplication {
name = "cargo-expand"; name = "cargo-expand";
runtimeInputs = [prev.cargo-expand]; runtimeInputs = [prev.cargo-expand];
@ -392,6 +399,7 @@ in
cargo-miri, cargo-miri,
cargo-semver-checks, cargo-semver-checks,
rustToolchain, rustToolchain,
semverToolchain,
miriRustToolchain, miriRustToolchain,
writeShellApplication, writeShellApplication,
... ...
@ -409,7 +417,7 @@ in
}; };
semver-checks-wrapped = writeShellApplication { semver-checks-wrapped = writeShellApplication {
name = "cargo-semver-checks"; name = "cargo-semver-checks";
runtimeInputs = [cargo-semver-checks rustToolchain] ++ deps; runtimeInputs = [cargo-semver-checks semverToolchain] ++ deps;
text = '' text = ''
PKG_CONFIG_PATH=${makePkgConfigPath deps} cargo-semver-checks "$@" PKG_CONFIG_PATH=${makePkgConfigPath deps} cargo-semver-checks "$@"
''; '';