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.

Sign up for GitHub

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

Jump to bottom

Revert "Temporarily disable "emacs" update" #378

Merged
merged 1 commit into from
Jan 2, 2024
Merged

Revert "Temporarily disable "emacs" update" #378

merged 1 commit into from
Jan 2, 2024

Conversation

Vonfry
Copy link

@Vonfry Vonfry commented Jan 2, 2024 •
edited
Loading

@adisbladis adisbladis merged commit 5656dc1 into nix-community:master Jan 2, 2024
1 check passed
@leungbk
Copy link
Member

leungbk commented Jan 2, 2024

Ideally, we could have waited till NixOS/nixpkgs#277331 was merged into release-23.11 as well before doing this...@adisbladis or @jian-lin, would you mind merging that as well?

@adisbladis
Copy link
Member

@leungbk: Merged!

@leungbk leungbk mentioned this pull request Jan 2, 2024
Closed
leungbk added a commit that referenced this pull request Jan 2, 2024
@leungbk
Revert "Merge pull request #378 from Vonfry/revert/disable-emacs"
b61ae95 
This reverts commit 5656dc1, reversing
changes made to 575fcd2.

At the time of writing, the commit that PR that Purcell submitted is
actually in `staging-next`; it was reverted on `master`.
@leungbk
Copy link
Member

leungbk commented Jan 2, 2024

@Vonfry Sorry, I had to revert this since the commit corresponding to Purcell's PR got reverted on master (NixOS/nixpkgs@915c004). It's now on staging-next and staging-23.11.

@Vonfry Vonfry deleted the revert/disable-emacs branch January 3, 2024 00:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Vonfry @leungbk @adisbladis