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/generate-repos.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'etc/generate-repos.sh')

diff --git a/etc/generate-repos.sh b/etc/generate-repos.sh
index d8cd187..4235fd0 100755
--- a/etc/generate-repos.sh
+++ b/etc/generate-repos.sh
@@ -9,14 +9,13 @@ readonly ROOT=$(readlink -f $(dirname $0)/..)
 : ${RULES_RUST_BRANCH:=master}
 
 # remove files generated by just-import-cargo
-rm -rf etc/deps-rust etc/defaults/rust/TARGETS # common to all cargo imports
-rm -f src/rust/cargo/circle/Cargo.lock src/rust/cargo/circle/TARGETS
+rm -rf etc/deps-rust etc/defaults/rust/TARGETS.cargo_import # common to all cargo imports
+rm -f src/rust/cargo/circle/Cargo.lock src/rust/cargo/circle/TARGETS # crate
 
 just-import-git -C ${ROOT}/etc/repos.template.json \
                 --as rules -b ${RULES_CC_BRANCH} ${RULES_CC_REPO} rules \
     | just-import-git -C - \
                 --as rules-rust -b ${RULES_RUST_BRANCH} ${RULES_RUST_REPO} rules-rust \
-    | just-import-cargo --rules rules-rust/nix --repo-root ${ROOT} -rst \
-                src/rust/cargo/circle \
+    | just-import-cargo --repo-root ${ROOT} -rst src/rust/cargo/circle \
     | just-deduplicate-repos \
     | hdump > ${ROOT}/etc/repos.json
-- 
cgit v1.2.3