diff --git a/pkgs/development/compilers/ocaml/5.3.nix b/pkgs/development/compilers/ocaml/5.3.nix new file mode 100644 index 000000000000..8fed4b0510a6 --- /dev/null +++ b/pkgs/development/compilers/ocaml/5.3.nix @@ -0,0 +1,6 @@ +import ./generic.nix { + major_version = "5"; + minor_version = "3"; + patch_version = "0"; + sha256 = "sha256-sCKTNtnr4K+QWVS80a5bKTMGu8sIwB6tA1ANnlvJAWQ="; +} diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix index 067d923e0550..404dfd614fbd 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.17.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix @@ -1536,12 +1536,25 @@ with self; ]; }; - ppxlib_jane = janePackage { - pname = "ppxlib_jane"; - hash = "sha256-8NC8CHh3pSdFuRDQCuuhc2xxU+84UAsGFJbbJoKwd0U="; - meta.description = "A library for use in ppxes for constructing and matching on ASTs corresponding to the augmented parsetree"; - propagatedBuildInputs = [ ppxlib ]; - }; + ppxlib_jane = janePackage ( + { + pname = "ppxlib_jane"; + meta.description = "A library for use in ppxes for constructing and matching on ASTs corresponding to the augmented parsetree"; + propagatedBuildInputs = [ ppxlib ]; + } + // ( + if lib.versionAtLeast ocaml.version "5.3" then + { + version = "0.17.1"; + hash = "sha256-kcGXqO1kFYds8KwLvpIQ7OKhqnp6JZs8WYYLi7o/nBw="; + } + else + { + version = "0.17.0"; + hash = "sha256-8NC8CHh3pSdFuRDQCuuhc2xxU+84UAsGFJbbJoKwd0U="; + } + ) + ); profunctor = janePackage { pname = "profunctor"; diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index 66038de71668..6d4797ecf4ac 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, fetchurl, + ocaml, buildDunePackage, gen, ppxlib, @@ -74,7 +75,7 @@ buildDunePackage rec { ppx_expect ]; - doCheck = true; + doCheck = !lib.versionAtLeast ocaml.version "5.3"; dontStrip = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2105704520f8..a123db4bd185 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -2099,7 +2099,9 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_5_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/5.2.nix { }); - ocamlPackages_latest = ocamlPackages_5_2; + ocamlPackages_5_3 = mkOcamlPackages (callPackage ../development/compilers/ocaml/5.3.nix { }); + + ocamlPackages_latest = ocamlPackages_5_3; ocamlPackages = ocamlPackages_5_2;