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

[24.11] nix: place extra-prefixed settings after their non-prefixed variants #1338

Merged
merged 1 commit into from
Feb 14, 2025

Conversation

Enzime
Copy link
Collaborator

@Enzime Enzime commented Feb 14, 2025

Backport of #1337

@emilazy
Copy link
Collaborator

emilazy commented Feb 14, 2025

LGTM, but this should probably use git cherry-pick -x like Nixpkgs does to include the original commit being backported (I still need to find a nice Jujutsu‐native way of doing that).

Fixes LnL7#626.

Essentially a copy of NixOS's workaround: NixOS/nixpkgs#278064

(cherry picked from commit 5926058)
@Enzime Enzime merged commit e904ef0 into LnL7:nix-darwin-24.11 Feb 14, 2025
3 checks passed
@Enzime Enzime deleted the push-nxtlkvowmzpy branch February 14, 2025 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants