mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-12 03:56:17 +03:00
Merge pull request #65778 from vbgl/reason-3.5.0
reason: 3.3.7 -> 3.5.0
This commit is contained in:
commit
a685288d46
@ -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
|
||||
'';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user