diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-06-27 17:30:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-27 17:30:33 +0200 |
| commit | f46b8e21e0013eeb04a2944dc85be327a896ffe7 (patch) | |
| tree | 8997065bb29dcdd09fbe8f131680f2377c063e70 /etc/generate-repos.sh | |
| parent | 05b2d6fc51146fe07340a58bc87fbbd99e788143 (diff) | |
| parent | 3c54e850a32e4250c36bee3f118df977c3e8773d (diff) | |
| download | hello-nix-f46b8e21e0013eeb04a2944dc85be327a896ffe7.tar.gz | |
Merge pull request #4 from aehlig/simplify-cargo-import
Simplify cargo import
Diffstat (limited to 'etc/generate-repos.sh')
| -rwxr-xr-x | etc/generate-repos.sh | 7 |
1 files changed, 3 insertions, 4 deletions
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 |