From 5725a12cb5a948e03c584f6c8a3bb33ca14aa577 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Mon, 8 Feb 2021 19:21:58 +0100
Subject: [PATCH] [ci] rely on distributed headache, not internal one.
---
nix/default.nix | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/nix/default.nix b/nix/default.nix
index 9ca06758301..5e3ef8515c6 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -74,8 +74,12 @@ rec {
lint = mk_deriv {
name = "frama-c-lint";
inherit src;
- buildInputs = (mk_buildInputs { opamPackages = [ { name = "ocp-indent"; constraint = "=1.7.0"; } ];} )
- ++ [ pkgs.bc plugins.headache.installed ];
+ buildInputs =
+ (mk_buildInputs {
+ opamPackages = [
+ { name = "ocp-indent"; constraint = "=1.7.0"; }
+ { name = "headache"; constraint = "=1.05"; }
+ ];} );
outputs = [ "out" ];
postPatch = ''
patchShebangs .
@@ -120,7 +124,11 @@ rec {
build-distrib-tarball = mk_deriv {
name = "frama-c-build-distrib-tarball";
inherit src;
- buildInputs = buildInputs ++ [ plugins.headache.installed ];
+ buildInputs =
+ (mk_buildInputs {
+ opamPackages = [
+ { name = "headache"; constraint = "=1.05"; }
+ ];} );
outputs = [ "out" ];
postPatch = ''
patchShebangs .
--
GitLab