Merge pull request #25989 from frontsideair/flow-46

flow: 0.42.0 -> 0.46.0
This commit is contained in:
Jaka Hudoklin 2017-05-25 01:17:56 +02:00 committed by GitHub
commit fe891e7e10
2 changed files with 5 additions and 5 deletions

View File

@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices }:
{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, findlib, camlp4, sedlex, ocamlbuild }:
with lib;
stdenv.mkDerivation rec {
version = "0.42.0";
version = "0.46.0";
name = "flow-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "1mzl13z3c512b3jrrkzm5wmd9wjpnr173pan0vvpgf23333yvigq";
sha256 = "05rnlckwiynkh0300f27xhrn53pf0hxlkb0iz3nlb81xmsk005a4";
};
installPhase = ''
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cp bin/flow $out/bin/
'';
buildInputs = [ ocaml libelf ]
buildInputs = [ ocaml libelf findlib camlp4 sedlex ocamlbuild ]
++ optionals stdenv.isDarwin [ cf-private CoreServices ];
meta = with stdenv.lib; {

View File

@ -6718,7 +6718,7 @@ with pkgs;
flow = callPackage ../development/tools/analysis/flow {
inherit (darwin.apple_sdk.frameworks) CoreServices;
inherit (darwin) cf-private;
ocaml = ocaml_4_02;
inherit (ocamlPackages_4_03) ocaml findlib camlp4 sedlex ocamlbuild;
};
framac = callPackage ../development/tools/analysis/frama-c { };