diff options
| author | Yann Herklotz <git@yannherklotz.com> | 2023-06-12 17:52:08 +0100 |
|---|---|---|
| committer | Yann Herklotz <git@yannherklotz.com> | 2023-06-12 17:52:08 +0100 |
| commit | 22e7a6b34b4c6704164fba5d0b677711d89a5b9f (patch) | |
| tree | 6fd7b058be5e111ee0dff8ff1f083ed2843ec753 | |
| parent | d0d80da339436c1aaf5289a3c026b93092eda787 (diff) | |
| download | vericert-22e7a6b34b4c6704164fba5d0b677711d89a5b9f.tar.gz vericert-22e7a6b34b4c6704164fba5d0b677711d89a5b9f.zip | |
Add CohPred and SMTCoq dependency
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile | 19 | ||||
| -rw-r--r-- | flake.nix | 9 | ||||
| m--------- | lib/cohpred | 0 |
4 files changed, 29 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index f30817e..e54fbb8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "lib/CompCert"] path = lib/CompCert url = https://github.com/ymherklotz/CompCert.git +[submodule "lib/cohpred"] + path = lib/cohpred + url = https://git.sr.ht/~ymherklotz/cohpred @@ -14,7 +14,24 @@ COMPCERTRECDIRS := lib common verilog backend cfrontend driver cparser COQINCLUDES := -R src vericert \ $(foreach d, $(COMPCERTRECDIRS), -R lib/CompCert/$(d) compcert.$(d)) \ -R lib/CompCert/flocq Flocq \ - -R lib/CompCert/MenhirLib MenhirLib + -R lib/CompCert/MenhirLib MenhirLib \ + -R src TVSMT \ + -R lib/cohpred/lib/smtcoq/src SMTCoq \ + -I lib/smtcoq/src \ + -I lib/smtcoq/src/bva \ + -I lib/smtcoq/src/classes \ + -I lib/smtcoq/src/array \ + -I lib/smtcoq/src/cnf \ + -I lib/smtcoq/src/euf \ + -I lib/smtcoq/src/lfsc \ + -I lib/smtcoq/src/lia \ + -I lib/smtcoq/src/smtlib2 \ + -I lib/smtcoq/src/trace \ + -I lib/smtcoq/src/verit \ + -I lib/smtcoq/src/zchaff \ + -I lib/smtcoq/src/PArray \ + -I lib/smtcoq/src/../3rdparty/alt-ergo + COQEXEC := $(COQBIN)coqtop $(COQINCLUDES) -batch -load-vernac-source COQMAKE := $(COQBIN)coq_makefile @@ -6,12 +6,19 @@ outputs = { self, nixpkgs }: let vericertDevPackages = pkgs: let + veriT' = pkgs.veriT.overrideAttrs (oA: { + src = pkgs.fetchurl { + url = "https://www.lri.fr/~keller/Documents-recherche/Smtcoq/veriT9f48a98.tar.gz"; + sha256 = "sha256-Pe46PxQVHWwWwx5Ei4Bl95A0otCiXZuUZ2nXuZPYnhY="; + }; + meta.broken = false; + }); ncoq = pkgs.coq_8_17; ncoqPackages = pkgs.coqPackages_8_17; in pkgs.mkShell { buildInputs = with pkgs; - [ ncoq ncoq.ocaml ncoqPackages.serapi dune_3 gcc python3 lp_solve ] + [ ncoq ncoq.ocaml ncoqPackages.serapi dune_3 gcc python3 lp_solve veriT' zchaff ] ++ (with ncoq.ocamlPackages; [ findlib menhir menhirLib ocamlgraph ocp-indent utop merlin ]) ++ (with python3Packages; [ alectryon sphinx_rtd_theme ]); }; diff --git a/lib/cohpred b/lib/cohpred new file mode 160000 +Subproject f949630783e17c062d58ade955868883f561032 |