Skip to content

Add -Wundef and fix public headers (backport #12931)#12932

Merged
mergify[bot] merged 3 commits into2.28-maintenancefrom
mergify/bp/2.28-maintenance/pr-12931
Apr 5, 2025
Merged

Add -Wundef and fix public headers (backport #12931)#12932
mergify[bot] merged 3 commits into2.28-maintenancefrom
mergify/bp/2.28-maintenance/pr-12931

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Apr 5, 2025

Motivation

Context

I am not happy about the second commit, but it seems to work.
Surely there's a better way to use a public header in a meson subprojects setup??

Add 👍 to pull requests you find important.

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

This is an automatic backport of pull request #12931 done by [Mergify](https://mergify.com).

@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts labels Apr 5, 2025
@mergify mergify bot requested a review from Ericson2314 as a code owner April 5, 2025 06:44
@mergify mergify bot added the merge-queue label Apr 5, 2025
@mergify mergify bot requested a review from edolstra as a code owner April 5, 2025 06:44
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 5, 2025

Cherry-pick of ba89da8 has failed:

On branch mergify/bp/2.28-maintenance/pr-12931
Your branch is ahead of 'origin/2.28-maintenance' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ba89da8fa.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/libexpr-tests/main.cc
	modified:   src/libstore/filetransfer.cc
	modified:   src/libstore/gc.cc
	modified:   src/libstore/globals.cc
	modified:   src/libstore/include/nix/store/globals.hh
	modified:   src/libstore/local-store.cc
	modified:   src/libstore/store-api.cc
	modified:   src/libstore/unix/user-lock.cc
	modified:   src/libutil/current-process.cc
	modified:   src/libutil/file-descriptor.cc
	modified:   src/libutil/unix/file-descriptor.cc
	modified:   src/libutil/unix/processes.cc
	modified:   src/libutil/unix/signals.cc
	modified:   src/nix/main.cc
	modified:   src/nix/run.cc
	modified:   src/nix/unix/daemon.cc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libstore/unix/build/local-derivation-goal.cc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added new-cli Relating to the "nix" command store Issues and pull requests concerning the Nix store labels Apr 5, 2025
@roberth roberth force-pushed the mergify/bp/2.28-maintenance/pr-12931 branch from 5b47414 to 615344f Compare April 5, 2025 11:46
@mergify mergify bot merged commit 1b119de into 2.28-maintenance Apr 5, 2025
27 checks passed
@mergify mergify bot deleted the mergify/bp/2.28-maintenance/pr-12931 branch April 5, 2025 12:24
@Mic92 Mic92 mentioned this pull request Apr 5, 2025
Merged
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 is a code owner

@edolstra edolstra Awaiting requested review from edolstra edolstra is a code owner

Assignees

No one assigned

Labels

automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue 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

@roberth