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

Emacs site-lisp subdirectory support #33416

Merged

Conversation

the-kenny
Copy link
Contributor

Motivation for this change

This pull request enhances our site-lisp.el which is loaded by Emacs on startup. In addition to adding a bit of documentation it now adds subdirectories of the site-lisp directory to load-path, allowing loading of libraries like mu4e.

@mekeor: Could you please try this branch and see if it works for you?

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@ghost
Copy link

ghost commented Jan 4, 2018

@the-kenny In this commit 68e02e7 why did you remove format? What does that do?

@the-kenny
Copy link
Contributor Author

@mekeor I accidentally added this empty and unused let binding in 6fc2c699a89bf04a6b2adf6f6f76912917057d9a. I can squash both commits or rewrite them without the format hunk if you want me to :)

`site-start.el` is the file loaded on startup, containing nix-specific
customizations like adding paths in `NIX_PROFILES` to the
emacs-specific search-path (`load-path`) or making man-pages in these
directories discoverable.
This adds subdirectories of `share/emacs/site-lisp/` in every path in
`NIX_PROFILES` to `load-path` to allow loading of more complex
libraries like `mu4e`.

Fixes NixOS#33412
@the-kenny the-kenny force-pushed the emacs-site-lisp-subdirectory-support branch from 68e02e7 to 7cfdb2b Compare January 5, 2018 09:50
@the-kenny
Copy link
Contributor Author

@mekeor Just force-pushed rebased commits without the format thingy.

@the-kenny
Copy link
Contributor Author

@GrahamcOfBorg build emacs mu

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success on aarch64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/p5pkkr11ihmvmc1g4ffd2d4zy87qlbzj-mu-0.9.18
shrinking /nix/store/p5pkkr11ihmvmc1g4ffd2d4zy87qlbzj-mu-0.9.18/bin/mu
gzipping man pages under /nix/store/p5pkkr11ihmvmc1g4ffd2d4zy87qlbzj-mu-0.9.18/share/man/
strip is /nix/store/jwz859pxqj7sl2dbwvmxkx68jp774izb-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/p5pkkr11ihmvmc1g4ffd2d4zy87qlbzj-mu-0.9.18/bin
patching script interpreter paths in /nix/store/p5pkkr11ihmvmc1g4ffd2d4zy87qlbzj-mu-0.9.18
checking for references to /build in /nix/store/p5pkkr11ihmvmc1g4ffd2d4zy87qlbzj-mu-0.9.18...
/nix/store/xajgzwva2lrjxgp7kvp582r59gw9087q-emacs-25.3
/nix/store/p5pkkr11ihmvmc1g4ffd2d4zy87qlbzj-mu-0.9.18

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/c6f54abciia8sjkj971ycwnma6vy587n-mu-0.9.18
shrinking /nix/store/c6f54abciia8sjkj971ycwnma6vy587n-mu-0.9.18/bin/mu
gzipping man pages under /nix/store/c6f54abciia8sjkj971ycwnma6vy587n-mu-0.9.18/share/man/
strip is /nix/store/mdyy001q67hiks0g24ra53z7ckm4jfr4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/c6f54abciia8sjkj971ycwnma6vy587n-mu-0.9.18/bin 
patching script interpreter paths in /nix/store/c6f54abciia8sjkj971ycwnma6vy587n-mu-0.9.18
checking for references to /tmp/nix-build-mu-0.9.18.drv-0 in /nix/store/c6f54abciia8sjkj971ycwnma6vy587n-mu-0.9.18...
/nix/store/0gz8myysca2nf45cvymf085f2bfp9lq2-emacs-25.3
/nix/store/c6f54abciia8sjkj971ycwnma6vy587n-mu-0.9.18

@matthewbauer
Copy link
Member

@the-kenny Does this look ready to go? Hoping to get this in by 18.03...

@the-kenny
Copy link
Contributor Author

@matthewbauer absolutely! :)

@7c6f434c 7c6f434c merged commit 91eb41b into NixOS:master Feb 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants