diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2019-08-03 08:25:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-03 08:25:14 +0200 |
| commit | a685288d46921d7850182dac0d488b32aa8c1785 (patch) | |
| tree | 20a83a7e4213274acc9415511fe77f588b8863e3 | |
| parent | af82b55eccc95a5e6c7b5b81b113673b4ce7543f (diff) | |
| parent | ea5ce273fb83100e0020d2ee05aaf352806a054c (diff) | |
| download | nixlib-a685288d46921d7850182dac0d488b32aa8c1785.tar nixlib-a685288d46921d7850182dac0d488b32aa8c1785.tar.gz nixlib-a685288d46921d7850182dac0d488b32aa8c1785.tar.bz2 nixlib-a685288d46921d7850182dac0d488b32aa8c1785.tar.lz nixlib-a685288d46921d7850182dac0d488b32aa8c1785.tar.xz nixlib-a685288d46921d7850182dac0d488b32aa8c1785.tar.zst nixlib-a685288d46921d7850182dac0d488b32aa8c1785.zip | |
Merge pull request #65778 from vbgl/reason-3.5.0
reason: 3.3.7 -> 3.5.0
| -rw-r--r-- | pkgs/development/compilers/reason/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 715b000f323d..5ade7fd6fbae 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,23 +1,24 @@ { stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune -, menhir, merlin-extend, ppx_tools_versioned, utop +, menhir, merlin-extend, ppx_tools_versioned, utop, cppo +, ocaml_lwt }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.3.7"; + version = "3.5.0"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "4d20e5b535c29c5ef1283e65958b32996e449e5a"; - sha256 = "0f3pb61wg58g8f3wcnp1h4gpmnwmp7bq0cnqdfwldmh9cs0dqyfk"; + rev = "ea207004e021efef5a92ecd011d9d5b9b16bbded"; + sha256 = "0cdjy7sw15rlk63prrwy8lavqrz8fqwsgwr19ihvj99x332r98kk"; }; nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ]; - buildInputs = [ ocaml findlib dune utop menhir ]; + buildInputs = [ ocaml findlib dune cppo utop menhir ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ + --set CAML_LD_LIBRARY_PATH ${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib:$CAML_LD_LIBRARY_PATH \ --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH ''; |