Revert "emacs30: add a patch to fix upstream bug 67916"#367297
Merged
jian-lin merged 1 commit intoNixOS:staging-nextfrom Dec 22, 2024
Merged
Revert "emacs30: add a patch to fix upstream bug 67916"#367297jian-lin merged 1 commit intoNixOS:staging-nextfrom
jian-lin merged 1 commit intoNixOS:staging-nextfrom
Conversation
This reverts commit 5514e1e. This resolves conflicts between staging-next and master after NixOS#367148 is merged into master. In addition, this patch does not need to go through a staging cycle. We can reapply it directly to master and it will probably reach users sooner.
nix-owners
bot
requested review from
AndersonTorres,
adisbladis,
matthewbauer and
ttuegel
github-actions
bot
added
10.rebuild-darwin: 1-10
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
1 participant
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.
This reverts commit 5514e1e.
This resolves conflicts between staging-next and master after #367148 is merged into master. In addition, this patch does not need to go through a staging cycle. We can reapply it directly to master and it will probably reach users sooner.
#367296 reapplies this patch to master.
ref: #361947
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.