ocaml-typerep: 112.24.00 -> 112.24.00/113.33.03

Split typerep into ppx supporting (modern) and p4 supporting (legacy)

4 files changed, 27 insertions, 5 deletions

diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix
index 96fd80087d6..8110711a934 100644
--- a/pkgs/development/ocaml-modules/core/default.nix
+++ b/pkgs/development/ocaml-modules/core/default.nix
@@ -1,7 +1,7 @@
 {stdenv, buildOcaml, fetchurl, type_conv,
  core_kernel, bin_prot, comparelib, custom_printf, enumerate,
  fieldslib, herelib, pa_bench, pa_test, pa_ounit,
- pipebang, sexplib, typerep, variantslib}:
+ pipebang, sexplib, typerep_p4, variantslib}:
 
 buildOcaml rec {
   name = "core";
@@ -19,7 +19,7 @@ buildOcaml rec {
   buildInputs = [ pa_bench pa_test pa_ounit ];
   propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib
                             custom_printf enumerate fieldslib herelib
-                            pipebang sexplib typerep variantslib ];
+                            pipebang sexplib typerep_p4 variantslib ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/core;
diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix
index 0fed12b195d..9be55061b00 100644
--- a/pkgs/development/ocaml-modules/core_kernel/default.nix
+++ b/pkgs/development/ocaml-modules/core_kernel/default.nix
@@ -1,7 +1,7 @@
 {stdenv, buildOcaml, fetchurl, type_conv,
  bin_prot, comparelib, custom_printf, enumerate,
  fieldslib, herelib, pa_bench, pa_test, pa_ounit,
- pipebang, sexplib, typerep, variantslib}:
+ pipebang, sexplib, typerep_p4, variantslib}:
 
 buildOcaml rec {
   name = "core_kernel";
@@ -19,7 +19,7 @@ buildOcaml rec {
   buildInputs = [ pa_test pa_ounit ];
   propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf
                             enumerate fieldslib herelib pipebang sexplib
-                            typerep variantslib ];
+                            typerep_p4 variantslib ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/core_kernel;
diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix
new file mode 100644
index 00000000000..81e6c4be9cb
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix
@@ -0,0 +1,20 @@
+{stdenv, buildOcamlJane, type_conv}:
+
+buildOcamlJane rec {
+  name = "typerep";
+  version = "113.33.03";
+
+  minimumSupportedOcamlVersion = "4.00";
+
+  hash = "1ss34nq20vfgx8hwi5sswpmn3my9lvrpdy5dkng746xchwi33ar7";
+
+  propagatedBuildInputs = [ type_conv ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/typerep;
+    description = "Runtime types for OCaml (beta version)";
+    license = licenses.asl20;
+    maintainers = [ maintainers.maurer maintainers.ericbmerritt ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a672693d8c4..d752d4289ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5470,7 +5470,7 @@ in
 
     twt = callPackage ../development/ocaml-modules/twt { };
 
-    typerep = callPackage ../development/ocaml-modules/typerep { };
+    typerep_p4 = callPackage ../development/ocaml-modules/typerep { };
 
     utop = callPackage ../development/tools/ocaml/utop { };
 
@@ -5555,6 +5555,8 @@ in
     ppx_variants_conv = callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {};
 
     ppx_expect = callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {};
+
+    typerep = callPackage ../development/ocaml-modules/janestreet/typerep.nix {};
   };
 
   ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;