Rename derivatives and include QL for QL pack.

rvermeulen · rvermeulen · commit 3fbd6a64776d · 2024-01-26T17:03:29.000-08:00
diff --git a/scripts/codeql/default.nix b/scripts/codeql/default.nix
@@ -2,8 +2,8 @@ let
     pkgs = import <nixpkgs> {};
 in
 rec {
-    ql-extractor_0_0_1 = pkgs.callPackage ./ql-extractor/0.0.1.nix {inherit codeql-cli_2_16_0;};
-    codeql-cli_2_16_0 = pkgs.callPackage ./codeql-cli/2.16.0.nix {};
-    codeql-cli_2_16_0_with_ql_extractor = pkgs.callPackage ./codeql-cli/2.16.0.nix { withQlExtractor = ql-extractor_0_0_1; };
-
+    ql-extractor-0_0_1 = pkgs.callPackage ./ql-extractor/0.0.1.nix {};
+    codeql-cli-2_16_0 = pkgs.callPackage ./codeql-cli/2.16.0.nix {};
+    codeql-ql-0_0_1-dev = pkgs.callPackage ./codeql-ql/0.0.1-dev.nix { withCodeQlCli = codeql-cli-2_16_0; };
+    codeql-cli-2_16_0-with-ql = pkgs.callPackage ./codeql-cli/2.16.0.nix { withExtractors = [ql-extractor-0_0_1]; withPacks = [codeql-ql-0_0_1-dev];};
 }
diff --git a/scripts/codeql/ql-extractor/default.nix b/scripts/codeql/ql-extractor/default.nix
@@ -2,5 +2,5 @@ let
     pkgs = import <nixpkgs> {};
 in
 {
-    ql-extractor_0_0_1 = pkgs.callPackage ./0.0.1.nix {};
+    ql-extractor-0_0_1 = pkgs.callPackage ./0.0.1.nix {};
 }
diff --git a/shell.nix b/shell.nix
@@ -8,8 +8,8 @@ pkgs.mkShell {
     clang-tools_14
     python39
     git
-    gh 
+    gh
     jq
-    codeql-cli_2_16_0_with_ql_extractor
+    codeql-cli-2_16_0-with-ql
   ];
 }

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ let`
`2`	`2`	`pkgs = import <nixpkgs> {};`
`3`	`3`	`in`
`4`	`4`	`{`
`5`		`- ql-extractor_0_0_1 = pkgs.callPackage ./0.0.1.nix {};`
	`5`	`+ ql-extractor-0_0_1 = pkgs.callPackage ./0.0.1.nix {};`
`6`	`6`	`}`