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: 2932d787ec7b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ade49c999a49
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 24, 2020

  1. Copy the full SHA
    0e1259a View commit details

Commits on Jan 25, 2020

  1. Merge pull request #78446 from marsam/update-flow

    flow: 0.116.1 -> 0.117.0
    marsam authored Jan 25, 2020
    Copy the full SHA
    ade49c9 View commit details
Showing with 3 additions and 11 deletions.
  1. +3 −11 pkgs/development/tools/analysis/flow/default.nix
14 changes: 3 additions & 11 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, fetchpatch }:
{ stdenv, fetchFromGitHub, ocamlPackages, CoreServices }:

stdenv.mkDerivation rec {
pname = "flow";
version = "0.116.1";
version = "0.117.0";

src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "19j2zw8ajky04d2ayfzj99yz805igip1ql3i4v7bblamc8sk38cn";
sha256 = "1s3qlq0jfx94fr7vzzc7jw8l5mvsrrxhq9mcf50aq0ipz0fz0il9";
};

installPhase = ''
@@ -19,14 +19,6 @@ stdenv.mkDerivation rec {
buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex_2 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 with the next release
(fetchpatch {
url = "https://github.com/facebook/flow/commit/d061b38042327d8241fb6dec7c8307c86b2f23d6.patch";
sha256 = "1rmkb1zldgm2y2n32nm2xd8c7wk3hccsbljjz6bm6a0yixa6w77l";
})
];

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