Merge pull request #43261 from vbgl/ocaml-iri-0.4.0

ocamlPackages.iri: init at 0.4.0

pkgs/development/ocaml-modules/iri/default.nix

@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitLab, ocaml, findlib
+, sedlex, uunf, uutf
+}:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "iri is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  version = "0.4.0";
+  name = "ocaml${ocaml.version}-iri-${version}";
+
+  src = fetchFromGitLab {
+    domain = "framagit.org";
+    owner = "zoggy";
+    repo = "ocaml-iri";
+    rev = version;
+    sha256 = "0fsmfmzmyggm0h77a7mb0n41vqi6q4ln1xzsv72zbvysa7l8w84q";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  propagatedBuildInputs = [ sedlex uunf uutf ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "IRI (RFC3987) native OCaml implementation";
+    license = stdenv.lib.licenses.lgpl3;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
+}

pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix

@@ -1,11 +1,9 @@
-{ stdenv, buildOcaml, fetchFromGitHub, ocaml-migrate-parsetree }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocaml-migrate-parsetree }:
 
-buildOcaml rec {
+stdenv.mkDerivation rec {
-  name = "ppx_tools_versioned";
+  name = "ocaml${ocaml.version}-ppx_tools_versioned-${version}";
   version = "5.1";
 
-  minimumSupportedOcamlVersion = "4.02";
-
   src = fetchFromGitHub {
     owner = "let-def";
     repo = "ppx_tools_versioned";
@@ -13,6 +11,8 @@ buildOcaml rec {
     sha256 = "1c7kvca67qpyr4hiy492yik5x31lmkhyhy5wpl0l0fbx7fr7l624";
   };
 
+  buildInputs = [ ocaml findlib ];
+
   propagatedBuildInputs = [ ocaml-migrate-parsetree ];
 
   createFindlibDestdir = true;

pkgs/top-level/ocaml-packages.nix

@@ -321,6 +321,8 @@ let
 
     inifiles = callPackage ../development/ocaml-modules/inifiles { };
 
+    iri = callPackage ../development/ocaml-modules/iri { };
+
     jingoo = callPackage ../development/ocaml-modules/jingoo {
       pcre = ocaml_pcre;
     };