diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-02-04 09:49:23 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-02-11 07:32:59 +0100 |
| commit | 6c52b3ade9cc43bbb15f88297493b8505968887b (patch) | |
| tree | 31737a9df6ca97bc321ffe248a95398d1ecf68ad | |
| parent | 212b24a566ffd1e30fdecf179a8777355dacab18 (diff) | |
| download | nixpkgs-6c52b3ade9cc43bbb15f88297493b8505968887b.tar nixpkgs-6c52b3ade9cc43bbb15f88297493b8505968887b.tar.gz nixpkgs-6c52b3ade9cc43bbb15f88297493b8505968887b.tar.bz2 nixpkgs-6c52b3ade9cc43bbb15f88297493b8505968887b.tar.lz nixpkgs-6c52b3ade9cc43bbb15f88297493b8505968887b.tar.xz nixpkgs-6c52b3ade9cc43bbb15f88297493b8505968887b.tar.zst nixpkgs-6c52b3ade9cc43bbb15f88297493b8505968887b.zip | |
ocamlPackages.reason: 3.5.1 → 3.5.4
| -rw-r--r-- | pkgs/development/compilers/reason/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 20286dcc43c..ef27fc41b07 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,24 +1,23 @@ { stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune -, menhir, merlin-extend, ppx_tools_versioned, utop, cppo -, ocaml_lwt +, fix, menhir, merlin-extend, ppx_tools_versioned, utop, cppo }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.5.1"; + version = "3.5.4"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "aea245a43eb44034d2fccac7028b640a437af239"; - sha256 = "0ff7rjxbsg9zkq6sxlm9bkx7yk8x2cvras7z8436msczgd1wmmyf"; + rev = "e3287476e5c3f0cbcd9dc7ab18d290f81f4afa0c"; + sha256 = "02p5d1x6lr7jp9mvgvsas3nnq3a97chxp5q6rl07n5qm61d5b4dl"; }; nativeBuildInputs = [ makeWrapper ]; 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 @@ -27,8 +26,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ - --prefix CAML_LD_LIBRARY_PATH : "${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib" \ - --prefix OCAMLPATH : "$out/lib/ocaml/${ocaml.version}/site-lib" + --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \ + --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR" ''; meta = with stdenv.lib; { |