Skip to content

merge queue: embarking master (1dc7e6c) and #12940 together #12943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 3 commits into from
Closed

merge queue: embarking master (1dc7e6c) and #12940 together #12943

wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 6, 2025 •
edited
Loading

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch master (1dc7e6c) and #12940 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #12940.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue default for merge:

  • check-success=installer test on macos
  • check-success=installer test on ubuntu
  • check-success=tests on macos
  • check-success=tests on ubuntu
  • check-success=vm_tests
  • any of [🛡 GitHub branch protection]:
    • check-success = installer test on macos
    • check-neutral = installer test on macos
    • check-skipped = installer test on macos
  • any of [🛡 GitHub branch protection]:
    • check-success = installer test on ubuntu
    • check-neutral = installer test on ubuntu
    • check-skipped = installer test on ubuntu
  • any of [🛡 GitHub branch protection]:
    • check-success = tests on macos
    • check-neutral = tests on macos
    • check-skipped = tests on macos
  • any of [🛡 GitHub branch protection]:
    • check-success = tests on ubuntu
    • check-neutral = tests on ubuntu
    • check-skipped = tests on ubuntu

Required conditions to stay in the queue:

---
previous_failed_batches: []
pull_requests:
  - number: 12940
...

Ericson2314 and others added 3 commits April 6, 2025 18:53
@Ericson2314
Clean some header related things.
3294b22 
Revert most of "Hack together a fix for the public headers"

- The `libmain` change is kept, and one more libmain change is made.
  (Need to update Meson and Nix per the package alike).

- The S3 situation is fixed in a different way: the variable is public
  now, used in the header, and fixed accordingly.

- Fix TODO for `HAVE_EMBEDDED_SANDBOX_SHELL`

This reverts commit 2b51250.
@Ericson2314
Get rid of raw -D defines, always use private config files
7a7fe35 
Now that we have the private vs public distinction, we can do this
without leaking information downstream.
@mergify
Merge of #12940
0e49e01
@github-actions github-actions bot added new-cli Relating to the "nix" command store Issues and pull requests concerning the Nix store labels Apr 6, 2025
@mergify mergify bot closed this Apr 7, 2025
@mergify mergify bot deleted the mergify/merge-queue/035445cb89 branch April 7, 2025 00:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 will be requested when the pull request is marked ready for review Ericson2314 is a code owner

@edolstra edolstra Awaiting requested review from edolstra edolstra will be requested when the pull request is marked ready for review edolstra is a code owner

Assignees
No one assigned
Labels
new-cli Relating to the "nix" command store Issues and pull requests concerning the Nix store
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@Ericson2314