From 707d0d4dd31cd3133e4eb69b15c5225bdfdfd15a Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@cea.fr>
Date: Tue, 21 Sep 2021 12:37:08 +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 4f373538..90946203 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 e49f84cf..1a65c089 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 $@
--
GitLab