diff --git a/nix/frama-c.nix b/nix/frama-c.nix index e3949630bab22a158b0c93fc7621a0510ba026ee..a5e914062d7968ca56c4065a572fe8d454a0865e 100644 --- a/nix/frama-c.nix +++ b/nix/frama-c.nix @@ -24,6 +24,7 @@ , dune-configurator , dune-site , fpath +, jq , gcc9 , graphviz , lablgtk3 @@ -87,6 +88,7 @@ stdenvNoCC.mkDerivation rec { dune-site findlib fpath + jq gcc9 graphviz lablgtk3 diff --git a/src/plugins/markdown-report/tests/sarif/libc.c b/src/plugins/markdown-report/tests/sarif/libc.c index 7115614f982b8beadae4b14c5847039321fd870c..ef97cd5c232e0205e9089270b528a86787cf584a 100644 --- a/src/plugins/markdown-report/tests/sarif/libc.c +++ b/src/plugins/markdown-report/tests/sarif/libc.c @@ -7,7 +7,7 @@ OPT: -mdr-no-print-libc -mdr-out ./without-libc.sarif.unfiltered EXECNOW: LOG without-libc.sarif sed -e "s:@PTEST_SESSION@:PTEST_SESSION:" %{dep:without-libc.sarif.unfiltered} > without-libc.sarif 2> @DEV_NULL@ - ENABLED_IF: %{bin-available:check-jsonschema} + ENABLED_IF: (and %{bin-available:check-jsonschema} %{bin-available:jq}) EXECNOW: LOG with-libc.sarif.checked check-jsonschema --schemafile $(jq '."$schema"' ./with-libc.sarif.unchecked -r) %{dep:with-libc.sarif.unchecked} > ./with-libc.sarif.checked */ #include <string.h>