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

automatically add cargo-insta if used
Some checks failed
CI / checks (push) Has been cancelled
Details

Browse source
This commit is contained in:
Robin Appelman 2025-02-28 23:49:44 +01:00
commit 591ea924cf
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cargo-meta.nix
View file

@ -13,4 +13,6 @@ in
hasNonDefaultFeatures = hasFeatures && (defaultFeatures != nonDefaultFeatures); hasNonDefaultFeatures = hasFeatures && (defaultFeatures != nonDefaultFeatures);
hasDefaultFeatures = cargoToml ? features && cargoToml.features ? default; hasDefaultFeatures = cargoToml ? features && cargoToml.features ? default;
msrv = assert assertMsg hasMsrv ''"rust-version" not set in Cargo.toml''; tomlPackage.rust-version; msrv = assert assertMsg hasMsrv ''"rust-version" not set in Cargo.toml''; tomlPackage.rust-version;
dependencies = attrNames (cargoToml.dependencies or {});
dev-dependencies = attrNames (cargoToml.dev-dependencies or {});
} }

6
mill-scale.nix
View file

@ -10,7 +10,7 @@
... ...
}: let }: let
inherit (builtins) elem readFile pathExists match any; inherit (builtins) elem readFile pathExists match any;
inherit (lib) getExe map mkDefault mkIf mkMerge mkOption warnIf optionalAttrs types optionalString genAttrs hasInfix; inherit (lib) getExe map mkDefault mkIf mkMerge mkOption warnIf optionalAttrs types optionalString genAttrs hasInfix optionals;
inherit (lib.fileset) fileFilter toSource unions; inherit (lib.fileset) fileFilter toSource unions;
inherit (flakelight.types) fileset function optFunctionTo; inherit (flakelight.types) fileset function optFunctionTo;
@ -39,6 +39,7 @@
LD_LIBRARY_PATH = "/run/opengl-driver/lib/:${lib.makeLibraryPath runtimeInputs}"; LD_LIBRARY_PATH = "/run/opengl-driver/lib/:${lib.makeLibraryPath runtimeInputs}";
}; };
}; };
autoTools = pkgs: optionals (elem "insta" cargoMeta.dev-dependencies) [pkgs.cargo-insta];
in in
warnIf (! builtins ? readFileType) "Unsupported Nix version in use." warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
{ {
@ -367,6 +368,7 @@ in
with pkgs; with pkgs;
[rustToolchain] [rustToolchain]
++ (config.tools pkgs) ++ (config.tools pkgs)
++ (autoTools pkgs)
++ (buildDeps pkgs).buildInputs ++ (buildDeps pkgs).buildInputs
++ (buildDeps pkgs).nativeBuildInputs; ++ (buildDeps pkgs).nativeBuildInputs;
@ -385,6 +387,7 @@ in
with pkgs; with pkgs;
[miriRustToolchain] [miriRustToolchain]
++ (config.tools pkgs) ++ (config.tools pkgs)
++ (autoTools pkgs)
++ (buildDeps pkgs).buildInputs ++ (buildDeps pkgs).buildInputs
++ (buildDeps pkgs).nativeBuildInputs; ++ (buildDeps pkgs).nativeBuildInputs;
@ -397,6 +400,7 @@ in
with pkgs; with pkgs;
[msrvRustToolchain] [msrvRustToolchain]
++ (config.tools pkgs) ++ (config.tools pkgs)
++ (autoTools pkgs)
++ (buildDeps pkgs).buildInputs ++ (buildDeps pkgs).buildInputs
++ (buildDeps pkgs).nativeBuildInputs; ++ (buildDeps pkgs).nativeBuildInputs;