ocamlPackages.reason: 3.5.1 → 3.5.4

This commit is contained in:
Vincent Laporte 2020-02-04 09:49:23 +01:00 committed by Vincent Laporte
parent 212b24a566
commit 6c52b3ade9

View File

@ -1,24 +1,23 @@
{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune { stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune
, menhir, merlin-extend, ppx_tools_versioned, utop, cppo , fix, menhir, merlin-extend, ppx_tools_versioned, utop, cppo
, ocaml_lwt
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-reason-${version}"; name = "ocaml${ocaml.version}-reason-${version}";
version = "3.5.1"; version = "3.5.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "reason"; repo = "reason";
rev = "aea245a43eb44034d2fccac7028b640a437af239"; rev = "e3287476e5c3f0cbcd9dc7ab18d290f81f4afa0c";
sha256 = "0ff7rjxbsg9zkq6sxlm9bkx7yk8x2cvras7z8436msczgd1wmmyf"; sha256 = "02p5d1x6lr7jp9mvgvsas3nnq3a97chxp5q6rl07n5qm61d5b4dl";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ]; propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ];
buildInputs = [ ocaml findlib dune cppo utop menhir ]; buildInputs = [ ocaml findlib dune cppo fix utop menhir ];
buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
@ -27,8 +26,8 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/rtop \ wrapProgram $out/bin/rtop \
--prefix PATH : "${utop}/bin" \ --prefix PATH : "${utop}/bin" \
--prefix CAML_LD_LIBRARY_PATH : "${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib" \ --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \
--prefix OCAMLPATH : "$out/lib/ocaml/${ocaml.version}/site-lib" --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {