Merge pull request #136592 from hmac/hmac/update-codeql

This commit is contained in:
Sandro 2021-10-07 19:17:15 +02:00 committed by GitHub
commit ac96a27f7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,18 +1,8 @@
{ lib, stdenv
, fetchzip
, zlib
, xorg
, freetype
, alsa-lib
, jdk11
, curl
, lttng-ust
, autoPatchelfHook
}:
{ lib, stdenv, fetchzip, zlib, xorg, freetype, jdk11, curl, autoPatchelfHook }:
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.5.9";
version = "2.6.2";
dontConfigure = true;
dontBuild = true;
@ -20,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "sha256-r3Jm+VYjn0Dz4BCSbADbgTWL1owbyIXlkoj6mOmZcZk=";
sha256 = "096w9w52rj854i7rmpgy99k9z9ja2dfvj2d02dnpagwd7pc6a6bl";
};
nativeBuildInputs = [
@ -31,12 +21,9 @@ stdenv.mkDerivation rec {
xorg.libXtst
xorg.libXrender
freetype
alsa-lib
jdk11
stdenv.cc.cc.lib
curl
lttng-ust
autoPatchelfHook
];
installPhase = ''
@ -47,14 +34,14 @@ 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/bin/java";"${jdk11}/bin/java";' $out/codeql/codeql
sed -i 's%\$CODEQL_DIST/tools/\$CODEQL_PLATFORM/java%\${jdk11}%g' $out/codeql/codeql
ln -s $out/codeql/codeql $out/bin/
'';
meta = with lib; {
description = "Semantic code analysis engine";
homepage = "https://semmle.com/codeql";
homepage = "https://codeql.github.com";
maintainers = [ maintainers.dump_stack ];
license = licenses.unfree;
};