diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-10-07 19:17:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-07 19:17:15 +0200 |
commit | ac96a27f7a4ad98bda56816fbe3091de6b80460e (patch) | |
tree | 6da2325c7133d1c1febd117d54f896ceeb4ae076 | |
parent | a93c568521d9b64a62f4309996df6c1ba12fc33d (diff) | |
parent | 1d369f09634308b9a5a4603a88ea52014b537767 (diff) | |
download | nixpkgs-ac96a27f7a4ad98bda56816fbe3091de6b80460e.tar nixpkgs-ac96a27f7a4ad98bda56816fbe3091de6b80460e.tar.gz nixpkgs-ac96a27f7a4ad98bda56816fbe3091de6b80460e.tar.bz2 nixpkgs-ac96a27f7a4ad98bda56816fbe3091de6b80460e.tar.lz nixpkgs-ac96a27f7a4ad98bda56816fbe3091de6b80460e.tar.xz nixpkgs-ac96a27f7a4ad98bda56816fbe3091de6b80460e.tar.zst nixpkgs-ac96a27f7a4ad98bda56816fbe3091de6b80460e.zip |
Merge pull request #136592 from hmac/hmac/update-codeql
-rw-r--r-- | pkgs/development/tools/analysis/codeql/default.nix | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index a4c51121cd5..52169ccab11 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -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; }; |