diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-28 00:36:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-28 00:36:37 +0100 |
| commit | 97fc985fa2928cf1de341a14e9061c973e912e58 (patch) | |
| tree | f906908c82e7f4435894eceff2e155b07d1e982c /pkgs/development | |
| parent | 418b37a77865fa2f56c5be19da8580278245f17e (diff) | |
| parent | 1874f09c40bb664470198a8cffa45bab1d31fccc (diff) | |
| download | nixlib-97fc985fa2928cf1de341a14e9061c973e912e58.tar nixlib-97fc985fa2928cf1de341a14e9061c973e912e58.tar.gz nixlib-97fc985fa2928cf1de341a14e9061c973e912e58.tar.bz2 nixlib-97fc985fa2928cf1de341a14e9061c973e912e58.tar.lz nixlib-97fc985fa2928cf1de341a14e9061c973e912e58.tar.xz nixlib-97fc985fa2928cf1de341a14e9061c973e912e58.tar.zst nixlib-97fc985fa2928cf1de341a14e9061c973e912e58.zip | |
Merge pull request #37936 from vbgl/flow-0.68
flow: 0.66.0 -> 0.68.0
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/ocaml-modules/lwt/ppx.nix | 19 | ||||
| -rw-r--r-- | pkgs/development/tools/analysis/flow/default.nix | 8 |
2 files changed, 23 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix new file mode 100644 index 000000000000..3cf08d06f1eb --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt/ppx.nix @@ -0,0 +1,19 @@ +{ stdenv, jbuilder, ocaml, findlib, lwt, ppx_tools_versioned }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-lwt_ppx-${lwt.version}"; + + inherit (lwt) src; + + buildInputs = [ jbuilder ocaml findlib ppx_tools_versioned ]; + + propagatedBuildInputs = [ lwt ]; + + buildPhase = "jbuilder build -p lwt_ppx"; + installPhase = "${jbuilder.installPhase} lwt_ppx.install"; + + meta = { + description = "Ppx syntax extension for Lwt"; + inherit (lwt.meta) license platforms homepage maintainers; + }; +} diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 4a2d298495da..dbe19935d62e 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, - findlib, camlp4, sedlex, ocamlbuild, ocaml_lwt, wtf8, dtoa }: + findlib, camlp4, sedlex, ocamlbuild, lwt_ppx, wtf8, dtoa }: with lib; stdenv.mkDerivation rec { - version = "0.66.0"; + version = "0.68.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "0l1sdd1n0llmz8m81vym3zhcn824sr9w46h9jpb7i7wrcm4y410d"; + sha256 = "0wags0msk7s1z3gi6ns6d7zdpqk8wh5ryafvdyk6zwqwhaqgr5jw"; }; installPhase = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - ocaml libelf findlib camlp4 sedlex ocamlbuild ocaml_lwt wtf8 dtoa + ocaml libelf findlib camlp4 sedlex ocamlbuild lwt_ppx wtf8 dtoa ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; meta = with stdenv.lib; { |