diff --git a/pkgs/development/ocaml-modules/reason-react/default.nix b/pkgs/development/ocaml-modules/reason-react/default.nix index a447c3172d60..148a79fe5cee 100644 --- a/pkgs/development/ocaml-modules/reason-react/default.nix +++ b/pkgs/development/ocaml-modules/reason-react/default.nix @@ -5,7 +5,7 @@ reason-react-ppx, }: -buildDunePackage { +buildDunePackage (finalAttrs: { pname = "reason-react"; inherit (reason-react-ppx) version src; nativeBuildInputs = [ @@ -25,4 +25,4 @@ buildDunePackage { meta = reason-react-ppx.meta // { description = "Reason bindings for React.js"; }; -} +}) diff --git a/pkgs/development/ocaml-modules/reason-react/ppx.nix b/pkgs/development/ocaml-modules/reason-react/ppx.nix index d81cbf021849..578a35604678 100644 --- a/pkgs/development/ocaml-modules/reason-react/ppx.nix +++ b/pkgs/development/ocaml-modules/reason-react/ppx.nix @@ -3,18 +3,21 @@ fetchurl, lib, ppxlib, + version ? if lib.versionAtLeast ppxlib.version "0.36" then "0.17.0" else "0.16.0", }: -let - version = "0.16.0"; -in -buildDunePackage { +buildDunePackage (finalAttrs: { pname = "reason-react-ppx"; inherit version; minimalOCamlVersion = "4.14"; src = fetchurl { - url = "https://github.com/reasonml/reason-react/releases/download/${version}/reason-react-${version}.tbz"; - hash = "sha256-esPB+mvHHTQ3mUYILrkOjMELJxRDIsWleFcxIwOPQ1w="; + url = "https://github.com/reasonml/reason-react/releases/download/${finalAttrs.version}/reason-react-${finalAttrs.version}.tbz"; + hash = + { + "0.16.0" = "sha256-esPB+mvHHTQ3mUYILrkOjMELJxRDIsWleFcxIwOPQ1w="; + "0.17.0" = "sha256-ArZ6CL1UjcGYPBvGnvQX7Qa16+mQT3T8mETHprT/MYw="; + } + ."${finalAttrs.version}"; }; buildInputs = [ ppxlib ]; doCheck = false; # Needs to run in reason-react, see default.nix @@ -23,6 +26,5 @@ buildDunePackage { homepage = "https://github.com/reasonml/reason-react"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vog ]; - broken = lib.versionAtLeast ppxlib.version "0.36"; }; -} +})