shell: pin a Nixpkgs that supports x86_64-darwin#545390
Merged
Merged
Conversation
![nixpkgs-commit-check[bot]](https://avatars.githubusercontent.com/u/487568?s=60&v=4){kind=small}
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
MattSturgeon
force-pushed
the
pin-26.05-darwin
branch
from
July 24, 2026 21:27
32d1256 to
45b1255
Compare
nixpkgs-ci
Bot
added
10.rebuild-darwin: 0
Contributor
Author
|
Tested against 26.05, together with the recent (treefmt failure is expected, because I didn't cherry-pick the relevant zizmore fixes) I'll rebase on master now: |
When instantiating a dev-shell for x86_64-darwin, we cannot use 26.11's pinned revision. Instead, we must use a revision that still supports x86_64-darwin. Print a warning when we need to use that revision, because it is likely there will be subtle formatting & linting differences vs CI.
MattSturgeon
force-pushed
the
pin-26.05-darwin
branch
from
July 24, 2026 21:38
45b1255 to
f86bce2
Compare
nixpkgs-commit-check
Bot
dismissed
their stale review
July 24, 2026 21:39
Review dismissed automatically
nixpkgs-ci
Bot
added
backport release-26.05
Contributor
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-26.05
git worktree add -d .worktree/backport-545390-to-release-26.05 origin/release-26.05
cd .worktree/backport-545390-to-release-26.05
git switch --create backport-545390-to-release-26.05
git cherry-pick -x f86bce24974ec79a2d5e2c3668bde6475baf36cd |
13 tasks
mdaniels5757
added
8.has: port to stable
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When instantiating a dev-shell for x86_64-darwin, we cannot use CI's pinned 26.11 revision. Instead, we must use a revision that still supports x86_64-darwin.
Print a warning when we need to use that revision, because it is likely there will be subtle formatting & linting differences vs CI.
Unblocks backporting #544224 and #545265.
Initially opened this PR against
release-26.05to see CI working. I've since rebased & re-targeted tomaster. Once merged we will backport as normal.Things done
nix flake check --all-systems --no-build