From 3ff66c5f138413a0b17045ef2827ebfcb56f4b16 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Thu, 6 Aug 2020 17:18:05 +0200
Subject: [PATCH] [CI] cleanup remnants of old attempts
---
.gitlab-ci.yml | 1 -
nix/default.nix | 1 -
2 files changed, 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1706beda..0211783a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,6 @@ variables:
DEFAULT: "master"
OCAML: "4_08"
FRAMA_CI_OPT: "--override frama-clang:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
- NIXPKGS_ALLOW_UNFREE: "1"
#avoid a nix error https://github.com/NixOS/nix/issues/2087
git-update:
diff --git a/nix/default.nix b/nix/default.nix
index 456cddc5..8f882bd2 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -16,7 +16,6 @@ plugins.helpers.simple_plugin
name = "frama-clang";
deps = [ unstablePckgs.llvmPackages_9.clang-unwrapped unstablePckgs.llvm_9 pkgs.gnused ];
opamPackages = [ "camlp5" { name = "alt-ergo"; constraint = "=2.0.0"; } ];
- configure_options = "-with-clang-includedir=${unstablePckgs.llvmPackages_9.clang-unwrapped}";
preFramaCTests = ''
echo CONFIGURING Why3 for Frama_Clang.
export HOME=$(mktemp -d)
--
GitLab