Merge pull request #221197 from r-ryantm/auto-update/codeql

codeql: 2.12.3 -> 2.12.4
This commit is contained in:
Weijia Wang
2023-03-18 17:31:59 +02:00
committed by GitHub
@@ -1,8 +1,8 @@
{ lib, stdenv, fetchzip, zlib, xorg, freetype, jdk11, curl }:
{ lib, stdenv, fetchzip, zlib, xorg, freetype, jdk17, curl }:
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.12.3";
version = "2.12.4";
dontConfigure = true;
dontBuild = true;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "sha256-xBTL3atnLsw7HWhkWq32LdQmSBtsQ2ydK+8On8l+OcA=";
sha256 = "sha256-Rmz35iyLXmNePHFVN8QmjeoKbR3eRy7nrY1FJpTfL7o=";
};
nativeBuildInputs = [
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
xorg.libXtst
xorg.libXrender
freetype
jdk11
jdk17
stdenv.cc.cc.lib
curl
];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
ln -sf $out/codeql/tools/linux64/lib64trace.so $out/codeql/tools/linux64/libtrace.so
sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java%\${jdk11}%g' $out/codeql/codeql
sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java%\${jdk17}%g' $out/codeql/codeql
ln -s $out/codeql/codeql $out/bin/
'';