Skip to content

Commit

Permalink
opam: install EasyCrypt libraries
Browse files Browse the repository at this point in the history
Raise some lower bounds on dependencies
  • Loading branch information
vbgl authored and bgregoir committed Jun 21, 2023
1 parent c9c694c commit 2114a3d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,11 @@ opam-compiler:
nix-shell --arg inCI true $EXTRA_NIX_ARGUMENTS --run
'eval $(opam env) &&
make -C compiler -j$NIX_BUILD_CORES &&
(cd compiler && mkdir -p bin && cp _build/default/entry/jasminc.exe bin/jasminc)'
(cd compiler && mkdir -p bin && cp _build/default/entry/jasminc.exe bin/jasminc && cp _build/default/entry/jazz2tex.exe bin/jazz2tex && mkdir -p lib/jasmin/easycrypt && cp ../eclib/*.ec lib/jasmin/easycrypt/)'
artifacts:
paths:
- compiler/bin/jasminc
- compiler/bin/
- compiler/lib/

tarball:
stage: build
Expand Down
7 changes: 5 additions & 2 deletions compiler/jasmin.opam
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@ install: [
mkdir -p "%{prefix}%/bin"
cp "_build/default/entry/jasminc.exe" "%{prefix}%/bin/jasminc"
cp "_build/default/entry/jazz2tex.exe" "%{prefix}%/bin/jazz2tex"
mkdir -p "%{prefix}%/lib/jasmin/easycrypt"
sh -c "cp ../eclib/*.ec \"%{prefix}/lib/jasmin/easycrypt/\""
]
depends: [
"ocaml" { >= "4.10" & build }
"ocaml" { >= "4.11" & build }
"batteries" {>= "3.4"}
"cmdliner" { build }
"cmdliner" {>= "1.1" & build }
"dune" {>= "3.2"}
"menhir" {>= "20160825" & build }
"menhirLib"
"camlidl"
Expand Down
4 changes: 2 additions & 2 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ let oP =
else ocamlPackages
; in

if !lib.versionAtLeast oP.ocaml.version "4.08"
then throw "Jasmin requires OCaml ≥ 4.08"
if !lib.versionAtLeast oP.ocaml.version "4.11"
then throw "Jasmin requires OCaml ≥ 4.11"
else

let ecDeps = ecRef != ""; in
Expand Down

0 comments on commit 2114a3d

Please sign in to comment.