Unverified Commit 17d019ed authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #254571 from paveloom/cppcheck 

cppcheck: 2.11.1 -> 2.12.0 + refactor
parents 3f82b3c9 87eaf61a

pkgs/development/tools/analysis/cppcheck/default.nix

+14 −15
Original line number Diff line number Diff line 
{ 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;

  };

})