Merge pull request #11220 from MinaProtocol/get-rid-of-some-submodules

Remove some submodules in favour of opam pins

Author: balsoft

.gitmodules

@@ -4,12 +4,6 @@
 [submodule "src/external/ppx_optcomp"]
 	path = src/external/ppx_optcomp
 	url = https://github.com/MinaProtocol/ppx_optcomp
-[submodule "src/external/async_kernel"]
-	path = src/external/async_kernel
-	url = https://github.com/MinaProtocol/async_kernel
-[submodule "src/external/rpc_parallel"]
-	path = src/external/rpc_parallel
-	url = https://github.com/MinaProtocol/rpc_parallel.git
 [submodule "frontend/wallet/tablecloth"]
 	path = frontend/wallet/tablecloth
 	url = https://github.com/bkase/tablecloth
@@ -23,9 +17,6 @@
 [submodule "src/external/c-reference-signer"]
 	path = src/external/c-reference-signer
 	url = https://github.com/MinaProtocol/c-reference-signer.git
-[submodule "src/external/capnp-ocaml"]
-	path = src/external/capnp-ocaml
-	url = https://github.com/o1-labs/capnp-ocaml.git
 [submodule "src/lib/snarky_js_bindings/snarkyjs"]
 	path = src/lib/snarky_js_bindings/snarkyjs
 	url = https://github.com/o1-labs/snarkyjs.git

nix/ocaml.nix

@@ -15,9 +15,8 @@ let
   repos = [ external-repo inputs.opam-repository ];
 
   export = opam-nix.importOpam ../src/opam.export;
-  external-packages =
-    getAttrs [ "sodium" "capnp" "rpc_parallel" "async_kernel" "base58" ]
-    (builtins.mapAttrs (_: last) (opam-nix.listRepo external-repo));
+  external-packages = pkgs.lib.getAttrs [ "sodium" "base58" ]
+    (builtins.mapAttrs (_: pkgs.lib.last) (opam-nix.listRepo external-repo));
 
   difference = a: b:
     filterAttrs (name: _: !builtins.elem name (builtins.attrNames b)) a;

scripts/pin-external-packages.sh

@@ -2,7 +2,7 @@
 
 # update and pin packages, used by CI
 
-PACKAGES="ocaml-sodium capnp-ocaml rpc_parallel async_kernel coda_base58"
+PACKAGES="ocaml-sodium coda_base58"
 
 git submodule sync && git submodule update --init --recursive
 

src/external/async_kernel

@@ -240,6 +240,9 @@ installed: [
 ]
 pinned: [
   "graphql_ppx.1.2.2"
+  "capnp.3.4.0"
+  "rpc_parallel.v0.14.0"
+  "async_kernel.v0.14.0"
 ]
 package "graphql_ppx" {
   opam-version: "2.0"
@@ -271,3 +274,106 @@ package "graphql_ppx" {
          checksum: "sha256=8aff33988218c99a95a91fb04ef703a3b8cde0676b7a90ee72478959829867d8"
   }
 }
+package "capnp" {
+  opam-version: "2.0"
+  version: "3.4.0"
+  maintainer: "Paul Pelzl <[email protected]>"
+  authors: "Paul Pelzl <[email protected]>"
+  homepage: "https://github.com/capnproto/capnp-ocaml"
+  bug-reports: "https://github.com/capnproto/capnp-ocaml/issues"
+  license: "BSD-2-Clause"
+  depends: [
+    "ocaml" {>= "4.03.0"}
+    "dune" {>= "1.0"}
+    "result"
+    "base" {>= "v0.11"}
+    "stdio"
+    "base_quickcheck" {with-test}
+    "ocplib-endian" {>= "0.7"}
+    "res"
+    "stdint" {>= "0.5.1"}
+    "ounit" {with-test}
+    "conf-capnproto" {with-test}
+  ]
+  build: [
+    ["dune" "build" "-p" name "-j" jobs]
+    ["dune" "build" "-p" name "-j" jobs "@runtest" "@src/benchmark/benchmarks"] {with-test}
+  ]
+  dev-repo: "git+https://github.com/capnproto/capnp-ocaml.git"
+  synopsis:
+    "OCaml code generation plugin for the Cap'n Proto serialization framework"
+  description: """
+  Cap'n Proto is a multi-language code generation framework designed for
+  high performance through the use of lazy parsing and arena allocation.
+  This package provides a plugin for the Cap'n Proto compiler which enables
+  OCaml code generation, as well as corresponding runtime library support."""
+  url {
+    src: "https://github.com/o1-labs/capnp-ocaml/archive/6f4913503cc971ab34df9bf9d4c65778fe05eb8f.tar.gz"
+    checksum: "sha256=03aac06742f3d4ec8a189f0db65d46393b7497e8637ece15c39ff4ec01117b8b"
+  }
+}
+package "rpc_parallel" {
+  opam-version: "2.0"
+  version: "v0.14.0"
+  maintainer: "[email protected]"
+  authors: ["Jane Street Group, LLC <[email protected]>"]
+  homepage: "https://github.com/janestreet/rpc_parallel"
+  bug-reports: "https://github.com/janestreet/rpc_parallel/issues"
+  dev-repo: "git+https://github.com/janestreet/rpc_parallel.git"
+  doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/rpc_parallel/index.html"
+  license: "MIT"
+  build: [
+    ["dune" "build" "-p" name "-j" jobs]
+  ]
+  depends: [
+    "ocaml"       {>= "4.08.0"}
+    "async"       {>= "v0.13" & < "v0.15"}
+    "core"        {>= "v0.13" & < "v0.15"}
+    "core_kernel" {>= "v0.13" & < "v0.15"}
+    "ppx_jane"    {>= "v0.13" & < "v0.15"}
+    "sexplib"     {>= "v0.13" & < "v0.15"}
+    "dune"        {>= "2.0.0"}
+  ]
+  synopsis: "Type-safe parallel library built on top of Async_rpc"
+  description: "
+  Rpc_parallel offers an API to define various workers and protocols,
+  spawn workers as separate processes, and communicate with them using
+  Async Rpc.
+
+  "
+  url {
+    src: "https://github.com/MinaProtocol/rpc_parallel/archive/39d6eec98705d5cc1f3ed8479ef19b1a1e0ee70e.tar.gz"
+    checksum: "sha256=2b6c758433c5fd12b4971380147be96f0ce5d239932fc7f6df1d84f306bcbd2a"
+  }
+}
+package "async_kernel" {
+  opam-version: "2.0"
+  version: "v0.14.0"
+  maintainer: "[email protected]"
+  authors: ["Jane Street Group, LLC <[email protected]>"]
+  homepage: "https://github.com/janestreet/async_kernel"
+  bug-reports: "https://github.com/janestreet/async_kernel/issues"
+  dev-repo: "git+https://github.com/janestreet/async_kernel.git"
+  doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/async_kernel/index.html"
+  license: "MIT"
+  build: [
+    ["dune" "build" "-p" name "-j" jobs]
+  ]
+  depends: [
+    "ocaml"       {>= "4.08.0"}
+    "core_kernel" {>= "v0.13" & < "v0.15"}
+    "ppx_jane"    {>= "v0.13" & < "v0.15"}
+    "dune"        {>= "2.0.0"}
+  ]
+  synopsis: "Monadic concurrency library"
+  description: "
+  Part of Jane Street's Core library
+  The Core suite of libraries is an industrial strength alternative to
+  OCaml's standard library that was developed by Jane Street, the
+  largest industrial user of OCaml.
+  "
+  url {
+    src: "https://github.com/MinaProtocol/async_kernel/archive/bf02e69c129b6ffec97cc5b7a5d85125802968bb.tar.gz"
+    checksum: "sha256=ae824169495106fa9099aa53c0367e58651de426f70653897b3e1168c9a7edb6"
+  }
+}