From 7bdb63ed11cd6879cd01ae11b7951af1dc8f28d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= <francois.bobot@cea.fr>
Date: Fri, 8 May 2020 15:55:26 +0200
Subject: [PATCH] Move to 20.03
---
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 b022dab5948..253aa3a7ad7 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" = "79089bda56f3398fabd5269d7270f1330326de99";
+ "rev" = "85ba4a2c716d3f992f75bd838463a36b86cf7ccb";
"ref" = "feature/ci/update-opam";
};
in
diff --git a/nix/frama-ci.sh b/nix/frama-ci.sh
index b331b057a8e..dbbe1bb07e4 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 <nixos-19.03> {}).callPackage $FRAMA_CI_NIX { password = \"$TOKEN_FOR_API\";}).src.outPath")
+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%\"}
--
GitLab