Skip to content

Comments

Address ifdef problem with macOS/BSD sandboxing (backport #13455)#13458

Merged
edolstra merged 2 commits into2.30-maintenancefrom
mergify/bp/2.30-maintenance/pr-13455
Jul 12, 2025
Merged

Address ifdef problem with macOS/BSD sandboxing (backport #13455)#13458
edolstra merged 2 commits into2.30-maintenancefrom
mergify/bp/2.30-maintenance/pr-13455

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 11, 2025

Motivation

This PR addresses an issue we identified for macOS users. The #ifdef condition seems impossible, and causes some (but not all) builds to fail.

Based on git bisecting, it looks like this was introduced in #13281.

Context


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 #13455 done by [Mergify](https://mergify.com).

This works around the macOS issue that the prior commit addresses.

(cherry picked from commit 8e5814d)
@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) merge-queue labels Jul 11, 2025
@mergify mergify bot requested review from Ericson2314 and edolstra as code owners July 11, 2025 23:10
@mergify mergify bot added merge-queue automatic backport This PR is a backport produced by automation (does not trigger backporting) labels Jul 11, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jul 11, 2025

This pull request has been removed from the queue for the following reason: pull request dequeued.

Pull request #13458 has been dequeued. The pull request could not be merged. This could be related to an activated branch protection or ruleset rule that prevents us from merging. (details: Required status check "tests on ubuntu" is in progress.).

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.
If you do update this pull request, it will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue instead, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

@edolstra edolstra merged commit 857365c into 2.30-maintenance Jul 12, 2025
27 of 35 checks passed
@edolstra edolstra deleted the mergify/bp/2.30-maintenance/pr-13455 branch July 12, 2025 06:55
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/critical-security-issue-in-nix-2-30-on-macos/66506/4

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automatic backport This PR is a backport produced by automation (does not trigger backporting) merge-queue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants