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

Jump to bottom

Link subdirs.el into emacs-packages-deps site-lisp #55081

Merged
merged 1 commit into from Mar 4, 2019
Merged

Link subdirs.el into emacs-packages-deps site-lisp #55081

merged 1 commit into from Mar 4, 2019

Conversation

moyamo
Copy link
Contributor

@moyamo moyamo commented Feb 2, 2019 •
edited

Motivation for this change

Fixes #50682 #33412 #18146 #31722

Emacs loads all the elisp files in the top-level of the site-lisp directory. However some packages (e.g. mu4e) put their elisp files in a subdirectory of site-lisp. Emacs will not load these packages unless subdirs.el is present.

Things done

Link subdirs.el file from the emacs package into the emacs-package-deps package so that packages that but their elisp files in a subdirectory of site-lisp are loaded.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@moyamo
emacs: Link subdirs.el into emacs-packages-deps
d17d18a 
Emacs loads all the elisp files in the top-level of the site-lisp
directory. However some packages (e.g. mu4e) put their elisp files in a
subdirectory of site-lisp. Emacs will not load these packages unless
subdirs.el is present.

This commit links the subdirs.el file from the emacs package into the
emacs-package-deps package so that packages that put their elisp files
in a subdirectory of site-lisp are loaded.
@moyamo
Copy link
Contributor Author

moyamo commented Feb 2, 2019

What's your policy on testing? I would like to write a test to make sure that something like this doesn't break again. Is there documentation that explains how to write tests?

@moyamo
Copy link
Contributor Author

moyamo commented Feb 2, 2019

This is also a problem on 18.09, how do I get this change onto that channel?

@matthewbauer matthewbauer merged commit 71704e8 into NixOS:master Mar 4, 2019
@moyamo moyamo mentioned this pull request Apr 15, 2019
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer approved these changes

Assignees
No one assigned
Labels
6.topic: emacs 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@moyamo @matthewbauer @GrahamcOfBorg