diff --git a/nix/frama-ci.nix b/nix/frama-ci.nix index 909462036c40f914941b4e6754983396dcda5760..750822f21d30a4f337bc4fbbccf3b823caeb5d43 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" = "95e05a8778f3c2970cc0dfba8032ed5d445951be"; + "rev" = "302db8051e232afb288a29ea1c91cc7a17fe9d85"; "ref" = "fix/interface-files"; }; pkgs = import "${src}/pkgs.nix" {}; diff --git a/nix/frama-ci.sh b/nix/frama-ci.sh index 1a65c0893800cdc9e9f013ef466930984455efaa..b4deee0abc1543e01c82d3c6c92d9b0045b26d77 100755 --- a/nix/frama-ci.sh +++ b/nix/frama-ci.sh @@ -8,5 +8,5 @@ export FRAMA_CI=$(nix-instantiate --eval -E "((import <nixos-20.03> {}).callPack FRAMA_CI=${FRAMA_CI#\"} FRAMA_CI=${FRAMA_CI%\"} -export NIX_PATH=nixpkgs=$(eval echo $(nix-instantiate --eval -E "with import $FRAMA_CI/pkgs-ref.nix; url")) +export NIX_PATH="nixpkgs=$(eval echo $(nix-instantiate --eval -E "with import $FRAMA_CI/pkgs-ref.nix; url"))" $FRAMA_CI/compile.sh $@