From 49b902fa2622af838afcc5540b504b99973405bd Mon Sep 17 00:00:00 2001 From: Simmo Saan Date: Tue, 29 Mar 2022 11:29:26 +0300 Subject: [PATCH] Switch to opam release for jsoo-react --- gobview.opam | 1 - gobview.opam.locked | 48 +++++++++++++++++++++---------------------- gobview.opam.template | 1 - 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/gobview.opam b/gobview.opam index 25a7703..1e03d64 100644 --- a/gobview.opam +++ b/gobview.opam @@ -50,6 +50,5 @@ build: [ ] dev-repo: "git+https://github.com/goblint/gobview.git" pin-depends: [ - [ "jsoo-react.dev" "git+https://github.com/sim642/jsoo-react.git#57c4bde195ea572070c3c38ee7f44aa01767b936" ] [ "zarith.1.12-gob0" "git+https://github.com/goblint/Zarith.git#goblint-release-1.12" ] ] diff --git a/gobview.opam.locked b/gobview.opam.locked index 76ba56d..aacd398 100644 --- a/gobview.opam.locked +++ b/gobview.opam.locked @@ -38,6 +38,7 @@ depends: [ "conf-gcc" {= "1.0"} "conf-gmp" {= "4"} "conf-gmp-powm-sec" {= "3"} + "conf-libssl" {= "4"} "conf-perl" {= "2"} "conf-pkg-config" {= "2"} "cppo" {= "1.6.9"} @@ -46,13 +47,13 @@ depends: [ "ctypes_stubs_js" {= "0.1"} "domain-name" {= "0.4.0"} "dune" {= "3.6.1"} - "dune-build-info" {= "3.6.1"} + "dune-build-info" {= "3.6.1" & dev} "dune-configurator" {= "3.6.1"} "duration" {= "0.2.1"} - "either" {= "1.0.0"} + "either" {= "1.0.0" & dev} "eqaf" {= "0.9"} "fileutils" {= "0.6.4"} - "fix" {= "20220121"} + "fix" {= "20220121" & dev} "fmt" {= "0.9.0"} "fpath" {= "0.7.3"} "gen_js_api" {= "1.0.9"} @@ -64,20 +65,18 @@ depends: [ "ipaddr-sexp" {= "5.3.1"} "js_of_ocaml" {= "4.1.0"} "js_of_ocaml-compiler" {= "4.1.0"} - "js_of_ocaml-lwt" {= "4.1.0"} - "js_of_ocaml-ppx" {= "4.1.0"} "jsonm" {= "1.0.1"} "jsonrpc" {= "1.15.0~5.0preview1"} - "jsoo-react" {= "dev"} + "jsoo-react" {= "0.1"} "logs" {= "0.7.0"} "lwt" {= "5.6.1"} "lwt_ppx" {= "2.1.0"} + "lwt_ssl" {= "1.1.3"} "macaddr" {= "5.3.1"} "magic-mime" {= "1.3.0"} "menhir" {= "20220210"} "menhirLib" {= "20220210"} "menhirSdk" {= "20220210"} - "merlin-extend" {= "0.6.1"} "mirage-crypto" {= "0.11.1"} "mirage-crypto-ec" {= "0.11.1"} "mirage-crypto-pk" {= "0.11.1"} @@ -89,19 +88,17 @@ depends: [ "ocaml-option-flambda" {= "1"} "ocaml-syntax-shims" {= "1.0.0"} "ocaml-variants" {= "4.14.0+options"} - "ocaml-version" {= "3.5.0"} + "ocaml-version" {= "3.5.0" & dev} "ocamlbuild" {= "0.14.2"} "ocamlfind" {= "1.9.5"} - "ocamlformat" {= "0.24.1" & dev} - "ocp-indent" {= "1.8.1"} + "ocamlformat" {= "0.25.1" & dev} + "ocamlformat-lib" {= "0.25.1" & dev} + "ocp-indent" {= "1.8.1" & dev} "ocplib-endian" {= "1.2"} "octavius" {= "1.2.2"} - "odoc" {= "2.2.0" & with-doc} - "odoc-parser" {= "2.0.0"} "ojs" {= "1.1.1"} "parsexp" {= "v0.15.0"} "pbkdf" {= "1.2.0"} - "ppx_blob" {= "0.7.2"} "ppx_derivers" {= "1.2.1"} "ppx_deriving" {= "5.2.1"} "ppx_deriving_yojson" {= "3.7.0"} @@ -112,22 +109,21 @@ depends: [ "ppxlib" {= "0.28.0"} "ptime" {= "1.1.0"} "re" {= "1.10.4"} - "reason" {= "3.8.2"} "result" {= "1.5"} "rresult" {= "0.7.0"} "seq" {= "base"} "sexplib" {= "v0.15.1"} "sexplib0" {= "v0.15.1"} - "stdio" {= "v0.15.0"} + "ssl" {= "0.5.13"} + "stdio" {= "v0.15.0" & dev} "stdlib-shims" {= "0.3.0"} "stringext" {= "1.6.0"} "topkg" {= "1.0.6"} - "tyxml" {= "4.5.0" & with-doc} "uchar" {= "0.0.2"} "uri" {= "4.2.0"} "uri-sexp" {= "4.2.0"} - "uucp" {= "15.0.0"} - "uuseg" {= "15.0.0"} + "uucp" {= "15.0.0" & dev} + "uuseg" {= "15.0.0" & dev} "uutf" {= "1.0.3"} "x509" {= "0.16.4"} "yojson" {= "2.0.2"} @@ -152,11 +148,15 @@ build: [ dev-repo: "git+https://github.com/goblint/gobview.git" pin-depends: [ [ - "jsoo-react.dev" - "git+https://github.com/sim642/jsoo-react.git#57c4bde195ea572070c3c38ee7f44aa01767b936" -] + "goblint-cil.2.0.2" + "git+https://github.com/goblint/cil.git#c7ffc37ad83216a84d90fdbf427cc02a68ea5331" + ] [ - "zarith.1.12-gob0" - "git+https://github.com/goblint/Zarith.git#goblint-release-1.12" -] + "ppx_deriving.5.2.1" + "git+https://github.com/ocaml-ppx/ppx_deriving.git#0a89b619f94cbbfc3b0fb3255ab4fe5bc77d32d6" + ] + [ + "zarith.1.12-gob0" + "git+https://github.com/goblint/Zarith.git#goblint-release-1.12" + ] ] \ No newline at end of file diff --git a/gobview.opam.template b/gobview.opam.template index fd30833..71d1285 100644 --- a/gobview.opam.template +++ b/gobview.opam.template @@ -1,4 +1,3 @@ pin-depends: [ - [ "jsoo-react.dev" "git+https://github.com/sim642/jsoo-react.git#57c4bde195ea572070c3c38ee7f44aa01767b936" ] [ "zarith.1.12-gob0" "git+https://github.com/goblint/Zarith.git#goblint-release-1.12" ] ]