diff --git a/nix/frama-ci.nix b/nix/frama-ci.nix index c26b5fa8d42ac00667c4f2e36e2c909b15b077dd..e4b4a5c77a4b43e1dd1e0e628c9e5e89069ba42e 100644 --- a/nix/frama-ci.nix +++ b/nix/frama-ci.nix @@ -5,7 +5,7 @@ let src = builtins.fetchGit { "url" = "https://bobot:${password}@git.frama-c.com/frama-c/Frama-CI.git"; "name" = "Frama-CI"; - "rev" = "28e429a18df17f911cdbc2ad757e2b549e629d0d"; + "rev" = "c6a3dc6e81c83d539ec7b0a54cde24be30bea1e8"; "ref" = "feature/upgrade-opam2nix"; }; in diff --git a/nix/frama-ci.sh b/nix/frama-ci.sh index d3a76ed345d21339c2bdb9a37abca956c22cab51..dbbe1bb07e4976298cd85cb0a96675ab78d5ac56 100755 --- a/nix/frama-ci.sh +++ b/nix/frama-ci.sh @@ -9,11 +9,4 @@ export FRAMA_CI=$(nix-instantiate --eval -E "((import <nixos-20.03> {}).callPack FRAMA_CI=${FRAMA_CI#\"} FRAMA_CI=${FRAMA_CI%\"} -PIPE=$(mktemp) -rm $PIPE -mkfifo $PIPE -tee results.log < $PIPE & -$FRAMA_CI/compile.sh $@ > $PIPE 2>&1 -STATUS=$? -rm $PIPE -exit $STATUS +$FRAMA_CI/compile.sh $@