Merge pull request #45892 from vbgl/reason

ocamlPackages.reason: remove spurious dependency on opam
This commit is contained in:
Jörg Thalheim
2018-09-01 11:32:38 +01:00
committed by GitHub

View File

@@ -1,8 +1,9 @@
{ stdenv, makeWrapper, buildOcaml, fetchFromGitHub,
ocaml, opam, jbuilder, menhir, merlin_extend, ppx_tools_versioned, utop }:
{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, jbuilder
, menhir, merlin_extend, ppx_tools_versioned, utop
}:
buildOcaml rec {
name = "reason";
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-reason-${version}";
version = "3.3.3";
src = fetchFromGitHub {
@@ -14,12 +15,10 @@ buildOcaml rec {
propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
buildInputs = [ makeWrapper opam jbuilder utop menhir ];
buildInputs = [ makeWrapper ocaml findlib jbuilder utop menhir ];
buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
createFindlibDestdir = true;
installPhase = ''
for p in reason rtop
do
@@ -35,6 +34,7 @@ buildOcaml rec {
homepage = https://reasonml.github.io/;
description = "Facebook's friendly syntax to OCaml";
license = licenses.mit;
inherit (ocaml.meta) platforms;
maintainers = [ maintainers.volth ];
};
}