ocamlPackages_latest: 5.3 -> 5.4, add recurseIntoAttrs to all-packages (#478532)

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

@@ -9,35 +9,32 @@
   visitors,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.4")
-  "morbig is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+  pname = "morbig";
+  version = "0.11.0";
 
-  buildDunePackage
-  rec {
-    pname = "morbig";
-    version = "0.11.0";
+  src = fetchFromGitHub {
+    owner = "colis-anr";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-fOBaJHHP/Imi9UDLflI52OdKDcmMxpl+NH3pfofmv/o=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "colis-anr";
-      repo = pname;
-      rev = "v${version}";
-      hash = "sha256-fOBaJHHP/Imi9UDLflI52OdKDcmMxpl+NH3pfofmv/o=";
-    };
+  nativeBuildInputs = [
+    menhir
+  ];
 
-    nativeBuildInputs = [
-      menhir
-    ];
+  propagatedBuildInputs = [
+    menhirLib
+    ppx_deriving_yojson
+    visitors
+  ];
 
-    propagatedBuildInputs = [
-      menhirLib
-      ppx_deriving_yojson
-      visitors
-    ];
-
-    meta = {
-      homepage = "https://github.com/colis-anr/${pname}";
-      description = "Static parser for POSIX Shell";
-      license = lib.licenses.gpl3Plus;
-      maintainers = with lib.maintainers; [ niols ];
-    };
-  }
+  meta = {
+    homepage = "https://github.com/colis-anr/${pname}";
+    description = "Static parser for POSIX Shell";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ niols ];
+    broken = lib.versionAtLeast ocaml.version "5.4";
+  };
+}

pkgs/development/tools/ocaml/camlp4/default.nix

@@ -9,7 +9,7 @@
   findlib,
 }:
 
-if lib.versionAtLeast ocaml.version "5.4" then
+if lib.versionAtLeast ocaml.version "5.5" then
   throw "camlp4 is not available for OCaml ${ocaml.version}"
 else
 
@@ -84,6 +84,10 @@ else
           version = "5.3";
           sha256 = "sha256-V/kKhTP9U4jWDFuQKuB7BS3XICg1lq/2Avj7UJR55+k=";
         };
+        "5.4" = {
+          version = "5.4";
+          sha256 = "sha256-7FsKEr0cRVF4LIOvROWMyXBefRTBaS66ZqwtP2VLefM=";
+        };
       }
       .${ocaml.meta.branch};
   in

pkgs/top-level/all-packages.nix

@@ -4968,6 +4968,7 @@ with pkgs;
   ocaml = ocamlPackages.ocaml;
 
   ocamlPackages = recurseIntoAttrs ocaml-ng.ocamlPackages;
+  ocamlPackages_latest = recurseIntoAttrs ocaml-ng.ocamlPackages_latest;
 
   ocaml-crunch = ocamlPackages.crunch.bin;
 

pkgs/top-level/ocaml-packages.nix

@@ -2321,7 +2321,7 @@ rec {
 
   ocamlPackages_5_4 = mkOcamlPackages (callPackage ../development/compilers/ocaml/5.4.nix { });
 
-  ocamlPackages_latest = ocamlPackages_5_3;
+  ocamlPackages_latest = ocamlPackages_5_4;
 
   ocamlPackages = ocamlPackages_5_3;