Remove dependency on CodeQL CLI

rvermeulen · rvermeulen · commit e0841ebadd6c · 2024-01-26T16:58:50.000-08:00
The CLI was only used to format the generated library.
We will skip that for now.
diff --git a/scripts/codeql/ql-extractor/0.0.1.nix b/scripts/codeql/ql-extractor/0.0.1.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, gh, libiconv, which, jq, codeql-cli_2_16_0}:
+{ stdenv, lib, fetchFromGitHub, rustPlatform, gh, libiconv, which, jq}:
 
-rustPlatform.buildRustPackage rec { 
+rustPlatform.buildRustPackage rec {
     pname = "codeql-ql-extractor";
     version = "0.0.1";
-  
+
     dontConfigure = true;
     dontStrip = true;
 
@@ -25,15 +25,14 @@ rustPlatform.buildRustPackage rec {
         };
     };
 
-    nativeBuildInputs = [ gh libiconv which codeql-cli_2_16_0 jq]; 
+    nativeBuildInputs = [ gh libiconv which jq];
 
     platform = if stdenv.isLinux then "linux64" else "osx64";
 
     installPhase = ''
         runHook preInstall
         mkdir -p $out/tools/$platform
         cargo run --profile release --bin codeql-extractor-ql -- generate --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
-        codeql query format -i ql/src/codeql_ql/ast/internal/TreeSitter.qll
         # For some reason the fixupPhase isn't working, so we do it manually
         patchShebangs tools/
         cp -r codeql-extractor.yml tools ql/src/ql.dbscheme ql/src/ql.dbscheme.stats $out/
