summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix25
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix20
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix22
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix24
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix34
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix21
-rw-r--r--pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix18
-rw-r--r--pkgs/top-level/ocaml-packages.nix122
26 files changed, 80 insertions, 584 deletions
diff --git a/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix
deleted file mode 100644
index 2110b1d6b504..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, core_kernel, ppx_jane
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-async_kernel-113.33.00";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/async_kernel-113.33.00.tar.gz;
-    sha256 = "1kkkqpdd3mq9jh3b3l1yk37841973lh6g3pfv8fcjzif4n7myf15";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
-  propagatedBuildInputs = [ core_kernel ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix
deleted file mode 100644
index 595e1198de5f..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, async_kernel, core, ppx_jane
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-async_unix-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/async_unix-113.33.00+4.03.tar.gz;
-    sha256 = "12b0ffq9yhv3f49kk2k7z7hrn2j4xlka7knm99hczl6gmjni7nqv";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
-  propagatedBuildInputs = [ async_kernel core ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix b/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix
deleted file mode 100644
index 48bafd5c3c5a..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_jane, core_kernel
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-core-113.33.02+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/core-113.33.02+4.03.tar.gz;
-    sha256 = "1gvd5saa0sdgyv9w09imqlkw0c21v2ixic8fxx14jxrwck0zn4bc";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
-  propagatedBuildInputs = [ core_kernel ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix
deleted file mode 100644
index d6da9caed7d7..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, ppx_jane
-, bin_prot, fieldslib, typerep, variantslib
-, ppx_assert, ppx_bench, ppx_expect, ppx_inline_test
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-core_kernel-113.33.01+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/core_kernel-113.33.01+4.03.tar.gz;
-    sha256 = "0ra2frspqjqk1wbb58lrb0anrgsyhja00zsybka85qy71lblamfs";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
-  propagatedBuildInputs = [
-    bin_prot fieldslib typerep variantslib
-    ppx_assert ppx_bench ppx_expect ppx_inline_test
-  ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix
deleted file mode 100644
index 3414324a5c81..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_inline_test
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_bench-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_bench-113.33.00+4.03.tar.gz;
-    sha256 = "00iv0p3cni4r7iimwm04bjg2hzvlvdb0b1kynjw2xav64xc29q01";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_inline_test ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix
deleted file mode 100644
index 43517a82d3b2..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, bin_prot, ppx_deriving, ppx_tools, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_bin_prot-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_bin_prot-113.33.00+4.03.tar.gz;
-    sha256 = "1xw1yjgnd5ny1cq0n6rbsdaywyzq2n0jwg4gjsxv14dhv0alav36";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ bin_prot ppx_deriving ppx_type_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix
deleted file mode 100644
index 794570402025..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_deriving, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_compare-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_compare-113.33.00+4.03.tar.gz;
-    sha256 = "07drgg6c857lsvxdjscdcb1ncdr5p3183spw32sbfcrbnr12nzys";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_type_conv ppx_deriving ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix
deleted file mode 100644
index 71bc62937d4d..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_core-133.33.01+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_core-113.33.01+4.03.tar.gz;
-    sha256 = "0ibww4lx87lmn164mxczl3sa7ldwc7g1zi4m9c4vllsv004iyffl";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix
deleted file mode 100644
index d75c7f811286..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_sexp_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_custom_printf-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_custom_printf-113.33.00+4.03.tar.gz;
-    sha256 = "1hw8q4x0hzyg3brlqpdm0bc7z6lnj6qymzw123cf51q9dq0386jb";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ ppx_sexp_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix
deleted file mode 100644
index 77fde21e8d79..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_deriving, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_enumerate-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_enumerate-113.33.00+4.03.tar.gz;
-    sha256 = "0b0kvdw6kids4yrzqq2h82gmnx1zfiahr82rrdbwiwkk4g0pxl93";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_deriving ppx_type_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix
deleted file mode 100644
index 32133dfb6894..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_driver, ppx_assert, ppx_custom_printf, ppx_inline_test
-, ppx_fields_conv, ppx_variants_conv, re, sexplib, fieldslib
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_expect-113.33.01+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_expect-113.33.01+4.03.tar.gz;
-    sha256 = "1r358vx3wnkzq8kwgi49400l1fx2bnl6gds4hl7s67lxsqxki2z7";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_assert ppx_custom_printf ppx_fields_conv ppx_variants_conv re ];
-  propagatedBuildInputs = [ ppx_driver ppx_inline_test fieldslib sexplib ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix
deleted file mode 100644
index ba098b9294f6..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_here
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_fail-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_fail-113.33.00+4.03.tar.gz;
-    sha256 = "1fy1aqsylf6yk527w13rm2b20il9vy026c5ww65pj3ks5zykfvx9";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_here ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix
deleted file mode 100644
index 70d6ec61b0ea..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, fieldslib, ppx_deriving, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_fields_conv-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_fields_conv-113.33.00+4.03.tar.gz;
-    sha256 = "1wfi8pc0y7wjiscvawhfgbcfx7ypmikmyyagwhzw7jhnldljwrkg";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ fieldslib ppx_deriving ppx_type_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix
deleted file mode 100644
index 7b9414353a9e..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_driver
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_inline_test-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_inline_test-113.33.00+4.03.tar.gz;
-    sha256 = "1sw71wnwznia1spicilj4bzspgdk1dhp0j4hp57a9xmsscg44i4k";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_driver ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix
deleted file mode 100644
index 0a5b19051fc2..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_assert, ppx_bench, ppx_bin_prot, ppx_custom_printf, ppx_enumerate, ppx_expect, ppx_fail, ppx_fields_conv, ppx_let, ppx_pipebang, ppx_sexp_message, ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_jane-113.33.00";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_jane-113.33.00.tar.gz;
-    sha256 = "15lbrc9jj83k208gv7knz7mk9xh9mdb657jdjb1006gdsskfmra6";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ ppx_assert ppx_bench ppx_bin_prot
-    ppx_custom_printf ppx_enumerate ppx_expect ppx_fail ppx_fields_conv
-    ppx_let ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv
-    ppx_variants_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix
deleted file mode 100644
index b5f0bd4c9324..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_driver
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_let-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_let-113.33.00+4.03.tar.gz;
-    sha256 = "012yzayknm9qv8ap9rbwf4fwnmx935mfy7c75ifagbnfl4lh7dmp";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ ppx_driver ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix
deleted file mode 100644
index 05e7f40eb686..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, opam, topkg, oasis
-, ppx_core, ppx_tools
-}:
-
-let
-  param = {
-    "4.03" = {
-      version = "113.33.00+4.03";
-      sha256 = "1fkz6n40l4ck8bcr548d2yp08zc9fjv42zldlh0cj3ammhiz3gap";
-    };
-    "4.04" = {
-      version = "113.33.01+4.03";
-      sha256 = "1caw5dfgh5rw8mcgar0hdn485j1rqlnkbfb8wd0wdl5zhkg8jk3d";
-    };
-  }."${ocaml.meta.branch}";
-in
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_optcomp-${param.version}";
-  src = fetchzip {
-    url = "http://github.com/janestreet/ppx_optcomp/archive/${param.version}.tar.gz";
-    inherit (param) sha256;
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam oasis ppx_tools ];
-  propagatedBuildInputs = [ ppx_core ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix
deleted file mode 100644
index 5aa589e250c1..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_driver
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_pipebang-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_pipebang-113.33.00+4.03.tar.gz;
-    sha256 = "1rjrpbncy8vzwnmc5n0qs4dd40dmg4h75dvd7h7lm8cpxalifivc";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_driver ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix
deleted file mode 100644
index d8c9166585e1..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, sexplib, ppx_deriving, ppx_tools, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_sexp_conv-133.33.01+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_conv-113.33.01+4.03.tar.gz;
-    sha256 = "176pydk5fs8m2md9v8v5b16gra90s4v0ssqq38ghfsbv1faca8d6";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ sexplib ppx_deriving ppx_type_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix
deleted file mode 100644
index ddf66364b305..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_sexp_conv, ppx_here
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_sexp_message-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_message-113.33.00+4.03.tar.gz;
-    sha256 = "01vrm8dk413gh19i2y6ffpsmscjhayp3asn5hcbcflxsvlaf4klx";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix
deleted file mode 100644
index 21b67b9cce73..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_here, ppx_sexp_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_sexp_value-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_value-113.33.00+4.03.tar.gz;
-    sha256 = "0pn2v1m479lbdgprv4w9czyv5nim0hz6ailmy1xxlxlhazwbqzwm";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix b/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix
deleted file mode 100644
index 49cfc19321d6..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_core, ppx_deriving, ppx_driver
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_type_conv-133.33.02+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_type_conv-113.33.02+4.03.tar.gz;
-    sha256 = "0y7hsh152gcj89i6cr3b9kxgdnb2sx8vhaq2bdvbcc9zrirwq4d2";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_deriving ];
-  propagatedBuildInputs = [ ppx_core ppx_driver ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix
deleted file mode 100644
index 69a4ad7e69a4..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, typerep, ppx_tools, ppx_type_conv, ppx_deriving
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_typerep_conv-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_typerep_conv-113.33.00+4.03.tar.gz;
-    sha256 = "0k03wp07jvv3zpsm8n5hvskd5iagjvpcpxj9rpj012nia5iqfaj6";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_type_conv typerep ppx_deriving ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix
deleted file mode 100644
index fb8a994790cb..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, variantslib, ppx_deriving, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_variants_conv-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_variants_conv-113.33.00+4.03.tar.gz;
-    sha256 = "0il0nkdwwsc1ymshj4q9nzw5ixm12ls0jj7z3q16k48bg3z5ibc0";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ variantslib ppx_deriving ppx_type_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix
deleted file mode 100644
index 4f86f080738a..000000000000
--- a/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-sexplib-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/sexplib-113.33.00+4.03.tar.gz;
-    sha256 = "1dirdrags3z8m80z1vczfnpdfzgcvm2wyy7g61fxdr8h3jgixpl3";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index b2012923adfe..83c7d610c72e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -31,11 +31,17 @@ let
 
     async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { };
 
-    async_find = callPackage ../development/ocaml-modules/async_find { };
+    async_find =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_find
+      else callPackage ../development/ocaml-modules/async_find { };
 
     async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { };
 
-    async_shell = callPackage ../development/ocaml-modules/async_shell { };
+    async_shell =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_shell
+      else callPackage ../development/ocaml-modules/async_shell { };
 
     async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { };
 
@@ -594,196 +600,228 @@ let
 
     ppx_core =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_core-113_33_01.nix {}
+      then janeStreet.ppx_core
       else callPackage ../development/ocaml-modules/janestreet/ppx-core.nix {};
 
     ppx_optcomp =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix {
-        oasis = ocaml_oasis; }
+      then janeStreet.ppx_optcomp
       else callPackage ../development/ocaml-modules/janestreet/ppx-optcomp.nix {};
 
-    ppx_driver = callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {};
+    ppx_driver =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.ppx_driver
+      else callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {};
 
     ppx_type_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix { }
+      then janeStreet.ppx_type_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-type-conv.nix {};
 
     ppx_compare =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix {}
+      then janeStreet.ppx_compare
       else callPackage ../development/ocaml-modules/janestreet/ppx-compare.nix {};
 
-    ppx_here = callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {};
+    ppx_here =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.ppx_here
+      else callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {};
 
     ppx_sexp_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix { }
+      then janeStreet.ppx_sexp_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-conv.nix {};
 
-    ppx_assert = callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {};
+    ppx_assert =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.ppx_assert
+      else callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {};
 
     ppx_inline_test =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix {}
+      then janeStreet.ppx_inline_test
       else callPackage ../development/ocaml-modules/janestreet/ppx-inline-test.nix {};
 
     ppx_bench =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix {}
+      then janeStreet.ppx_bench
       else callPackage ../development/ocaml-modules/janestreet/ppx-bench.nix {};
 
     ppx_bin_prot =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix {}
+      then janeStreet.ppx_bin_prot
       else callPackage ../development/ocaml-modules/janestreet/ppx-bin-prot.nix {};
 
     ppx_custom_printf =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix {}
+      then janeStreet.ppx_custom_printf
       else callPackage ../development/ocaml-modules/janestreet/ppx-custom-printf.nix {};
 
     ppx_enumerate =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix {}
+      then janeStreet.ppx_enumerate
       else callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {};
 
     ppx_fail =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix {}
+      then janeStreet.ppx_fail
       else callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {};
 
     ppx_fields_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix {}
+      then janeStreet.ppx_fields_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-fields-conv.nix {};
 
     ppx_let =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_let-113_33_00.nix {}
+      then janeStreet.ppx_let
       else callPackage ../development/ocaml-modules/janestreet/ppx-let.nix {};
 
     ppx_pipebang =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix {}
+      then janeStreet.ppx_pipebang
       else callPackage ../development/ocaml-modules/janestreet/ppx-pipebang.nix {};
 
     ppx_sexp_message =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix {}
+      then janeStreet.ppx_sexp_message
       else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-message.nix {};
 
     ppx_sexp_value =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix {}
+      then janeStreet.ppx_sexp_value
       else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-value.nix {};
 
     ppx_typerep_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix {}
+      then janeStreet.ppx_typerep_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-typerep-conv.nix {};
 
     ppx_variants_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix {}
+      then janeStreet.ppx_variants_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {};
 
     ppx_expect =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix {}
+      then janeStreet.ppx_expect
       else callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {};
 
     ppx_jane =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix {}
+      then janeStreet.ppx_jane
       else callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {};
 
 
     # Core sublibs
     typerep =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.typerep
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/typerep.nix {}
       else typerep_p4;
 
     fieldslib =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.fieldslib
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {}
       else fieldslib_p4;
 
     sexplib =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/sexplib-113_33_00.nix {}
+      then janeStreet.sexplib
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {}
       else sexplib_p4;
 
     variantslib =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.variantslib
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/variantslib.nix {}
       else variantslib_p4;
 
     bin_prot =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.bin_prot
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {}
       else bin_prot_p4;
 
     core_kernel =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/core_kernel-113_33_01.nix {}
+      then janeStreet.core_kernel
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}
       else core_kernel_p4;
 
     core =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/core-113_33_02.nix {}
+      then janeStreet.core
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/core.nix {}
       else core_p4;
 
     re2 =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.re2
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/re2.nix {}
       else re2_p4;
 
     textutils =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.textutils
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/textutils.nix {}
       else textutils_p4;
 
     core_extended =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.core_extended
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {}
       else core_extended_p4;
 
     async_kernel =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/async_kernel-113_33_00.nix {}
+      then janeStreet.async_kernel
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {}
       else async_kernel_p4;
 
-    async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {};
+    async_rpc_kernel =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_rpc_kernel
+      else callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {};
 
     async_unix =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/async_unix-113_33_00.nix {}
+      then janeStreet.async_unix
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {}
       else async_unix_p4;
 
     async_extra =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_extra
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {}
       else async_extra_p4;
 
     async =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async.nix {}
       else async_p4;
 
-    async_ssl = callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { };
+    async_ssl =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_ssl
+      else callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { };
 
     # Apps / from all-packages