Skip to content

meson: fix extraframework dependencies on case-sensitive APFS#301366

Merged
emilazy merged 1 commit intoNixOS:stagingfrom
reckenrode:meson-apfs-fix
Jul 26, 2024
Merged

meson: fix extraframework dependencies on case-sensitive APFS#301366
emilazy merged 1 commit intoNixOS:stagingfrom
reckenrode:meson-apfs-fix

Conversation

@reckenrode
Copy link
Contributor

Description of changes

I ran into this while working on #301354. I built did full bootstraps with this patch as part of my work on that PR.

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.

@reckenrode
Copy link
Contributor Author

Force-pushed to update the patch to match the PR (which needed a fix to address a mypy lint failure).

@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Apr 4, 2024
@ofborg ofborg bot requested a review from AndersonTorres April 4, 2024 00:33
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Apr 4, 2024
@reckenrode reckenrode marked this pull request as draft April 4, 2024 22:45
@reckenrode
Copy link
Contributor Author

Converting to draft while I work on the upstream PR per their feedback.

@reckenrode reckenrode marked this pull request as ready for review April 5, 2024 13:07
@reckenrode
Copy link
Contributor Author

Updated the patch and set to ready. The upstream PR (mesonbuild/meson#13038) was approved.

@reckenrode
Copy link
Contributor Author

Rebased on latest staging, which had a merge conflict.

@reckenrode reckenrode mentioned this pull request Jun 26, 2024
13 tasks
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 4, 2024
@emilazy emilazy merged commit d90a5b9 into NixOS:staging Jul 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants