cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #37936 from vbgl/flow-0.68

Browse source 
flow: 0.66.0 -> 0.68.0
This commit is contained in:
Jörg Thalheim 2018-03-28 00:36:37 +01:00 committed by GitHub
commit 97fc985fa2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/development/ocaml-modules/lwt/ppx.nix Normal file
View file

@ -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;
};
}

8
pkgs/development/tools/analysis/flow/default.nix
View file

@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, { 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; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.66.0"; version = "0.68.0";
name = "flow-${version}"; name = "flow-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "flow"; repo = "flow";
rev = "v${version}"; rev = "v${version}";
sha256 = "0l1sdd1n0llmz8m81vym3zhcn824sr9w46h9jpb7i7wrcm4y410d"; sha256 = "0wags0msk7s1z3gi6ns6d7zdpqk8wh5ryafvdyk6zwqwhaqgr5jw";
}; };
installPhase = '' installPhase = ''
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ 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 ]; ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -7780,7 +7780,7 @@ 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 ocaml_lwt inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx
wtf8 dtoa; wtf8 dtoa;
}; };

4
pkgs/top-level/ocaml-packages.nix
View file

@ -374,6 +374,10 @@ let
ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2; ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2;
lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix {
lwt = lwt3;
};
lwt_react = callPackage ../development/ocaml-modules/lwt_react { lwt_react = callPackage ../development/ocaml-modules/lwt_react {
lwt = lwt3; lwt = lwt3;
}; };