From 5d663fa3ed4e77b558a604d5c2b23ea1306598e6 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@cea.fr>
Date: Wed, 17 Feb 2021 16:37:51 +0100
Subject: [PATCH] [ci] fixes version of camlp5 for CI
Newer version does not compile on nix because of a missing dependency.
---
nix/default.nix | 2 +-
nix/frama-ci.nix | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/nix/default.nix b/nix/default.nix
index 750fa895..2c8fdf94 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -20,7 +20,7 @@ let frama_clang_build =
{ inherit pkgs stdenv src opam2nix ocaml_version plugins;
name = "frama-clang-on-llvm-" + llvm_version;
deps = [ llvm_package.clang-unwrapped llvm pkgs.gnused ];
- opamPackages = [ "camlp5" ];
+ opamPackages = [ { name = "camlp5"; constraint="=7.14";} ];
preFramaCTests = ''
echo CONFIGURING Why3 for Frama_Clang.
export HOME=$(mktemp -d)
diff --git a/nix/frama-ci.nix b/nix/frama-ci.nix
index 700557f2..e2fc2252 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" = "ec1a17f66dd629480beed8daeab4ececc5f0dc75";
- "ref" = "master";
+ "rev" = "614b8c3f2be697384626581d84836d7a41dc6c38";
+ "ref" = "feature/headers/2021";
};
in
{
--
GitLab