From 3c54e850a32e4250c36bee3f118df977c3e8773d Mon Sep 17 00:00:00 2001 From: "Klaus T. Aehlig" Date: Thu, 27 Jun 2024 16:34:42 +0200 Subject: Update just-import-cargo, update just dependencies, and clean up - With the new naming convention of just-import-cargo, there is no longer the conflict on the file etc/defulta/rust/TARGETS. - With the new version of the upstream rust rules, we can use the defaults target directly, as it fully honors TOOLCHAIN_CONFIG[RUST]. - With that simplification in place, we don't have to point just-import-cargo to rules-rust anymore, as for the default-imported rules, the TOOLCHAIN_CONFIG is honored as well. --- etc/repos.template.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'etc/repos.template.json') diff --git a/etc/repos.template.json b/etc/repos.template.json index 1b898be..33e6acc 100644 --- a/etc/repos.template.json +++ b/etc/repos.template.json @@ -1,7 +1,7 @@ { "repositories": { "": { "repository": {"type": "file", "path": "src"} - , "bindings": {"rules": "rules/nix", "rust": "rules-rust/nix"} + , "bindings": {"rules": "rules/nix", "rust": "rules-rust"} } , "test": { "repository": {"type": "file", "path": "test"} @@ -11,12 +11,6 @@ , "defaults": {"repository": {"type": "file", "path": "etc/defaults"}} , "rules/nix": {"repository": "rules", "target_root": "defaults", "rule_root": "rules"} - , "rules-rust/nix": - { "repository": "rules-rust" - , "target_root": "defaults" - , "rule_root": "rules-rust" - , "target_file_name": "nix.TARGETS" - } , "rules/nix-test": { "repository": "rules" , "target_root": "defaults" -- cgit v1.2.3