diff --git a/nix/frama-ci.nix b/nix/frama-ci.nix index 4f3735386260ede9cd06d420ac8865ce3ad82f65..909462036c40f914941b4e6754983396dcda5760 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" = "c18a78b1b42bccfaad13a190a44f6c80f836f34c"; + "rev" = "95e05a8778f3c2970cc0dfba8032ed5d445951be"; "ref" = "fix/interface-files"; }; pkgs = import "${src}/pkgs.nix" {}; diff --git a/nix/frama-ci.sh b/nix/frama-ci.sh index e49f84cf454377fcd9c62fd5cff0f98f5f6d39c3..1a65c0893800cdc9e9f013ef466930984455efaa 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 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 $@