From e1f43c92e67038b82a0a5986d3f7d1d9f0464fd0 Mon Sep 17 00:00:00 2001 From: dywedir <dywedir@protonmail.ch> Date: Thu, 23 Nov 2017 01:43:08 +0200 Subject: [PATCH] ocamlPackages.reason: 3.0.0 -> 3.0.2 --- pkgs/development/compilers/reason/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index a4f0442d9d1b..f3ae4036a2a3 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,31 +1,32 @@ { stdenv, makeWrapper, buildOcaml, fetchFromGitHub, - ocaml, opam, topkg, menhir, merlin_extend, ppx_tools_versioned, utop }: + ocaml, opam, jbuilder, menhir, merlin_extend, ppx_tools_versioned, utop }: buildOcaml rec { name = "reason"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = version; - sha256 = "0vj3y9vlm9gqvj9grmb9n487avbrj4q5611m7wv1bsdpndvv96jr"; + rev = "v${version}"; + sha256 = "1rpaazy0m76qidxwdr51qrgs3ryyz875rndwp9p30siqd04raswq"; }; propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; - buildInputs = [ makeWrapper opam topkg utop menhir opam topkg ]; + buildInputs = [ makeWrapper opam jbuilder utop menhir ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed createFindlibDestdir = true; postPatch = '' - substituteInPlace src/reasonbuild.ml --replace "refmt --print binary" "$out/bin/refmt --print binary" + substituteInPlace src/reasonbuild/myocamlbuild.ml \ + --replace "refmt --print binary" "$out/bin/refmt --print binary" ''; installPhase = '' - ${topkg.installPhase} + ${jbuilder.installPhase} wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \