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

[20.03] emacs: improve setup hook #86344

Merged
merged 2 commits into from Apr 29, 2020
Merged

[20.03] emacs: improve setup hook #86344

merged 2 commits into from Apr 29, 2020

Conversation

cprussin
Copy link

Motivation for this change

This PR is a backport of @rycee 's two PRs to improve the emacs setup hooks:

These commits fix emacs packages with many dependencies, which currently fail to build in 20.03 (see #83230).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@rycee @cprussin
emacs: improve setup hook
a900089 
- Add packages installed in a sub-directory of site-lisp, such as
  mu4e, to EMACSLOADPATH.

- Add ELPA packages to EMACSLOADPATH.

- Add each package only once to EMACSLOADPATH. Before, each package
  would typically be added twice for each transitive dependency
  leading to a huge variable for a package having many dependencies.

Fixed NixOS#78680

(cherry picked from commit 2d2de74)
@rycee @cprussin
emacs: fix setup-hook
49f7706 
This change fixes byte compilation of, e.g., Helm without breaking
builds using, e.g., `trivialBuild`.

See NixOS#82604 (comment)

(cherry picked from commit bf486f7)
@rycee
Copy link
Member

rycee commented Apr 29, 2020

I've used these commits in my own 20.03 branch for some time without issues so should be OK to merge.

@rycee rycee merged commit 911c0a5 into NixOS:release-20.03 Apr 29, 2020
@cprussin
Copy link
Author

thanks @rycee for the merge and the original fix!

@rycee rycee mentioned this pull request May 1, 2020
Closed
10 tasks
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
6.topic: emacs 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@cprussin @rycee @Janik-Haag