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

flow: use lwt_log

This commit is contained in:
Vincent Laporte 2018-07-12 21:26:06 +00:00
parent 5a7ab721b4
commit ca12adfeaf
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/tools/analysis/flow/default.nix
View File

@ -1,5 +1,4 @@
{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, { stdenv, fetchFromGitHub, lib, ocamlPackages, libelf, cf-private, CoreServices }:
findlib, camlp4, sedlex, ocamlbuild, lwt_ppx, wtf8, dtoa }:
with lib; with lib;
@ -14,21 +13,15 @@ stdenv.mkDerivation rec {
sha256 = "0xrcjjk16w6anpy58qa4la1jyfjs0xg5xkp58slhai996wqif24k"; sha256 = "0xrcjjk16w6anpy58qa4la1jyfjs0xg5xkp58slhai996wqif24k";
}; };
# lwt.log is being split out into a separate package, so this can be
# removed once nixpkgs is updated.
# See https://github.com/ocsigen/lwt/issues/453#issuecomment-352897664
postPatch = ''
substituteInPlace Makefile --replace lwt_log lwt.log
'';
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp bin/flow $out/bin/ cp bin/flow $out/bin/
''; '';
buildInputs = [ buildInputs = [ libelf
ocaml libelf findlib camlp4 sedlex ocamlbuild lwt_ppx wtf8 dtoa ] ++ (with ocamlPackages; [
] ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx lwt_log wtf8 dtoa
]) ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A static type checker for JavaScript"; description = "A static type checker for JavaScript";

2
pkgs/top-level/all-packages.nix
View File

@ -8098,8 +8098,6 @@ with pkgs;
flow = callPackage ../development/tools/analysis/flow { flow = callPackage ../development/tools/analysis/flow {
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
inherit (darwin) cf-private; inherit (darwin) cf-private;
inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx
wtf8 dtoa;
}; };
foreman = callPackage ../tools/system/foreman { }; foreman = callPackage ../tools/system/foreman { };