Skip to content

{folly,fizz,mvfst,wangle,fbthrift,fb303,edencommon,watchman}: 2024.12.09.00 -> 2025.01.06.00, add patches for glog ≥ 0.7.0#371610

Merged
emilazy merged 16 commits intoNixOS:staging-nextfrom
emilazy:push-yzkmymulkkpq
Jan 8, 2025
Merged

{folly,fizz,mvfst,wangle,fbthrift,fb303,edencommon,watchman}: 2024.12.09.00 -> 2025.01.06.00, add patches for glog ≥ 0.7.0#371610
emilazy merged 16 commits intoNixOS:staging-nextfrom
emilazy:push-yzkmymulkkpq

Conversation

@emilazy
Copy link
Member

@emilazy emilazy commented Jan 6, 2025

Teaching Facebook to hold CMake correctly, one package at a time.

#349183 has more potential glog 0.7 fixes, though ideally things would be made to import the CMake targets correctly rather than just adding the #define. I’ll investigate how many of those packages still need fixes. I haven’t picked the pkg-config change so as to not throw away the glog build, and it seems like most users use it via CMake so hopefully it should be okay and we can follow upstream’s recommendation? But if there are any downstream packages using pkg-config we might have to work around it in those for now and adjust on the next staging cycle.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@emilazy emilazy force-pushed the push-yzkmymulkkpq branch from 781d545 to e9e5260 Compare January 6, 2025 23:59
@github-actions github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Jan 7, 2025

-find_package(Glog MODULE REQUIRED)
-include_directories(${GLOG_INCLUDE_DIR})
+find_package(Glog CONFIG REQUIRED)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably worth making pull requests for those.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They require signing a CLA and there’s an open Folly issue with a link to the AUR patch that they’ve completely ignored for half a year. These libraries are all thrown‐over‐the‐wall source dumps exported from Facebook’s monorepo that are a pain to build externally; their provided build scripts just download fixed versions of all their dependencies into place, so I’m not sure they care. Agreed that it would be nice for them to fix it upstream though and perhaps I’ll find the time to jump through all the hoops, but I just wanted to get thousands of builds unblocked on staging-next for now.

@techknowlogick
Copy link
Member

Thanks again @emilazy. Are you able to "sneak" in the change from this PR: #369477 ? I can't confirm if the flakiness happens on linux, but I have confirmed on darwin.

@emilazy
Copy link
Member Author

emilazy commented Jan 7, 2025

Sure, we can just merge both of the PRs together.

Copy link
Contributor

@paparodeo paparodeo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

built watchman (which I think builds all of these pkgs) on x64 linux.

@emilazy emilazy merged commit 692fb9c into NixOS:staging-next Jan 8, 2025
21 of 25 checks passed
@emilazy emilazy deleted the push-yzkmymulkkpq branch January 8, 2025 00:12
@emilazy emilazy mentioned this pull request Jan 15, 2025
5 tasks
mdaniels5757 added a commit to mdaniels5757/nixpkgs that referenced this pull request Jun 12, 2025
…6-05

Fixes gcc 14 build.

Requires a new patch to fix the glog dependency, similar to those in
NixOS#371610 (comment).
mdaniels5757 added a commit to mdaniels5757/nixpkgs that referenced this pull request Jun 12, 2025
…6-05

Fixes gcc 14 build.

Requires a new patch to fix the glog dependency, similar to those in
NixOS#371610 (comment).

(cherry picked from commit 473b372)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants