try out ppxlib 0.22 (#30)

ci.nix

@@ -126,6 +126,7 @@ let
     "eliom"
     "ocsigen-toolkit"
     "ppx_import" # mystery
+    "visitors"
 
     # broken on 4.12
     "ocaml-lsp"

default.nix

@@ -32,8 +32,8 @@ in
     inherit (self) ocamlPackages;
   }).overrideAttrs (_: {
     src = builtins.fetchurl {
-      url = https://github.com/ocaml/merlin/archive/487eb6f.tar.gz;
-      sha256 = "0jy5ixzlhplx7yy7l9wlq2ix9j5a1w4mj7q8rggz0y95wp6xprnh";
+      url = https://github.com/ocaml/merlin/releases/download/v4.0-411/merlin-v4.0-411.tbz;
+      sha256 = "0m7az1p6sf4fyy763z921j2q2ahl5zf83dgsmpcv29cnjy088655";
     };
   });
 

ocaml/default.nix

@@ -222,8 +222,15 @@ websocketafPackages // {
     ocamlPackages = oself;
   };
 
-  merlin = osuper.merlin.overrideAttrs (_: {
-    src = dot-merlin-reader.src;
+  merlin = osuper.merlin.overrideAttrs (o: {
+    src =
+      if (lib.versionOlder "4.11" osuper.ocaml.version)
+      then dot-merlin-reader.src
+      else
+        builtins.fetchurl {
+          url = https://github.com/ocaml/merlin/releases/download/v3.4.2/merlin-v3.4.2.tbz;
+          sha256 = "109ai1ggnkrwbzsl1wdalikvs1zx940m6n65jllxj68in6bvidz1";
+        };
   });
 
   mirage-clock = osuper.mirage-clock.overrideAttrs (o: {
@@ -291,8 +298,8 @@ websocketafPackages // {
 
   ppxlib = osuper.ppxlib.overrideAttrs (o: {
     src = builtins.fetchurl {
-      url = https://github.com/ocaml-ppx/ppxlib/releases/download/0.21.0/ppxlib-0.21.0.tbz;
-      sha256 = "0gis9qzn3wl4xmvgyzn96i4q4xdayblb3amgb7rm5gr4ilsaz9wf";
+      url = https://github.com/ocaml-ppx/ppxlib/releases/download/0.22.0/ppxlib-0.22.0.tbz;
+      sha256 = "0ykdp55i6x1a5mbxjlvwcfvs4kvzxqnn2bi2lf224rk677h93sry";
     };
     propagatedBuildInputs = [
       # XXX(anmonteiro): this propagates `base` and `stdio` even though

ocaml/janestreet/default.nix

@@ -153,13 +153,18 @@ with ocamlPackages;
     propagatedBuildInputs = [ ppx_jane ];
   };
 
-  base_quickcheck = janePackage {
+  base_quickcheck = (janePackage {
     pname = "base_quickcheck";
     hash = "1lmp1h68g0gqiw8m6gqcbrp0fn76nsrlsqrwxp20d7jhh0693f3j";
     minimumOCamlVersion = "4.04.2";
     meta.description = "Randomized testing framework, designed for compatibility with Base";
     propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let ppx_sexp_value splittable_random ];
-  };
+  }).overrideAttrs (_: {
+    src = builtins.fetchurl {
+      url = https://github.com/janestreet/base_quickcheck/archive/854396463466bd0f739b487b7ba4fb55b7ee49ef.tar.gz;
+      sha256 = "10dif9cinbq9wcmw1qmjsd6ajmfn68r16ivn5qf81z8jxxgwvgnj";
+    };
+  });
 
   bignum = janePackage {
     pname = "bignum";
@@ -586,8 +591,8 @@ with ocamlPackages;
     propagatedBuildInputs = [ ppxlib sexplib0 base ];
   }).overrideAttrs (o: {
     src = builtins.fetchurl {
-      url = https://github.com/janestreet/ppx_sexp_conv/archive/13e9b27f5f9550b825128f8cd1f31d20dc8fa91b.tar.gz;
-      sha256 = "06pda057qbnycg5x01wybrvpbwdrrsn3p0xm92di1zj4fjj8z7w1";
+      url = https://github.com/janestreet/ppx_sexp_conv/archive/291fd9b59d19e29702e0e3170559250c1f382e42.tar.gz;
+      sha256 = "003mzsjy3abqv72rmfnlrjbk24mvl1ck7qz58b8a3xpmgyxz1kq1";
     };
   });
 
@@ -630,14 +635,20 @@ with ocamlPackages;
     propagatedBuildInputs = [ ppx_base ppxlib stdio ];
   };
 
-  ppx_typerep_conv = janePackage {
+  ppx_typerep_conv = (janePackage {
     pname = "ppx_typerep_conv";
     version = "0.14.1";
     minimumOCamlVersion = "4.04.2";
     hash = "1r0z7qlcpaicas5hkymy2q0gi207814wlay4hys7pl5asd59wcdh";
     meta.description = "Generation of runtime types from type declarations";
     propagatedBuildInputs = [ ppxlib typerep ];
-  };
+  }).overrideAttrs (_: {
+    src = builtins.fetchurl
+      {
+        url = https://github.com/janestreet/ppx_typerep_conv/archive/9fa81e6d6feee1049d23d06891aad55baf60dc06.tar.gz;
+        sha256 = "1m3lnxknfp2lx9v8qcncxw4qmvvpz566rgrwca2klxfczp8pzh1d";
+      };
+  });
 
   ppx_variants_conv = janePackage {
     pname = "ppx_variants_conv";