From 72c8973fae5960c296f00cb8fbc90c7b6692e0c9 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@cea.fr>
Date: Tue, 21 Sep 2021 12:11:39 +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 3e9272d..58ce20a 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 dbbe1bb..92e2f9d 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 $@
--
GitLab