From dd7d524e103e7ff82555c414962b3cab7e7b4f61 Mon Sep 17 00:00:00 2001 From: Virgile Prevosto <virgile.prevosto@cea.fr> Date: Tue, 21 Sep 2021 12:33:43 +0000 Subject: [PATCH] Update nix/frama-ci.* --- nix/frama-ci.nix | 2 +- nix/frama-ci.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/frama-ci.nix b/nix/frama-ci.nix index 58ce20ae843..4f373538626 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" = "30cb528aa3dedd1133ef924dbf17b117b3612ea9"; + "rev" = "c18a78b1b42bccfaad13a190a44f6c80f836f34c"; "ref" = "fix/interface-files"; }; pkgs = import "${src}/pkgs.nix" {}; diff --git a/nix/frama-ci.sh b/nix/frama-ci.sh index 92e2f9dc3de..e49f84cf454 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 NIXPKGS=$(eval echo $(nix-instantiate --eval -E "with import $FRAMA_CI/pkgs-ref.nix; url")) $FRAMA_CI/compile.sh $@ -- GitLab