From 3c54e850a32e4250c36bee3f118df977c3e8773d Mon Sep 17 00:00:00 2001
From: "Klaus T. Aehlig" <aehlig@linta.de>
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.json | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'etc/repos.json')

diff --git a/etc/repos.json b/etc/repos.json
index 3f419a3..4ac3809 100644
--- a/etc/repos.json
+++ b/etc/repos.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"
@@ -38,7 +32,7 @@
       { "type": "git"
       , "repository": "https://github.com/just-buildsystem/rules-rust"
       , "branch": "master"
-      , "commit": "9a4697a2c948a4bcb4a2232a371b6cb3c178e20b"
+      , "commit": "1a8211bda5c14ef0b2bff3af062c049d5598f02f"
       , "subdir": "rules"
       }
     }
@@ -155,7 +149,8 @@
     { "repository": "rules-rust"
     , "target_root": "defaults"
     , "rule_root": "rules-rust"
-    , "bindings": {"orig-rules": "rules-rust/nix"}
+    , "bindings": {"orig-rules": "rules-rust"}
+    , "target_file_name": "TARGETS.cargo_import"
     }
   }
 }
-- 
cgit v1.2.3