Skip to content

Commit e0841eb

Browse files
committed
Remove dependency on CodeQL CLI
The CLI was only used to format the generated library. We will skip that for now.
1 parent e68fb0e commit e0841eb

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

scripts/codeql/ql-extractor/0.0.1.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
{ stdenv, lib, fetchFromGitHub, rustPlatform, gh, libiconv, which, jq, codeql-cli_2_16_0}:
1+
{ stdenv, lib, fetchFromGitHub, rustPlatform, gh, libiconv, which, jq}:
22

3-
rustPlatform.buildRustPackage rec {
3+
rustPlatform.buildRustPackage rec {
44
pname = "codeql-ql-extractor";
55
version = "0.0.1";
6-
6+
77
dontConfigure = true;
88
dontStrip = true;
99

@@ -25,15 +25,14 @@ rustPlatform.buildRustPackage rec {
2525
};
2626
};
2727

28-
nativeBuildInputs = [ gh libiconv which codeql-cli_2_16_0 jq];
28+
nativeBuildInputs = [ gh libiconv which jq];
2929

3030
platform = if stdenv.isLinux then "linux64" else "osx64";
3131

3232
installPhase = ''
3333
runHook preInstall
3434
mkdir -p $out/tools/$platform
3535
cargo run --profile release --bin codeql-extractor-ql -- generate --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
36-
codeql query format -i ql/src/codeql_ql/ast/internal/TreeSitter.qll
3736
# For some reason the fixupPhase isn't working, so we do it manually
3837
patchShebangs tools/
3938
cp -r codeql-extractor.yml tools ql/src/ql.dbscheme ql/src/ql.dbscheme.stats $out/

0 commit comments

Comments
 (0)