diff --git a/nix/frama-ci.nix b/nix/frama-ci.nix index 3e9272dcc9279b21650049257d4bef892b616836..58ce20ae843ccc1db1d60dde23a97ced035f2c89 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" = "38ad0883ae35815ec3482bd36c975ce33f9f83f3"; + "rev" = "30cb528aa3dedd1133ef924dbf17b117b3612ea9"; "ref" = "fix/interface-files"; }; pkgs = import "${src}/pkgs.nix" {}; diff --git a/nix/frama-ci.sh b/nix/frama-ci.sh index dbbe1bb07e4976298cd85cb0a96675ab78d5ac56..92e2f9dc3defcf2d7046921fee65718c1f792ebf 100755 --- a/nix/frama-ci.sh +++ b/nix/frama-ci.sh @@ -3,10 +3,10 @@ DIR=$(dirname $0) export FRAMA_CI_NIX=$DIR/frama-ci.nix - export FRAMA_CI=$(nix-instantiate --eval -E "((import <nixos-20.03> {}).callPackage $FRAMA_CI_NIX { password = \"$TOKEN_FOR_API\";}).src.outPath") FRAMA_CI=${FRAMA_CI#\"} FRAMA_CI=${FRAMA_CI%\"} +export NIXPKGS=$(eval echo $(nix-instantiate --eval -E "with import $FRAMA_CI/pkgs-ref.nix; url)) $FRAMA_CI/compile.sh $@