Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 88ed6b2674fe
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b73a601e84ea
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 17, 2019

  1. Copy the full SHA
    44c5e3d View commit details
  2. Merge pull request #73541 from marsam/update-flow

    flow: 0.111.3 -> 0.112.0
    ryantm authored Nov 17, 2019
    Copy the full SHA
    b73a601 View commit details
Showing with 11 additions and 3 deletions.
  1. +11 −3 pkgs/development/tools/analysis/flow/default.nix
14 changes: 11 additions & 3 deletions pkgs/development/tools/analysis/flow/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, ocamlPackages, CoreServices }:
{ stdenv, fetchFromGitHub, ocamlPackages, CoreServices, fetchpatch }:

stdenv.mkDerivation rec {
pname = "flow";
version = "0.111.3";
version = "0.112.0";

src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "12hfdcm491ylh0a8rhzj76wdbh556r02aj4q6vv86n3lh2120cxm";
sha256 = "1l8aahvlj9hk93snvrqm7r0mxj5iw244q72s6wallsqm7j4g967h";
};

installPhase = ''
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
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 ocaml-migrate-parsetree ])
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];

patches = [
# Fix List.compare labeled argument. Remove when https://github.com/facebook/flow/pull/8191 is merged
(fetchpatch {
url = "https://github.com/facebook/flow/commit/1625664ec7290d4128587d96cb878571751f8881.patch";
sha256 = "18fan0d2xa6z4ilbr7ha3vhnfqlr2s6mb02sgpv8ala99b0mcgmn";
})
];

meta = with stdenv.lib; {
description = "A static type checker for JavaScript";
homepage = https://flow.org/;