JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #65778 from vbgl/reason-3.5.0

Browse Source 
reason: 3.3.7 -> 3.5.0
This commit is contained in:
Sarah Brofeldt 2019-08-03 08:25:14 +02:00 committed by GitHub
commit a685288d46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/reason/default.nix
View File

@ -1,23 +1,24 @@
{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune { 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 { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-reason-${version}"; name = "ocaml${ocaml.version}-reason-${version}";
version = "3.3.7"; version = "3.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "reason"; repo = "reason";
rev = "4d20e5b535c29c5ef1283e65958b32996e449e5a"; rev = "ea207004e021efef5a92ecd011d9d5b9b16bbded";
sha256 = "0f3pb61wg58g8f3wcnp1h4gpmnwmp7bq0cnqdfwldmh9cs0dqyfk"; sha256 = "0cdjy7sw15rlk63prrwy8lavqrz8fqwsgwr19ihvj99x332r98kk";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ]; 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 buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/rtop \ wrapProgram $out/bin/rtop \
--prefix PATH : "${utop}/bin" \ --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 --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH
''; '';