Skip to content
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.

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

Header cleanup #12940

Merged
merged 2 commits into from
Apr 7, 2025
Merged

Header cleanup #12940

merged 2 commits into from
Apr 7, 2025

Conversation

Ericson2314
Copy link
Member

Motivation

A better fix than commit 2 from #12931, and some other cleanups while I am at it.

Context


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

@Ericson2314 Ericson2314 requested a review from edolstra as a code owner April 6, 2025 21:59
@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
@Ericson2314 Ericson2314 added the backport 2.28-maintenance Automatically creates a PR against the branch label Apr 6, 2025
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.
Now that we have the private vs public distinction, we can do this
without leaking information downstream.
@roberth
Copy link
Member

roberth commented Apr 6, 2025

@mergify queue

Copy link
Contributor

mergify bot commented Apr 6, 2025

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 07204ff

mergify bot added a commit that referenced this pull request Apr 6, 2025
@mergify mergify bot merged commit 07204ff into master Apr 7, 2025
26 checks passed
@mergify mergify bot deleted the header-cleanup branch April 7, 2025 00:09
Ericson2314 added a commit that referenced this pull request Apr 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.28-maintenance Automatically creates a PR against the branch new-cli Relating to the "nix" command store Issues and pull requests concerning the Nix store
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants