Skip to content

{edencommon,fb303,fbthrift,fizz,folly,mvfst,wangle,watchman}: 2024.01.22.00 -> 2024.03.11.00#295662

Merged
risicle merged 8 commits intoNixOS:stagingfrom
sdht0:fbpkgs-update
Mar 15, 2024
Merged

{edencommon,fb303,fbthrift,fizz,folly,mvfst,wangle,watchman}: 2024.01.22.00 -> 2024.03.11.00#295662
risicle merged 8 commits intoNixOS:stagingfrom
sdht0:fbpkgs-update

Conversation

@sdht0
Copy link
Contributor

@sdht0 sdht0 commented Mar 13, 2024

Description of changes

Updating to the latest releases. Many of these need to be updated in tandem as there are interdependent changes without which the builds fail.

  • Successfully built all changed packages
  • Tested building some random dependent packages: fava, python3Packages.types-aiobotocore-opensearchserverless

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Mar 13, 2024
@risicle
Copy link
Contributor

risicle commented Mar 13, 2024

On macos 12 x86_64, folly fails to build:

In file included from /tmp/nix-build-folly-2024.03.11.00.drv-0/source/folly/logging/example/lib.cpp:17:
In file included from /tmp/nix-build-folly-2024.03.11.00.drv-0/source/folly/logging/example/lib.h:21:
In file included from /tmp/nix-build-folly-2024.03.11.00.drv-0/source/folly/logging/xlog.h:26:
In file included from /tmp/nix-build-folly-2024.03.11.00.drv-0/source/folly/logging/LoggerDB.h:29:
In file included from /tmp/nix-build-folly-2024.03.11.00.drv-0/source/folly/detail/StaticSingletonManager.h:27:
In file included from /tmp/nix-build-folly-2024.03.11.00.drv-0/source/folly/lang/Thunk.h:22:
/tmp/nix-build-folly-2024.03.11.00.drv-0/source/folly/lang/New.h:66:12: error: no matching function for call to object of type 'const conditional_t<false, op_del_builtin_fn_, op_del_library_fn_>' (aka 'const folly::detail::op_del_library_fn_')
    return op_del_<Usual>(p, a...);
           ^~~~~~~~~~~~~~
/tmp/nix-build-folly-2024.03.11.00.drv-0/source/folly/lang/New.h:119:20: note: in instantiation of function template specialization 'folly::detail::do_op_del_sized_<false, std::align_val_t>' requested here
    return detail::do_op_del_sized_<detail::cpp_aligned_new_>(p, s, a);
                   ^
/tmp/nix-build-folly-2024.03.11.00.drv-0/source/folly/lang/New.h:52:1: note: candidate template ignored: substitution failure [with A = <void *const &, const std::align_val_t &>]
FOLLY_CREATE_QUAL_INVOKER(op_del_library_fn_, ::operator delete);
^
/tmp/nix-build-folly-2024.03.11.00.drv-0/source/folly/functional/Invoke.h:515:58: note: expanded from macro 'FOLLY_CREATE_QUAL_INVOKER'
    [[maybe_unused]] FOLLY_ERASE_HACK_GCC constexpr auto operator()(A&&... a) \

@ofborg ofborg bot requested a review from risicle March 13, 2024 23:29
@ofborg ofborg bot requested a review from risicle March 14, 2024 02:10
@risicle
Copy link
Contributor

risicle commented Mar 14, 2024

Awesome, all WFM now on macos 12 x86_64. Could you squash down the fixup commits so it's one commit per package and I'll approve?

@sdht0
Copy link
Contributor Author

sdht0 commented Mar 14, 2024

Done

Copy link
Contributor

@risicle risicle left a comment

Choose a reason for hiding this comment

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

Cherry-picked to staging-next for testing, build each updated package + folly.tests on nixos x86_64 & macos 12 x86_64 successfully.

@risicle risicle merged commit 81b5599 into NixOS:staging Mar 15, 2024
@sdht0 sdht0 deleted the fbpkgs-update branch March 15, 2024 03:11
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: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 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.

3 participants

Comments