Get rid of esy-autoconf (#57)

Author: anmonteiro

.circleci/config.yml

@@ -143,7 +143,7 @@ jobs:
       - run:
           name: "Install esy + system deps"
           command: |
-            sudo apt-get install texinfo
+            sudo apt-get install texinfo autotools-dev autoconf
             npm install -g esy
       - run:
           name: 'esy install'

esy.json

@@ -32,7 +32,6 @@
   },
   "resolutions": {
     "@opam/conf-libev": "esy-packages/libev:package.json#86d244e",
-    "@opam/conf-autoconf": "esy-packages/esy-autoconf:package.json#71a8836",
     "@opam/conf-openssl": {
       "source": "no-source:",
       "override": {
@@ -61,7 +60,7 @@
         }
       }
     },
-    "@opam/ppx_deriving": "gasche/ppx_deriving:ppx_deriving.opam#a7788f8",
+    "@opam/ppx_deriving": "ocaml-ppx/ppx_deriving:ppx_deriving.opam#e12921c",
     "@opam/ppx_tools": "ocaml-ppx/ppx_tools:ppx_tools.opam#331fbc4",
     "@opam/nocrypto": {
       "source": "TheLortex/ocaml-nocrypto:nocrypto.opam#df2348d",

esy.lock/index.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "da7de81cbb5f04a618cfba9b02a5f8ba",
+  "checksum": "7677c103d74a45a530a6bc4e593bb0e5",
   "root": "h2@link-dev:./esy.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9": {
@@ -584,7 +584,7 @@
         "@opam/sexplib@opam:v0.12.0@c65643bb",
         "@opam/ptime@opam:0.8.5@0051d642",
         "@opam/ppx_sexp_conv@opam:v0.12.0@6aa153b5",
-        "@opam/ppx_deriving@github:gasche/ppx_deriving:ppx_deriving.opam#a7788f8@d41d8cd9",
+        "@opam/ppx_deriving@github:ocaml-ppx/ppx_deriving:ppx_deriving.opam#e12921c@d41d8cd9",
         "@opam/ppx_cstruct@opam:5.0.0@cea738b4",
         "@opam/ocamlfind@opam:1.8.0@f744a0c5",
         "@opam/ocamlbuild@opam:0.14.0@427a2331",
@@ -602,7 +602,7 @@
         "@opam/sexplib@opam:v0.12.0@c65643bb",
         "@opam/ptime@opam:0.8.5@0051d642",
         "@opam/ppx_sexp_conv@opam:v0.12.0@6aa153b5",
-        "@opam/ppx_deriving@github:gasche/ppx_deriving:ppx_deriving.opam#a7788f8@d41d8cd9",
+        "@opam/ppx_deriving@github:ocaml-ppx/ppx_deriving:ppx_deriving.opam#e12921c@d41d8cd9",
         "@opam/ppx_cstruct@opam:5.0.0@cea738b4",
         "@opam/nocrypto@github:TheLortex/ocaml-nocrypto:nocrypto.opam#df2348d@d86b9d71",
         "@opam/mirage-kv-lwt@opam:2.0.0@585db097",
@@ -1014,14 +1014,16 @@
         "@opam/base@opam:v0.12.2@e209c8f2"
       ]
     },
-    "@opam/ppx_deriving@github:gasche/ppx_deriving:ppx_deriving.opam#a7788f8@d41d8cd9": {
+    "@opam/ppx_deriving@github:ocaml-ppx/ppx_deriving:ppx_deriving.opam#e12921c@d41d8cd9": {
       "id":
-        "@opam/ppx_deriving@github:gasche/ppx_deriving:ppx_deriving.opam#a7788f8@d41d8cd9",
+        "@opam/ppx_deriving@github:ocaml-ppx/ppx_deriving:ppx_deriving.opam#e12921c@d41d8cd9",
       "name": "@opam/ppx_deriving",
-      "version": "github:gasche/ppx_deriving:ppx_deriving.opam#a7788f8",
+      "version": "github:ocaml-ppx/ppx_deriving:ppx_deriving.opam#e12921c",
       "source": {
         "type": "install",
-        "source": [ "github:gasche/ppx_deriving:ppx_deriving.opam#a7788f8" ]
+        "source": [
+          "github:ocaml-ppx/ppx_deriving:ppx_deriving.opam#e12921c"
+        ]
       },
       "overrides": [],
       "dependencies": [
@@ -2460,7 +2462,7 @@
       "dependencies": [
         "[email protected]@d41d8cd9", "@opam/ocamlfind@opam:1.8.0@f744a0c5",
         "@opam/conf-which@opam:1@56319cdb",
-        "@opam/conf-autoconf@github:esy-packages/esy-autoconf:package.json#71a8836@d41d8cd9",
+        "@opam/conf-autoconf@opam:0.1@f636cabb",
         "@esy-ocaml/[email protected]@d41d8cd9"
       ],
       "devDependencies": [ "[email protected]@d41d8cd9" ]
@@ -2929,7 +2931,7 @@
       ],
       "dependencies": [
         "@opam/conf-pkg-config@opam:1.1@da0b7ce6",
-        "@opam/conf-autoconf@github:esy-packages/esy-autoconf:package.json#71a8836@d41d8cd9",
+        "@opam/conf-autoconf@opam:0.1@f636cabb",
         "@esy-packages/esy-openssl@archive:https://github.com/openssl/openssl/archive/OpenSSL_1_1_1c.tar.gz#sha1:eb59b090bd757e30b676fb5e80c25ddb5a2f9511@4d267550"
       ],
       "devDependencies": []
@@ -2994,17 +2996,24 @@
       ],
       "devDependencies": []
     },
-    "@opam/conf-autoconf@github:esy-packages/esy-autoconf:package.json#71a8836@d41d8cd9": {
-      "id":
-        "@opam/conf-autoconf@github:esy-packages/esy-autoconf:package.json#71a8836@d41d8cd9",
+    "@opam/conf-autoconf@opam:0.1@f636cabb": {
+      "id": "@opam/conf-autoconf@opam:0.1@f636cabb",
       "name": "@opam/conf-autoconf",
-      "version": "github:esy-packages/esy-autoconf:package.json#71a8836",
+      "version": "opam:0.1",
       "source": {
         "type": "install",
-        "source": [ "github:esy-packages/esy-autoconf:package.json#71a8836" ]
+        "source": [ "no-source:" ],
+        "opam": {
+          "name": "conf-autoconf",
+          "version": "0.1",
+          "path": "esy.lock/opam/conf-autoconf.0.1"
+        }
       },
       "overrides": [],
-      "dependencies": [],
+      "dependencies": [
+        "@opam/conf-which@opam:1@56319cdb",
+        "@esy-ocaml/[email protected]@d41d8cd9"
+      ],
       "devDependencies": []
     },
     "@opam/conduit-lwt@opam:1.4.0@c8d62b5a": {

esy.lock/opam/conf-autoconf.0.1/opam

@@ -0,0 +1,31 @@
+opam-version: "2.0"
+maintainer: "[email protected]"
+homepage: "http://www.gnu.org/software/autoconf"
+authors: "https://www.gnu.org/software/autoconf/autoconf.html#maintainer"
+bug-reports: "https://github.com/ocaml/opam-repository/issues"
+license: "GPL-3.0"
+build: [
+  ["which" "autoconf"]
+]
+depends: ["conf-which" {build}]
+depexts: [
+  ["autoconf"] {os-distribution = "debian"}
+  ["autoconf"] {os-distribution = "ubuntu"}
+  ["autoconf"] {os-distribution = "centos"}
+  ["autoconf"] {os-distribution = "fedora"}
+  ["autoconf"] {os-distribution = "arch"}
+  ["sys-devel/autoconf"] {os-distribution = "gentoo"}
+  ["autoconf"] {os-distribution = "nixos"}
+  ["autoconf"] {os = "macos" & os-distribution = "homebrew"}
+  ["devel/autoconf"] {os = "openbsd"}
+  ["autoconf"] {os = "freebsd"}
+  ["autoconf"] {os = "netbsd"}
+  ["autoconf"] {os-distribution = "alpine"}
+  ["autoconf"] {os-distribution = "ol"}
+  ["autoconf"] {os-distribution = "rhel"}
+]
+synopsis: "Virtual package relying on autoconf installation"
+description: """
+This package can only install if the autoconf command
+is available on the system."""
+flags: conf

examples/lwt/lwt_get.ml

@@ -25,9 +25,9 @@ open Lwt.Infix
 
 let () =
   let host = ref None in
-  let port = ref 80 in
+  let port = ref 443 in
   Arg.parse
-    [ "-p", Set_int port, " Port number (80 by default)" ]
+    [ "-p", Set_int port, " Port number (443 by default)" ]
     (fun host_argument -> host := Some host_argument)
     "lwt_get.exe [-p N] HOST";
   let host =
@@ -54,9 +54,9 @@ let () =
       in
       let response_received, notify_response_received = Lwt.wait () in
       let response_handler = response_handler notify_response_received in
-      Client.TLS.create_connection ~error_handler socket >>= fun connection ->
+      Client.SSL.create_connection ~error_handler socket >>= fun connection ->
       let request_body =
-        Client.TLS.request connection request ~error_handler ~response_handler
+        Client.SSL.request connection request ~error_handler ~response_handler
       in
       Body.close_writer request_body;