diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/analysis')
9 files changed, 81 insertions, 26 deletions
diff --git a/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 8b74bb1d3994..0a36253630a3 100644 --- a/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.27.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-Mr1thOGqpLcMUBbmD6YzU9WlyOvlPHSqyiU/wtb4edo="; + hash = "sha256-NvpWWk/Rr1Hnekc8vrjmOXknRe9sUFQFwPi0obGfXEA="; }; - cargoHash = "sha256-UrDyAS/SIrXWsYucmjj6URjqjjWB40wxLF0rXHmB2Tw="; + cargoHash = "sha256-KuYh1td9O9rSnxtPSYX5zp4A71IQkUJDVR0VaIZOh7g="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index 25e04817643d..f7bbe7a4650b 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.0.38"; + version = "3.1.20"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-2ObPi+wrxvoVWjASmp0KSPMLFuIGdWNWK4jRrZC9ODE="; + hash = "sha256-begNKHGFTxlDIG3+PNG+/zCw59dU8gvJcjrVsfaPPaE="; }; patches = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix b/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix index 68e9927522b5..98aade37c2b5 100644 --- a/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = with llvmPackages; [ cmake llvm.dev llvm python3 ]; buildInputs = with llvmPackages; [ libclang clang-unwrapped python3 ]; - cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ]; + cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${llvmPackages.llvm.dev}" ]; postInstall = '' substituteInPlace $out/bin/iwyu_tool.py \ diff --git a/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix b/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix index c28c8b0ead1a..74f856e23de0 100644 --- a/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python3 }: +{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages_12, readline, python3 }: stdenv.mkDerivation rec { pname = "oclgrind"; @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; nativeCheckInputs = [ python3 ]; - buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline ]; + buildInputs = [ llvmPackages_12.llvm llvmPackages_12.clang-unwrapped readline ]; cmakeFlags = [ - "-DCLANG_ROOT=${llvmPackages.clang-unwrapped}" + "-DCLANG_ROOT=${llvmPackages_12.clang-unwrapped}" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/analysis/rizin/cutter.nix b/nixpkgs/pkgs/development/tools/analysis/rizin/cutter.nix index f274bff6cca7..f20f77eca7a2 100644 --- a/nixpkgs/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/nixpkgs/pkgs/development/tools/analysis/rizin/cutter.nix @@ -1,18 +1,26 @@ -{ fetchFromGitHub, lib, mkDerivation +{ lib +, fetchFromGitHub +, fetchpatch +, stdenv # for passthru.plugins , pkgs # nativeBuildInputs -, qmake, pkg-config, cmake +, cmake +, pkg-config +, wrapQtAppsHook # Qt -, qtbase, qtsvg, qtwebengine, qttools +, qt5compat +, qtbase +, qtsvg +, qttools +, qtwebengine # buildInputs , graphviz -, rizin , python3 -, wrapQtAppsHook +, rizin }: -let cutter = mkDerivation rec { +let cutter = stdenv.mkDerivation rec { pname = "cutter"; version = "2.3.2"; @@ -24,15 +32,43 @@ let cutter = mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake qmake pkg-config python3 wrapQtAppsHook ]; - propagatedBuildInputs = [ python3.pkgs.pyside2 ]; - buildInputs = [ graphviz qtbase qttools qtsvg qtwebengine rizin python3 ]; + patches = [ + # tracking: https://github.com/rizinorg/cutter/pull/3268 + (fetchpatch { + name = "cutter-simplify-python-binding-include-handling.patch"; + url = "https://github.com/rizinorg/cutter/compare/7256fbb00e92ab12a24d14a92364db482ed295cb..ca5949d9d7c907185cf3d062d9fa71c34c5960d4.diff"; + hash = "sha256-bqV2FTA8lMNpHBDXdenNx+1cLYa7MH47XKo1YatmLV4="; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + wrapQtAppsHook + ]; + + propagatedBuildInputs = [ + python3.pkgs.pyside6 + ]; + + buildInputs = [ + graphviz + python3 + qt5compat + qtbase + qtsvg + qttools + qtwebengine + rizin + ]; cmakeFlags = [ "-DCUTTER_USE_BUNDLED_RIZIN=OFF" "-DCUTTER_ENABLE_PYTHON=ON" "-DCUTTER_ENABLE_PYTHON_BINDINGS=ON" "-DCUTTER_ENABLE_GRAPHVIZ=ON" + "-DCUTTER_QT6=ON" ]; preBuild = '' @@ -59,5 +95,6 @@ let cutter = mkDerivation rec { license = licenses.gpl3; mainProgram = "cutter"; maintainers = with maintainers; [ mic92 dtzWill ]; + inherit (rizin.meta) platforms; }; }; in cutter diff --git a/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix b/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix index d4bd1e84b112..3112e438da05 100644 --- a/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix @@ -109,7 +109,7 @@ let rizin = stdenv.mkDerivation rec { jsdec = pkgs.callPackage ./jsdec.nix { inherit rizin openssl; }; - rz-ghidra = pkgs.libsForQt5.callPackage ./rz-ghidra.nix { + rz-ghidra = pkgs.qt6.callPackage ./rz-ghidra.nix { inherit rizin openssl; enableCutterPlugin = false; }; diff --git a/nixpkgs/pkgs/development/tools/analysis/rizin/rz-ghidra.nix b/nixpkgs/pkgs/development/tools/analysis/rizin/rz-ghidra.nix index d349a33af814..d2cb95f2d962 100644 --- a/nixpkgs/pkgs/development/tools/analysis/rizin/rz-ghidra.nix +++ b/nixpkgs/pkgs/development/tools/analysis/rizin/rz-ghidra.nix @@ -10,6 +10,7 @@ # optional buildInputs , enableCutterPlugin ? true , cutter +, qt5compat , qtbase , qtsvg }: @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { rizin ] ++ lib.optionals enableCutterPlugin [ cutter + qt5compat qtbase qtsvg ]; @@ -54,9 +56,12 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + # errors out with undefined symbols from Cutter + broken = enableCutterPlugin && stdenv.isDarwin; description = "Deep ghidra decompiler and sleigh disassembler integration for rizin"; homepage = src.meta.homepage; license = licenses.lgpl3; maintainers = with maintainers; [ chayleaf ]; + inherit (rizin.meta) platforms; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix b/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix index 9cc58cf405d9..4c901c58f031 100644 --- a/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix @@ -1,19 +1,32 @@ -{ buildNpmPackage, fetchFromGitHub, nodePackages, python3, lib }: +{ buildNpmPackage, fetchFromGitHub, lib, stdenv, testers, snyk }: buildNpmPackage rec { pname = "snyk"; - version = "1.1207.0"; + version = "1.1248.0"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; rev = "v${version}"; - hash = "sha256-wEXE+dcAfBK7fuoB23RdPSbJCaovB5sXrFO0QGyf+aw="; + hash = "sha256-pdjua3dMHM/21E6NxxsZu3OAMMrW+OCzci+lvWznNdM="; }; - npmDepsHash = "sha256-j3lMQh8++pb/00d9H2v7QBkpxIJdsuRQoFkNiQbvnF4="; + npmDepsHash = "sha256-6cQjSJRXtj97pS8vBzohjSwC44GYv1BvFii15bm/reE="; + + postPatch = '' + substituteInPlace package.json --replace '"version": "1.0.0-monorepo"' '"version": "${version}"' + ''; + + env.NIX_CFLAGS_COMPILE = + # Fix error: no member named 'aligned_alloc' in the global namespace + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; + npmBuildScript = "build:prod"; + passthru.tests.version = testers.testVersion { + package = snyk; + }; + meta = with lib; { description = "Scans and monitors projects for security vulnerabilities"; homepage = "https://snyk.io"; diff --git a/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix b/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix index 7b5e3522ef3b..dc60f5ec377b 100644 --- a/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.9.0"; + version = "0.9.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-bd0epx3AciECCYi4OYG2WzTVhZ+JYnf5ebDZoMrPfmo="; + sha256 = "sha256-PfevtQpbJeo2U/qeYcJP4Et/HUASOZssRu2IXtOLWKw="; }; - cargoHash = "sha256-RjjYfdcdJzIxnJFZqx93KADihN5YK+bCuk1QaPhVuGQ="; + cargoHash = "sha256-1nPXyFzRmum1CvOFdcqNOQzFVcFFKwPdt2qzXxMssf0="; cargoBuildFlags = [ "--bin" "svlint" ]; |