diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2023-09-12 11:14:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-12 11:14:07 +0200 |
| commit | 17d019edcceb3b4b8db6e20e389ec85d03eb18e4 (patch) | |
| tree | 1d1142ed926250e93b620cead890185715303f85 /pkgs/development/tools/analysis | |
| parent | 3f82b3c928e96267218820c3925bfd29c80dfbb2 (diff) | |
| parent | 87eaf61a2fca77df031bc148e5b18c93cf85f7c7 (diff) | |
| download | nixlib-17d019edcceb3b4b8db6e20e389ec85d03eb18e4.tar nixlib-17d019edcceb3b4b8db6e20e389ec85d03eb18e4.tar.gz nixlib-17d019edcceb3b4b8db6e20e389ec85d03eb18e4.tar.bz2 nixlib-17d019edcceb3b4b8db6e20e389ec85d03eb18e4.tar.lz nixlib-17d019edcceb3b4b8db6e20e389ec85d03eb18e4.tar.xz nixlib-17d019edcceb3b4b8db6e20e389ec85d03eb18e4.tar.zst nixlib-17d019edcceb3b4b8db6e20e389ec85d03eb18e4.zip | |
Merge pull request #254571 from paveloom/cppcheck
cppcheck: 2.11.1 -> 2.12.0 + refactor
Diffstat (limited to 'pkgs/development/tools/analysis')
| -rw-r--r-- | pkgs/development/tools/analysis/cppcheck/default.nix | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 15709e4cc869..937e63d2fe26 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -1,5 +1,5 @@ -{ docbook_xsl -, docbook_xml_dtd_45 +{ docbook_xml_dtd_45 +, docbook_xsl , fetchFromGitHub , installShellFiles , lib @@ -13,20 +13,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; - version = "2.11.1"; + version = "2.12.0"; + + outputs = [ "out" "man" ]; src = fetchFromGitHub { owner = "danmar"; repo = "cppcheck"; rev = finalAttrs.version; - hash = "sha256-ZQ1EgnC2JBc0AvSW8PtgMzJoWSPt04Xfh8dqOU+KMfw="; + hash = "sha256-Rfm63ERmTsmmH8W6aiBMx+NiQjzGuoWHqHRRqWishhw="; }; - strictDeps = true; - nativeBuildInputs = [ - docbook_xsl docbook_xml_dtd_45 + docbook_xsl installShellFiles libxslt pkg-config @@ -41,9 +41,12 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ]; - outputs = [ "out" "man" ]; - enableParallelBuilding = true; + strictDeps = true; + + # test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed. + doCheck = !(stdenv.isLinux && stdenv.isAarch64); + doInstallCheck = true; postPatch = '' substituteInPlace Makefile \ @@ -58,10 +61,6 @@ stdenv.mkDerivation (finalAttrs: { installManPage cppcheck.1 ''; - # test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed. - doCheck = !(stdenv.isLinux && stdenv.isAarch64); - - doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck @@ -73,13 +72,13 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A static analysis tool for C/C++ code"; - homepage = "http://cppcheck.sourceforge.net/"; + homepage = "http://cppcheck.sourceforge.net"; license = lib.licenses.gpl3Plus; longDescription = '' Check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overruns and more. ''; - maintainers = with lib.maintainers; [ joachifm ]; + maintainers = with lib.maintainers; [ joachifm paveloom ]; platforms = lib.platforms.unix; }; }) |