From 082cdc658d95e15e3a8120bd40a804fc2932b986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= <francois.bobot@cea.fr>
Date: Thu, 23 May 2019 22:36:06 +0200
Subject: [PATCH] Update nix/frama-ci.*
---
nix/frama-ci.nix | 4 ++--
nix/frama-ci.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/nix/frama-ci.nix b/nix/frama-ci.nix
index 3976ce7088a..29658f8a20c 100644
--- a/nix/frama-ci.nix
+++ b/nix/frama-ci.nix
@@ -5,8 +5,8 @@ let
src = builtins.fetchGit {
"url" = "https://bobot:${password}@git.frama-c.com/frama-c/Frama-CI.git";
"name" = "Frama-CI";
- "rev" = "ed541f6e3818da2bf31125740b8555acb086ca29";
- "ref" = "feature/andre/yojson-mandatory-dependence";
+ "rev" = "f7d5e96afa5b540feb4476b732e78dc8424bd10f";
+ "ref" = "feature/opam2";
};
in
{
diff --git a/nix/frama-ci.sh b/nix/frama-ci.sh
index b4a69f90154..b331b057a8e 100755
--- a/nix/frama-ci.sh
+++ b/nix/frama-ci.sh
@@ -4,7 +4,7 @@ DIR=$(dirname $0)
export FRAMA_CI_NIX=$DIR/frama-ci.nix
-export FRAMA_CI=$(nix-instantiate --eval -E "((import <nixpkgs> {}).callPackage $FRAMA_CI_NIX { password = \"$TOKEN_FOR_API\";}).src.outPath")
+export FRAMA_CI=$(nix-instantiate --eval -E "((import <nixos-19.03> {}).callPackage $FRAMA_CI_NIX { password = \"$TOKEN_FOR_API\";}).src.outPath")
FRAMA_CI=${FRAMA_CI#\"}
FRAMA_CI=${FRAMA_CI%\"}
--
GitLab