diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix index 40f9a9e40b33..e135b4f79a26 100644 --- a/pkgs/development/tools/analysis/ikos/default.nix +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -1,47 +1,60 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, boost, tbb -, gmp, llvm, clang, sqlite, python3 -, ocamlPackages, mpfr, ppl, doxygen, graphviz +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + cmake, + boost, + tbb, + gmp, + llvm, + clang, + sqlite, + python3, + ocamlPackages, + mpfr, + ppl, + doxygen, + graphviz, }: -let - inherit (python3.pkgs) - setuptools - wheel - build - installer - wrapPython - pygments - ; -in - stdenv.mkDerivation rec { pname = "ikos"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "NASA-SW-VnV"; repo = "ikos"; rev = "v${version}"; - hash = "sha256-zWWfmjYgqhAztGivAJwZ4+yRrAHxgU1CF1Y7vVr95UA="; + hash = "sha256-4/M0fyqvzdr0aBPCUuLiBgqMOrHEmikkIjQMB9KSrdo="; }; - patches = [ - # Fix build with GCC 13 - # https://github.com/NASA-SW-VnV/ikos/pull/262 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/NASA-SW-VnV/ikos/commit/73c816641fb9780f0d3b5e448510363a3cf21ce2.patch"; - hash = "sha256-bkeSAtxrL+z+6QNiGOWSg7kN8XiZqMxlJiu5Dquhca0="; - }) - # Fix an error in ikos-view; Pygments>=2.12 no longer passes outfile to wrap. - ./formatter-wrap.patch + nativeBuildInputs = [ + cmake + python3.pkgs.setuptools + python3.pkgs.wheel + python3.pkgs.build + python3.pkgs.installer + python3.pkgs.wrapPython + ]; + + buildInputs = [ + boost + tbb + gmp + clang + llvm + sqlite + python3 + ocamlPackages.apron + mpfr + ppl + doxygen + graphviz ]; - nativeBuildInputs = [ cmake setuptools wheel build installer wrapPython ]; - buildInputs = [ boost tbb gmp clang llvm sqlite python3 - ocamlPackages.apron mpfr ppl doxygen graphviz ]; propagatedBuildInputs = [ - pygments + python3.pkgs.pygments ]; cmakeFlags = [ diff --git a/pkgs/development/tools/analysis/ikos/formatter-wrap.patch b/pkgs/development/tools/analysis/ikos/formatter-wrap.patch deleted file mode 100644 index ee4edec70eba..000000000000 --- a/pkgs/development/tools/analysis/ikos/formatter-wrap.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/analyzer/python/ikos/view.py b/analyzer/python/ikos/view.py -index 4e9ed5d..6643db8 100644 ---- a/analyzer/python/ikos/view.py -+++ b/analyzer/python/ikos/view.py -@@ -422,7 +422,7 @@ class Formatter(HtmlFormatter): - self.call_contexts = {} - self.checks = {} - -- def wrap(self, source, outfile): -+ def wrap(self, source): - return self._wrap_code(source) - - def _wrap_code(self, source):