From 71a30baab4e0292d1d7ee216abb599ed121b877f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 6 Nov 2018 01:38:48 -0500 Subject: [PATCH] flow: 0.80.0 -> 0.85.0 --- .../tools/analysis/flow/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 00b12970628..3d7a8abf4fe 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,33 +1,28 @@ -{ stdenv, fetchFromGitHub, lib, ocamlPackages, libelf, cf-private, CoreServices }: - -with lib; +{ stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }: stdenv.mkDerivation rec { - version = "0.80.0"; + version = "0.85.0"; name = "flow-${version}"; src = fetchFromGitHub { - owner = "facebook"; - repo = "flow"; - rev = "v${version}"; - sha256 = "0jixisimqwbr46gh9357ya0rscv46svm6kqnawkq1shlf9nwa3lx"; + owner = "facebook"; + repo = "flow"; + rev = "refs/tags/v${version}"; + sha256 = "0kci017bl4ihq89zpwlgdlwzv7kili8146940kyar5v66kgf7xsh"; }; installPhase = '' - mkdir -p $out/bin - cp bin/flow $out/bin/ + install -Dm755 -t $out/bin bin/flow ''; - buildInputs = [ libelf - ] ++ (with ocamlPackages; [ - ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx ppx_deriving ppx_gen_rec lwt_log wtf8 dtoa - ]) ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; + buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ]) + ++ stdenv.lib.optionals stdenv.isDarwin [ cf-private CoreServices ]; meta = with stdenv.lib; { description = "A static type checker for JavaScript"; - homepage = http://flowtype.org; - license = licenses.bsd3; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + homepage = https://flow.org/; + license = licenses.mit; + platforms = ocamlPackages.ocaml.meta.platforms; maintainers = with maintainers; [ puffnfresh globin ]; }; }