awesome-emacs/nix-doom-emacs
1
0
Fork 0
mirror of https://github.com/nix-community/nix-doom-emacs synced 2025-08-03 12:27:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into master

Browse Source
This commit is contained in:
László Vaskó
2020-09-20 10:39:14 +02:00
parent 9fe0402668 f71655a7d0
commit 89147ceac0
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
default.nix
View File

@ -24,6 +24,18 @@
Only used to get emacs package, if `bundledPackages` is set.
*/
, emacsPackages
/* Overlay to customize emacs (elisp) dependencies
See overrides.nix for addition examples.
Example:
emacsPackagesOverlay = self: super: {
magit-delta = super.magit-delta.overrideAttrs (esuper: {
buildInputs = esuper.buildInputs ++ [ pkgs.git ];
});
};
*/
, emacsPackagesOverlay ? self: super: { }
/* Use bundled revision of github.com/nix-community/emacs-overlay
as `emacsPackages`.
*/
@ -59,7 +71,8 @@ let
then dependencyOverrides.${p}
else sources.${p};
# Packages we need to get the default doom configuration run
overrides = pkgs.callPackage ./overrides.nix { inherit lock; };
overrides = self: super:
(pkgs.callPackage ./overrides.nix { inherit lock; } self super) // (emacsPackagesOverlay self super);
# Stage 1: prepare source for byte-compilation
doomSrc = stdenv.mkDerivation {

24
nix/sources.json
View File

@ -5,10 +5,10 @@
"homepage": "",
"owner": "hlissner",
"repo": "doom-emacs",
"rev": "ae3a2fa8c27d8e392294904ec6986f860a57f38e",
"sha256": "1f3vz9f10qqcxb9lwa51jkvg01v276gb1ssg2gc9jmny2m84d987",
"rev": "1456108d5bef89195b2b63f962e0ae9d24f4c652",
"sha256": "0j37v0b7jfpaacdf03dq2dm423m24m76m80081vdvykgys5kn45s",
"type": "tarball",
"url": "https://github.com/hlissner/doom-emacs/archive/ae3a2fa8c27d8e392294904ec6986f860a57f38e.tar.gz",
"url": "https://github.com/hlissner/doom-emacs/archive/1456108d5bef89195b2b63f962e0ae9d24f4c652.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"doom-snippets": {
@ -29,10 +29,10 @@
"homepage": "",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "943ec43e54f5152c4d5d8d0076e72beea9a7ff5a",
"sha256": "1amckm9gnh8jr3f34m67im3fwjf5mm262m4sbar24j1f066dsgil",
"rev": "585e07a72aa50c06c523fc6037bb13441bd5c47b",
"sha256": "1c0rwbzpm3jbb2zii5qv5yqrhcw4zznf6b62xvv8014bz6wfj1hl",
"type": "tarball",
"url": "https://github.com/nix-community/emacs-overlay/archive/943ec43e54f5152c4d5d8d0076e72beea9a7ff5a.tar.gz",
"url": "https://github.com/nix-community/emacs-overlay/archive/585e07a72aa50c06c523fc6037bb13441bd5c47b.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"emacs-so-long": {
@ -137,10 +137,10 @@
"homepage": "https://code.orgmode.org/bzg/org-mode",
"owner": "emacs-straight",
"repo": "org-mode",
"rev": "7bc18ebbed409ace4665ec9c9910b2837834b03d",
"sha256": "1jn9jfliymvh8s7szzsybkhm4z3g7bw2zvc15k5waskn4zw07pph",
"rev": "8a083514a766abb601c50283c05c3f49805e0f66",
"sha256": "10vdg413halg1ldi9nsqzaafa7176hh30mz107vpv3kw54mdnj8l",
"type": "tarball",
"url": "https://github.com/emacs-straight/org-mode/archive/7bc18ebbed409ace4665ec9c9910b2837834b03d.tar.gz",
"url": "https://github.com/emacs-straight/org-mode/archive/8a083514a766abb601c50283c05c3f49805e0f66.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"org-yt": {
@ -173,10 +173,10 @@
"homepage": "https://revealjs.com",
"owner": "hakimel",
"repo": "reveal.js",
"rev": "15815efe05ca69c35ce66cfdbf93316e1db66ecb",
"sha256": "1g3h710rhpyq4vnh6rgyay2dyjpw4rw99p062yhwhgrjkgjyzrc2",
"rev": "e09437f4fac47305679374d2b2516a76f6ceb899",
"sha256": "0mppzm0cp5v4r7aqim2jbxji836di86an0p9j5wjmnlg5ali3y49",
"type": "tarball",
"url": "https://github.com/hakimel/reveal.js/archive/15815efe05ca69c35ce66cfdbf93316e1db66ecb.tar.gz",
"url": "https://github.com/hakimel/reveal.js/archive/e09437f4fac47305679374d2b2516a76f6ceb899.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"rotate-text.el": {