diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix index 1d3d058695bf..c7ec05e6b1bf 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.17.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix @@ -1438,16 +1438,28 @@ with self; meta.broken = lib.versionAtLeast ppxlib.version "0.36"; }; - ppx_js_style = janePackage { - pname = "ppx_js_style"; - hash = "sha256-7jRzxe4bLyZ2vnHeqWiLlCUvOlNUAk0dwCfBFhrykUU="; - meta.description = "Code style checker for Jane Street Packages"; - propagatedBuildInputs = [ - octavius - ppxlib - ]; - meta.broken = lib.versionAtLeast ppxlib.version "0.36"; - }; + ppx_js_style = janePackage ( + { + pname = "ppx_js_style"; + meta.description = "Code style checker for Jane Street Packages"; + propagatedBuildInputs = [ + octavius + ppxlib + ]; + } + // ( + if lib.versionAtLeast ppxlib.version "0.36" then + { + version = "0.17.1"; + hash = "sha256-YGGG468WVZbT5JfCB32FfTV7kdRz14ProDQxkdZuE44="; + } + else + { + version = "0.17.0"; + hash = "sha256-7jRzxe4bLyZ2vnHeqWiLlCUvOlNUAk0dwCfBFhrykUU="; + } + ) + ); ppx_let = janePackage ( { diff --git a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix index 11bbb63b59ca..616ecf06f5f3 100644 --- a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix +++ b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix @@ -5,18 +5,22 @@ ppx_js_style, ppx_yojson_conv_lib, ppxlib, + version ? if lib.versionAtLeast ppxlib.version "0.36.0" then "0.17.1" else "0.15.1", }: -buildDunePackage rec { +buildDunePackage { pname = "ppx_yojson_conv"; - version = "0.15.1"; - duneVersion = "3"; - minimalOCamlVersion = "4.08.0"; + inherit version; src = fetchFromGitHub { owner = "janestreet"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-lSOUSMVgsRiArEhFTKpAj2yFBPbtaIc/SxdPA+24xXs="; + repo = "ppx_yojson_conv"; + tag = "v${version}"; + hash = + { + "0.15.1" = "sha256-lSOUSMVgsRiArEhFTKpAj2yFBPbtaIc/SxdPA+24xXs="; + "0.17.1" = "sha256-QI2uN1/KeyDxdk6oxPt48lDir55Kkgx2BX6wKCY59LI="; + } + ."${version}"; }; propagatedBuildInputs = [