ocaml-ng.ocamlPackages_4_14.ocaml: 4.14.3 → 4.14.4

(cherry picked from commit 1e150a99b7)

pkgs/development/compilers/ocaml/4.14.nix

@@ -1,13 +1,6 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "14";
-  patch_version = "3";
-  sha256 = "sha256-pdWDuPurnqe/bPly75w45/7ay/9tt6NOMQURXTQ+sGk=";
-
-  patches = [
-    {
-      url = "https://github.com/ocaml/ocaml/commit/929f9aa7c00b45acf2d42f3f127b4ee28f926407.patch";
-      hash = "sha256-zeYT+JM71aUcl0sOG2ByjMpp3JPs7kDJ6BKcrZjzoDM=";
-    }
-  ];
+  patch_version = "4";
+  sha256 = "sha256-Ux32KA7PPTAp7UQEhY03wSJHCgTJpBBOa0juT3YvF1w=";
 }

pkgs/development/ocaml-modules/stdcompat/ocaml-4_14_3.patch

@@ -2,19 +2,21 @@ diff --git a/tools/compiler_version.ml b/tools/compiler_version.ml
 index f675a20..c3e7912 100644
 --- a/tools/compiler_version.ml
 +++ b/tools/compiler_version.ml
-@@ -81,6 +81,7 @@ let v4_13_1 = mk 4 13 1
+@@ -81,6 +81,8 @@ let v4_13_1 = mk 4 13 1
  let v4_14_0 = mk 4 14 0
  let v4_14_1 = mk 4 14 1
  let v4_14_2 = mk 4 14 2
 +let v4_14_3 = mk 4 14 3
++let v4_14_4 = mk 4 14 4
  let v5_0_0 = mk 5 0 0
  let v5_1_0 = mk 5 1 0
  let v5_1_1 = mk 5 1 1
-@@ -127,6 +128,7 @@ let known_versions =
+@@ -127,6 +129,8 @@ let known_versions =
    v4_14_0;
    v4_14_1;
    v4_14_2;
 +  v4_14_3;
++  v4_14_4;
    v5_0_0;
    v5_1_0;
    v5_1_1;

pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix

@@ -56,6 +56,7 @@ buildDunePackage {
     license = lib.licenses.gpl2;
     maintainers = [ lib.maintainers.vbgl ];
     mainProgram = "js_of_ocaml";
-    broken = ocaml.version == "4.14.3" && !lib.versionAtLeast version "6.0.0";
+    broken =
+      (ocaml.version == "4.14.3" || ocaml.version == "4.14.4") && !lib.versionAtLeast version "6.0.0";
   };
 }

pkgs/development/tools/ocaml/merlin/4.x.nix

@@ -25,6 +25,7 @@
       "4.14.1" = "4.19-414";
       "4.14.2" = "4.19-414";
       "4.14.3" = "4.19-414";
+      "4.14.4" = "4.19-414";
       "5.0.0" = "4.14-500";
       "5.1.0" = "4.17.1-501";
       "5.1.1" = "4.17.1-501";