flow: update, cleanup, fix (#477168)

pkgs/by-name/fl/flow/gcc-15-compat.patch

@@ -0,0 +1,12 @@
+diff --git a/src/third-party/fuzzy-path/vendor/MatcherBase.h b/src/third-party/fuzzy-path/vendor/MatcherBase.h
+index fbaabc3d92..57c0c58fb2 100644
+--- a/src/third-party/fuzzy-path/vendor/MatcherBase.h
++++ b/src/third-party/fuzzy-path/vendor/MatcherBase.h
+@@ -1,6 +1,7 @@
+ #pragma once
+ 
+ #include <memory>
++#include <cstdint>
+ #include <string>
+ #include <unordered_map>
+ #include <vector>

pkgs/by-name/fl/flow/package.nix

@@ -2,27 +2,35 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  ocamlPackages,
+  ocaml-ng,
   dune,
+  versionCheckHook,
 }:
 
-stdenv.mkDerivation rec {
+let
+  ocamlPackages = ocaml-ng.ocamlPackages.overrideScope (
+    self: super: {
+      ppxlib = super.ppxlib.override { version = "0.33.0"; };
+    }
+  );
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "flow";
-  version = "0.288.0";
+  version = "0.295.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
-    tag = "v${version}";
-    hash = "sha256-9KApZvjOSwR9wcO7nRmpPf2M5SzmV0Z0bM7O8StqZK0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Mqx07dJAYIesp09RmKr74rLKRkG46nHQERhuQ7AyAiM=";
   };
 
-  makeFlags = [ "FLOW_RELEASE=1" ];
+  patches = [
+    # error: 'uint64_t' does not name a type
+    ./gcc-15-compat.patch
+  ];
 
-  installPhase = ''
-    install -Dm755 bin/flow $out/bin/flow
-    install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow
-  '';
+  makeFlags = [ "FLOW_RELEASE=1" ];
 
   strictDeps = true;
 
@@ -52,13 +60,28 @@ stdenv.mkDerivation rec {
     ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify ]
   );
 
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 bin/flow $out/bin/flow
+    install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow
+
+    runHook postInstall
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   meta = {
     description = "Static type checker for JavaScript";
     mainProgram = "flow";
     homepage = "https://flow.org/";
-    changelog = "https://github.com/facebook/flow/blob/v${version}/Changelog.md";
+    changelog = "https://github.com/facebook/flow/blob/${finalAttrs.src.tag}/Changelog.md";
     license = lib.licenses.mit;
     platforms = ocamlPackages.ocaml.meta.platforms;
     maintainers = with lib.maintainers; [ puffnfresh ];
   };
-}
+})

pkgs/top-level/all-packages.nix

@@ -6199,14 +6199,6 @@ with pkgs;
     haskellPackages.callPackage ../tools/misc/fffuu { }
   );
 
-  flow = callPackage ../development/tools/analysis/flow {
-    ocamlPackages = ocaml-ng.ocamlPackages.overrideScope (
-      self: super: {
-        ppxlib = super.ppxlib.override { version = "0.33.0"; };
-      }
-    );
-  };
-
   gede = libsForQt5.callPackage ../development/tools/misc/gede { };
 
   gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { };