diff options
| -rwxr-xr-x | etc/generate-repos.sh | 1 | ||||
| -rw-r--r-- | nix-import-tools/import-tools.nix | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/etc/generate-repos.sh b/etc/generate-repos.sh index 8bd1ca6..39f4d4e 100755 --- a/etc/generate-repos.sh +++ b/etc/generate-repos.sh @@ -12,4 +12,5 @@ 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-deduplicate-repos \ | hdump > ${ROOT}/etc/repos.json diff --git a/nix-import-tools/import-tools.nix b/nix-import-tools/import-tools.nix index cfb7a91..b12023b 100644 --- a/nix-import-tools/import-tools.nix +++ b/nix-import-tools/import-tools.nix @@ -26,7 +26,9 @@ stdenv.mkDerivation rec { unpackPhase = '' cp $srcjust/bin/just-import-git.py . + cp $srcjust/bin/just-deduplicate-repos.py . cp $srcrustrules/bin/hdump.py . + cp $srcrustrules/bin/just-import-cargo.py . ''; dontBuild = true; @@ -34,8 +36,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp just-import-git.py $out/bin/just-import-git + cp just-deduplicate-repos.py $out/bin/just-deduplicate-repos cp hdump.py $out/bin/hdump - chmod 555 $out/bin/just-import-git $out/bin/hdump + cp just-import-cargo.py $out/bin/just-import-cargo + chmod 555 $out/bin/just-import-git $out/bin/just-deduplicate-repos + chmod 555 $out/bin/hdump $out/bin/just-import-cargo ''; } |