From 046ea5a12b9fc314fae8b575354326f649d19dff Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 5 Jan 2026 14:18:24 +0000 Subject: [PATCH 1/4] flow: move to by-name --- .../flow/default.nix => by-name/fl/flow/package.nix} | 9 ++++++++- pkgs/top-level/all-packages.nix | 8 -------- 2 files changed, 8 insertions(+), 9 deletions(-) rename pkgs/{development/tools/analysis/flow/default.nix => by-name/fl/flow/package.nix} (88%) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/by-name/fl/flow/package.nix similarity index 88% rename from pkgs/development/tools/analysis/flow/default.nix rename to pkgs/by-name/fl/flow/package.nix index 0fb442737540..6699329a4acb 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/by-name/fl/flow/package.nix @@ -2,10 +2,17 @@ lib, stdenv, fetchFromGitHub, - ocamlPackages, + ocaml-ng, dune, }: +let + ocamlPackages = ocaml-ng.ocamlPackages.overrideScope ( + self: super: { + ppxlib = super.ppxlib.override { version = "0.33.0"; }; + } + ); +in stdenv.mkDerivation rec { pname = "flow"; version = "0.288.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 235eee08a479..b92f9406da3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6200,14 +6200,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 { }; From a7632eb765d899d1fded33cfb51401d3fe646a90 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 5 Jan 2026 14:19:32 +0000 Subject: [PATCH 2/4] flow: cleanup --- pkgs/by-name/fl/flow/package.nix | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/fl/flow/package.nix b/pkgs/by-name/fl/flow/package.nix index 6699329a4acb..363a511d27a0 100644 --- a/pkgs/by-name/fl/flow/package.nix +++ b/pkgs/by-name/fl/flow/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, ocaml-ng, dune, + versionCheckHook, }: let @@ -13,24 +14,19 @@ let } ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flow"; version = "0.288.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9KApZvjOSwR9wcO7nRmpPf2M5SzmV0Z0bM7O8StqZK0="; }; makeFlags = [ "FLOW_RELEASE=1" ]; - installPhase = '' - install -Dm755 bin/flow $out/bin/flow - install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow - ''; - strictDeps = true; nativeBuildInputs = with ocamlPackages; [ @@ -59,13 +55,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 ]; }; -} +}) From 17ef1d0b1cc2fb66a6f41ccd443e6f34922e8981 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 5 Jan 2026 14:20:16 +0000 Subject: [PATCH 3/4] flow: 0.288.0 -> 0.295.0 Diff: https://github.com/facebook/flow/compare/v0.288.0...v0.295.0 Changelog: https://github.com/facebook/flow/blob/v0.295.0/Changelog.md --- pkgs/by-name/fl/flow/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flow/package.nix b/pkgs/by-name/fl/flow/package.nix index 363a511d27a0..ddd421d71fdc 100644 --- a/pkgs/by-name/fl/flow/package.nix +++ b/pkgs/by-name/fl/flow/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "flow"; - version = "0.288.0"; + version = "0.295.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; tag = "v${finalAttrs.version}"; - hash = "sha256-9KApZvjOSwR9wcO7nRmpPf2M5SzmV0Z0bM7O8StqZK0="; + hash = "sha256-Mqx07dJAYIesp09RmKr74rLKRkG46nHQERhuQ7AyAiM="; }; makeFlags = [ "FLOW_RELEASE=1" ]; From 99404e70a23f07cdc107c66144ba1ab666fe8e2d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 5 Jan 2026 14:23:19 +0000 Subject: [PATCH 4/4] flow: fix build with GCC 15 Tracking: https://github.com/NixOS/nixpkgs/issues/475479 --- pkgs/by-name/fl/flow/gcc-15-compat.patch | 12 ++++++++++++ pkgs/by-name/fl/flow/package.nix | 5 +++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/by-name/fl/flow/gcc-15-compat.patch diff --git a/pkgs/by-name/fl/flow/gcc-15-compat.patch b/pkgs/by-name/fl/flow/gcc-15-compat.patch new file mode 100644 index 000000000000..670e4ac0a4cf --- /dev/null +++ b/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 ++#include + #include + #include + #include diff --git a/pkgs/by-name/fl/flow/package.nix b/pkgs/by-name/fl/flow/package.nix index ddd421d71fdc..2ba10797e23c 100644 --- a/pkgs/by-name/fl/flow/package.nix +++ b/pkgs/by-name/fl/flow/package.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Mqx07dJAYIesp09RmKr74rLKRkG46nHQERhuQ7AyAiM="; }; + patches = [ + # error: 'uint64_t' does not name a type + ./gcc-15-compat.patch + ]; + makeFlags = [ "FLOW_RELEASE=1" ]; strictDeps = true;