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

jbuilder: 1.0.1 -> dune: 1.1.1

Browse Source
This commit is contained in:
Vincent Laporte
2018-09-05 16:11:47 +00:00
committed by Vincent Laporte
parent eb429c7c54
commit fc19401d67
69 changed files with 228 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, jbuilder
{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune
, menhir, merlin_extend, ppx_tools_versioned, utop
}:
@@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
buildInputs = [ makeWrapper ocaml findlib jbuilder utop menhir ];
buildInputs = [ makeWrapper ocaml findlib dune utop menhir ];
buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
installPhase = ''
for p in reason rtop
do
${jbuilder.installPhase} $p.install
${dune.installPhase} $p.install
done
wrapProgram $out/bin/rtop \