From 48c1319bebd3baf56e8fab605f851cc2e7cee703 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:08 -0700 Subject: [PATCH 1/8] folly: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebook/folly/compare/v2025.09.15.00...v2025.10.13.00 --- .../fo/folly/fix-stdexcept-include.patch | 22 ------------------- pkgs/by-name/fo/folly/package.nix | 15 +++---------- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 pkgs/by-name/fo/folly/fix-stdexcept-include.patch diff --git a/pkgs/by-name/fo/folly/fix-stdexcept-include.patch b/pkgs/by-name/fo/folly/fix-stdexcept-include.patch deleted file mode 100644 index c13632abf599..000000000000 --- a/pkgs/by-name/fo/folly/fix-stdexcept-include.patch +++ /dev/null @@ -1,22 +0,0 @@ -From dc06cc3162afb148c19cd0931d8fe489d639217a Mon Sep 17 00:00:00 2001 -From: Uilian Ries -Date: Tue, 9 Sep 2025 16:48:26 +0200 -Subject: [PATCH] Add missing header for std::runtime_error - -Signed-off-by: Uilian Ries ---- - folly/hash/Checksum.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/folly/hash/Checksum.cpp b/folly/hash/Checksum.cpp -index 1d42d6a6e5f..aeafdb20b1b 100644 ---- a/folly/hash/Checksum.cpp -+++ b/folly/hash/Checksum.cpp -@@ -17,6 +17,7 @@ - #include - - #include -+#include - - #include - diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index cce2c4aee1c9..2e6584d32482 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "folly"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; # split outputs to reduce downstream closure sizes outputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "folly"; tag = "v${finalAttrs.version}"; - hash = "sha256-//gx081nMFXAcUgkHQToiFHhECfLW22Fl0eXEsObxUs="; + hash = "sha256-k7PGxYF3HlNc5nPBV+MkELya/4yllkaMA37vcfES4NE="; }; nativeBuildInputs = [ @@ -145,16 +145,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-QGNpS5UNEm+0PW9+agwUVILzpK9t020KXDGyP03OAwE="; }) - # Fix an upstream regression with libstdc++. - # - # See: - # - # * - # * - # * - # * - ./fix-stdexcept-include.patch - # Fix a GCC‐incompatible use of a private trait. # # Per Folly’s own documentation: @@ -237,6 +227,7 @@ stdenv.mkDerivation (finalAttrs: { pierreis emily techknowlogick + lf- ]; }; }) From 3d844fad8be597bdaae47d3d95ba83812cc06390 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:13 -0700 Subject: [PATCH 2/8] fizz: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebookincubator/fizz/compare/v2025.09.15.00...v2025.10.13.00 Changelog: https://github.com/facebookincubator/fizz/releases/tag/v2025.10.13.00 --- pkgs/by-name/fi/fizz/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix index b56562148195..47871e1eb4bf 100644 --- a/pkgs/by-name/fi/fizz/package.nix +++ b/pkgs/by-name/fi/fizz/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; outputs = [ "bin" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookincubator"; repo = "fizz"; tag = "v${finalAttrs.version}"; - hash = "sha256-8j8Nt8XCbMGui7bELhvP+o8E2bqYobkXLhvZVkzCMzU="; + hash = "sha256-MNkPf289QGZ1x6Yr2E8vnlCFan94Opjiw6RItodWGaw="; }; patches = [ @@ -116,6 +116,7 @@ stdenv.mkDerivation (finalAttrs: { kylesferrazza emily techknowlogick + lf- ]; }; }) From 7ced6fbc9c202c8ecfcc080d018440118bb847c3 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:18 -0700 Subject: [PATCH 3/8] mvfst: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebook/mvfst/compare/v2025.09.15.00...v2025.10.13.00 --- pkgs/by-name/mv/mvfst/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix index 01a9af81b1c8..65952f295588 100644 --- a/pkgs/by-name/mv/mvfst/package.nix +++ b/pkgs/by-name/mv/mvfst/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mvfst"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; outputs = [ "bin" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "mvfst"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZgzqkR72xtO5VVd2cyMM3vSsUWdW6HEvu9T1sM+cPi8="; + hash = "sha256-bsg+Zqv+aEDH6r6lZazCG25Wj2zG/VSgpmEOKrb44/k="; }; patches = [ @@ -126,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: { ris emily techknowlogick + lf- ]; }; }) From 35e14414047ec535b3b61a82c7703ade88784da6 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:21 -0700 Subject: [PATCH 4/8] wangle: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebook/wangle/compare/v2025.09.15.00...v2025.10.13.00 --- pkgs/by-name/wa/wangle/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 56928c88ffbd..baba9795b63a 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "wangle"; tag = "v${finalAttrs.version}"; - hash = "sha256-S2L3ifQTwyidz3x5pPrVEGEJXvM1czqTRXYsYUqIeRY="; + hash = "sha256-lptILtCaVeO8yXlIYHaATfJw6VyPxUJCx7nxfOZVIIc="; }; patches = [ @@ -109,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: { kylesferrazza emily techknowlogick + lf- ]; }; }) From 032c4bb99b39006dc96bafc4e1b2d035702fcd97 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:36 -0700 Subject: [PATCH 5/8] fbthrift: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebook/fbthrift/compare/v2025.09.15.00...v2025.10.13.00 --- pkgs/by-name/fb/fbthrift/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index 71e759c7def1..7eeb083253f4 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fbthrift"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; outputs = [ # Trying to split this up further into `bin`, `out`, and `dev` @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fbthrift"; tag = "v${finalAttrs.version}"; - hash = "sha256-4u3SbbmSgtvnW3/VH3CfQrEddAlkQuUl9dmnGGKL4mE="; + hash = "sha256-6Vlmb7PfPl9hyJkpH0vsF4mjNTOxd4lu8CWPE0rRvVo="; }; patches = [ @@ -135,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { kylesferrazza emily techknowlogick + lf- ]; }; }) From aaf02d92354935d59a2232a97de341d77cff7fce Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:41 -0700 Subject: [PATCH 6/8] fb303: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebook/fb303/compare/v2025.09.15.00...v2025.10.13.00 --- pkgs/by-name/fb/fb303/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix index 6c5017bde61b..8e607283bd85 100644 --- a/pkgs/by-name/fb/fb303/package.nix +++ b/pkgs/by-name/fb/fb303/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fb303"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebook"; repo = "fb303"; tag = "v${finalAttrs.version}"; - hash = "sha256-6suO1SE8+WASQiHLtiieu3nrjEYqSPnKxw7nHkQ4br0="; + hash = "sha256-IF3fQY8QfDBo8DoLFIFuZD8OgrrJfXLXDgFcsD1CmaY="; }; patches = [ @@ -75,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { kylesferrazza emily techknowlogick + lf- ]; }; }) From 186ef5ae3057fb32ba69549ce97f5fb1fc66f261 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:07:45 -0700 Subject: [PATCH 7/8] edencommon: 2025.09.15.00 -> 2025.10.13.00 Diff: https://github.com/facebookexperimental/edencommon/compare/v2025.09.15.00...v2025.10.13.00 --- pkgs/by-name/ed/edencommon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix index 2dbf5e9fbb2c..87ca034575fd 100644 --- a/pkgs/by-name/ed/edencommon/package.nix +++ b/pkgs/by-name/ed/edencommon/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "edencommon"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "facebookexperimental"; repo = "edencommon"; tag = "v${finalAttrs.version}"; - hash = "sha256-KyJAosCLGnpEG968GV9BOyOrsoHS7BbRatTfBqzTelU="; + hash = "sha256-yR0J1tfzdAFopApKsiv9yUXlU0W0Q6n6ZlmKlcVbi0E="; }; patches = [ From f2293f52e1daa6755b15ed3f98d97a9bb97375e6 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 14 Oct 2025 12:09:11 -0700 Subject: [PATCH 8/8] watchman: 2025.09.15.00 -> 2025.10.13.00 This update is being done to relocate the state directory into the user's home directory, which fixes all the following prominent bugs caused by multiple instances: Fixes: https://github.com/jj-vcs/jj/issues/5817 Fixes: https://github.com/NixOS/nixpkgs/issues/438257 CC: https://github.com/facebook/watchman/pull/1236 --- pkgs/by-name/wa/watchman/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix index 960f02a70355..0dcd7685782d 100644 --- a/pkgs/by-name/wa/watchman/package.nix +++ b/pkgs/by-name/wa/watchman/package.nix @@ -26,21 +26,17 @@ cpptoml, gtest, - - nix-update-script, - - stateDir ? "", }: stdenv.mkDerivation (finalAttrs: { pname = "watchman"; - version = "2025.09.15.00"; + version = "2025.10.13.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZIFGCOoIuy4Ns51oek3HnBLtCSnI742FTA2YmorBpyk="; + hash = "sha256-yD8OaA6n2aqwgyQ58VEiBw6+IbwUgXrWEUPinJDip+U="; }; patches = [ @@ -78,8 +74,11 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "CMAKE_INSTALL_RPATH_USE_LINK_PATH" true) + # If we want to have one watchman per system, we need to have the state in + # $HOME for reliability in face of differing TMPDIR values. + # https://github.com/facebook/watchman/issues/1092 + (lib.cmakeBool "WATCHMAN_USE_XDG_STATE_HOME" true) - (lib.cmakeFeature "WATCHMAN_STATE_DIR" stateDir) (lib.cmakeFeature "WATCHMAN_VERSION_OVERRIDE" finalAttrs.version) ]; @@ -118,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { kylesferrazza emily techknowlogick + lf- ]; mainProgram = "watchman"; platforms = lib.platforms.unix;