diff options
| author | Klaus T. Aehlig <aehlig@linta.de> | 2024-06-27 16:34:42 +0200 |
|---|---|---|
| committer | Klaus T. Aehlig <aehlig@linta.de> | 2024-06-27 16:46:40 +0200 |
| commit | 3c54e850a32e4250c36bee3f118df977c3e8773d (patch) | |
| tree | 8997065bb29dcdd09fbe8f131680f2377c063e70 /etc/repos.template.json | |
| parent | 866e07a8baa21707ec73109b6e502af4fe4c41bf (diff) | |
| download | hello-nix-3c54e850a32e4250c36bee3f118df977c3e8773d.tar.gz | |
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.
Diffstat (limited to 'etc/repos.template.json')
| -rw-r--r-- | etc/repos.template.json | 8 |
1 files changed, 1 insertions, 7 deletions
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" |