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

Emacs Magit doesn’t work on 23.11 #272019

Closed
Nebucatnetzer opened this issue Dec 4, 2023 · 13 comments · Fixed by #291416
Closed

Emacs Magit doesn’t work on 23.11 #272019

Nebucatnetzer opened this issue Dec 4, 2023 · 13 comments · Fixed by #291416
Labels
0.kind: bug 6.topic: emacs

Comments

@Nebucatnetzer
Copy link
Contributor

Nebucatnetzer commented Dec 4, 2023 •
edited
Loading

Describe the bug

When on tries to open magit on 23.11 you get the ^L in the output and the commands aren’t working as expected.

Steps To Reproduce

Steps to reproduce the behavior:

  1. Update to 23.11
  2. Start Emacs and Magit in a Git repo of your choice.
  3. Try to select a commit for example.

Expected behavior

The commit diff should be shown.

Screenshots

image

Additional context

The issue is already fixed upstream but requires some changes in Nixpkgs:

Notify maintainers

@AndersonTorres
@adisbladis
@Atemu
@jwiegley
@lovek323
@matthewbauer

Metadata

Please run nix-shell -p nix-info --run "nix-info -m" and paste the result.

[user@system:~]$ nix-shell -p nix-info --run "nix-info -m"
- system: `"x86_64-linux"`
 - host os: `Linux 6.1.64, NixOS, 23.11 (Tapir), 23.11.20231202.933d7dc`
 - multi-user?: `yes`
 - sandbox: `yes`
 - version: `nix-env (Nix) 2.18.1`
 - channels(root): `""`
 - nixpkgs: `/nix/store/chi01x4fh8hx7wwh0rqd7m1c8583iyhv-source`

Add a 👍 reaction to issues you find important.
@AndersonTorres AndersonTorres mentioned this issue Dec 4, 2023
Closed
13 tasks
@Atemu
Copy link
Member

Atemu commented Dec 5, 2023

I can't repro this using

nix-shell -p 'emacs.pkgs.withPackages (ep: [ ep.magit ])' -I nixpkgs=flake:github:NixOS/nixpkgs/nixos-23.11

and then running emacs via

emacs -Q

on aarch64-darwin.

@Nebucatnetzer
Copy link
Contributor Author

I tried that and it's happening as well.
The screenshot is from WSL but the initial finding is from NixOS.

image

@AndersonTorres
Copy link
Member

AndersonTorres commented Dec 8, 2023 •
edited
Loading

I reproduced the error here - with the same seq-keep error message.

@Atemu try to call it with M-: then (require 'magit) and finally M-x magit.

@Atemu
Copy link
Member

Atemu commented Dec 8, 2023

@Atemu try to call it with M-: then (require 'magit) and finally M-x magit.

That's what I did; I wouldn't know how to do it differently with my example.

Though note that this is on aarch64-darwin. I don't have access to GUI Linux right now. An issue as obvious as this should happen here aswell though.

Does the same happen inside a terminal frame?

@AndersonTorres
Copy link
Member

AndersonTorres commented Dec 8, 2023 •
edited
Loading

Have you tested it inside an already-existing local Git repo?

And yes, I have tested it here and now in a XTerm via emacs -Q -nw.

(Of course I am using my AMD machine.)

@Nebucatnetzer
Copy link
Contributor Author

This is still broken.

@AndersonTorres
Copy link
Member

It would require updating elisp-packages on stable.

@Nebucatnetzer
Copy link
Contributor Author

I know, isn’t that approapriate when such an important package is broken?

@AndersonTorres
Copy link
Member

It became a bit too hard recently, since Emacs triggers a mass rebuild.

@AndersonTorres AndersonTorres mentioned this issue Feb 24, 2024
Merged
13 tasks
jian-lin added a commit to linj-fork/nixpkgs that referenced this issue Feb 25, 2024
@jian-lin
emacs.pkgs.seq: stop shadowing it
9624a61 
In NixOS 23.11, magit requires[1] seq 2.24.  seq from GNU Elpa
satisfies that.  However, it is shadowed by the Emacs builtin one to
workaround an old bug[2] and the version of the builtin seq in Emacs
28 is only 2.23.  So magit is broken.

This patch fixes magit by stopping shadowing seq from GNU Elpa since
that old bug[2] is not relevant now.

Fixes NixOS#272019.

[1]: https://github.com/magit/magit/blob/f4ff817cb2a48f0f7887050c3be469c03a059567/lisp/magit.el#L27
[2]: NixOS#74936
@jian-lin jian-lin mentioned this issue Feb 25, 2024
Merged
13 tasks
@jian-lin
Copy link
Contributor

FYI, I proposed a fix for this: #291416

jian-lin added a commit to linj-fork/nixpkgs that referenced this issue Feb 25, 2024
@jian-lin
emacs.pkgs.seq: stop shadowing it
1defed1 
magit requires[1] seq 2.24.  seq from GNU Elpa satisfies that.
However, it is shadowed by the Emacs builtin one to workaround an old
bug[2] and the version of the builtin seq in Emacs 28 is only 2.23.
So magit is broken for Emacs 28 which is the default one in NixOS
23.11 and available for the unstable branch.

This patch fixes magit by stopping shadowing seq from GNU Elpa since
that old bug[2] is not relevant now.

Fixes NixOS#272019.

[1]: https://github.com/magit/magit/blob/f4ff817cb2a48f0f7887050c3be469c03a059567/lisp/magit.el#L27
[2]: NixOS#74936
jian-lin added a commit to linj-fork/nixpkgs that referenced this issue Feb 25, 2024
@jian-lin
emacs.pkgs.seq: stop shadowing it
705527f 
magit requires[1] seq 2.24.  seq from GNU Elpa satisfies that.
However, it is shadowed by the Emacs builtin one to workaround an old
bug[2] and the version of the builtin seq in Emacs 28 is only 2.23.
So magit is broken for Emacs 28 which is the default one in NixOS
23.11 and available for the unstable branch.

This patch fixes magit by stopping shadowing seq from GNU Elpa since
that old bug[2] is not relevant now.

Fixes NixOS#272019.

[1]: https://github.com/magit/magit/blob/f4ff817cb2a48f0f7887050c3be469c03a059567/lisp/magit.el#L27
[2]: NixOS#74936
jian-lin added a commit to linj-fork/nixpkgs that referenced this issue Feb 25, 2024
@jian-lin
emacs.pkgs.seq: stop shadowing it
3e0757e 
magit requires[1] seq 2.24.  seq from GNU Elpa satisfies that.
However, it is shadowed by the Emacs builtin one to workaround an old
bug[2] and the version of the builtin seq in Emacs 28 is only 2.23.
So magit is broken for Emacs 28 which is the default one in NixOS
23.11 and available for the unstable branch.

This patch fixes magit by stopping shadowing seq from GNU Elpa since
that old bug[2] is not relevant now.

Fixes NixOS#272019.

[1]: https://github.com/magit/magit/blob/f4ff817cb2a48f0f7887050c3be469c03a059567/lisp/magit.el#L27
[2]: NixOS#74936
jian-lin added a commit to linj-fork/nixpkgs that referenced this issue Feb 26, 2024
@jian-lin
emacs.pkgs.seq: stop shadowing it
0f0d5d0 
magit requires[1] seq 2.24.  seq from GNU Elpa satisfies that.
However, it is shadowed by the Emacs builtin one to workaround an old
bug[2] and the version of the builtin seq in Emacs 28 is only 2.23.
So magit is broken for Emacs 28 which is the default one in NixOS
23.11 and available for the unstable branch.

This patch fixes magit by stopping shadowing seq from GNU Elpa since
that old bug[2] is not relevant now.

Fixes NixOS#272019.

[1]: https://github.com/magit/magit/blob/f4ff817cb2a48f0f7887050c3be469c03a059567/lisp/magit.el#L27
[2]: NixOS#74936
@Nebucatnetzer
Copy link
Contributor Author

It became a bit too hard recently, since Emacs triggers a mass rebuild.

Ah okay, makes sense.

@Nebucatnetzer
Copy link
Contributor Author

FYI, I proposed a fix for this: #291416

If I understood this correctly we need this to have it working in 24.05?
Going to test it then.

jian-lin added a commit to linj-fork/nixpkgs that referenced this issue Mar 2, 2024
@jian-lin
emacs.pkgs.seq: stop shadowing it
7374ffe 
magit requires[1] seq 2.24.  seq from GNU Elpa satisfies that.
However, it is shadowed by the Emacs builtin one to workaround an old
bug[2] and the version of the builtin seq in Emacs 28 is only 2.23.
So magit is broken for Emacs 28 which is the default one in NixOS
23.11 and available in the unstable branch.

This patch fixes magit by stopping shadowing seq from GNU Elpa since
that old bug[2] is not relevant now.

Fixes NixOS#272019.

[1]: https://github.com/magit/magit/blob/f4ff817cb2a48f0f7887050c3be469c03a059567/lisp/magit.el#L27
[2]: NixOS#74936
github-actions bot pushed a commit that referenced this issue Mar 2, 2024
@jian-lin @github-actions
emacs.pkgs.seq: stop shadowing it
f2d4a74 
magit requires[1] seq 2.24.  seq from GNU Elpa satisfies that.
However, it is shadowed by the Emacs builtin one to workaround an old
bug[2] and the version of the builtin seq in Emacs 28 is only 2.23.
So magit is broken for Emacs 28 which is the default one in NixOS
23.11 and available in the unstable branch.

This patch fixes magit by stopping shadowing seq from GNU Elpa since
that old bug[2] is not relevant now.

Fixes #272019.

[1]: https://github.com/magit/magit/blob/f4ff817cb2a48f0f7887050c3be469c03a059567/lisp/magit.el#L27
[2]: #74936

(cherry picked from commit 7374ffe)
@jian-lin
Copy link
Contributor

Fixed by #291416 and #292830.

Not sure why this issue is not closed by them though.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
0.kind: bug 6.topic: emacs
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

emacs.pkgs.seq: stop shadowing it linj-fork/nixpkgs
4 participants
@Nebucatnetzer @AndersonTorres @Atemu @jian-lin