Skip to content
Snippets Groups Projects
Commit ae0c30ca authored by Virgile Prevosto's avatar Virgile Prevosto
Browse files

Merge branch 'feature/nix/add_ci_to_metacsl' into 'master'

Update Frama-CI data

See merge request frama-c/frama-c!2798
parents b45463ab 297b6a45
No related branches found
No related tags found
No related merge requests found
...@@ -92,6 +92,13 @@ volatile: ...@@ -92,6 +92,13 @@ volatile:
tags: tags:
- nix - nix
metacsl:
stage: tests
script:
- nix/frama-ci.sh build -A meta.tests
tags:
- nix
Security: Security:
stage: tests stage: tests
script: script:
......
...@@ -214,7 +214,9 @@ rec { ...@@ -214,7 +214,9 @@ rec {
inherit src; inherit src;
buildInputs = (mk_buildInputs { opamPackages = [ "xml-light" ]; } ) ++ buildInputs = (mk_buildInputs { opamPackages = [ "xml-light" ]; } ) ++
[ pkgs.getopt [ pkgs.getopt
pkgs.libxslt pkgs.libxml2 pkgs.autoPatchelfHook stdenv.cc.cc.lib pkgs.libxslt pkgs.libxml2 pkgs.autoPatchelfHook
pkgs.swiProlog
stdenv.cc.cc.lib
]; ];
counter_examples_src = plugins.counter-examples.src; counter_examples_src = plugins.counter-examples.src;
genassigns_src = plugins.genassigns.src; genassigns_src = plugins.genassigns.src;
...@@ -226,6 +228,7 @@ rec { ...@@ -226,6 +228,7 @@ rec {
volatile_src = plugins.volatile.src; volatile_src = plugins.volatile.src;
security_src = plugins.security.src; security_src = plugins.security.src;
context_from_precondition_src = plugins.context-from-precondition.src; context_from_precondition_src = plugins.context-from-precondition.src;
metacsl_src = plugins.meta.src;
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .
''; '';
......
...@@ -5,8 +5,8 @@ let ...@@ -5,8 +5,8 @@ let
src = builtins.fetchGit { src = builtins.fetchGit {
"url" = "https://bobot:${password}@git.frama-c.com/frama-c/Frama-CI.git"; "url" = "https://bobot:${password}@git.frama-c.com/frama-c/Frama-CI.git";
"name" = "Frama-CI"; "name" = "Frama-CI";
"rev" = "abf07b7c0f53b33b32c8b170580e14480fd3aba6"; "rev" = "58e51d3a0811dc7641781ec9784e4bd52e33a3a5";
"ref" = "master"; "ref" = "feature/nix/add_ci_to_metacsl";
}; };
in in
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment