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

Merge branch 'develop' (early part)

Browse Source
This commit is contained in:
László Vaskó
2020-03-16 19:16:02 +01:00
parent 845e0847d1 4502c27759
commit 9b13cde0ec
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
advice.el
View File

@ -17,3 +17,7 @@
;;; org is not installed from git, so no fixup is needed ;;; org is not installed from git, so no fixup is needed
(advice-add '+org-fix-package-h (advice-add '+org-fix-package-h
:override (lambda (&rest r))) :override (lambda (&rest r)))
;; just use straight provided by nix
(advice-add 'doom-ensure-straight
:override (lambda (&rest r) (require 'straight)))

7
default.nix
View File

@ -49,7 +49,7 @@
, runCommand , runCommand
, fetchFromGitHub , fetchFromGitHub
, substituteAll , substituteAll
, writeScriptBin , writeShellScriptBin
, writeTextDir }: , writeTextDir }:
let let
@ -163,8 +163,9 @@ let
# I don't know why but byte-compilation somehow triggers Emacs to look for # I don't know why but byte-compilation somehow triggers Emacs to look for
# the git executable. It does not seem to be executed though... # the git executable. It does not seem to be executed though...
git = writeScriptBin "git" '' git = writeShellScriptBin "git" ''
>&2 echo Executing git is not allowed; command line: "$@" >&2 echo "Executing git is not allowed; command line:" "$@"
exit 127
''; '';
in (straight-env.emacsEnv { in (straight-env.emacsEnv {
inherit packages; inherit packages;

8
nix/sources.json
View File

@ -84,15 +84,15 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nix-straight.el": { "nix-straight.el": {
"branch": "v1.2.0", "branch": "v2.0.0",
"description": null, "description": null,
"homepage": null, "homepage": null,
"owner": "vlaci", "owner": "vlaci",
"repo": "nix-straight.el", "repo": "nix-straight.el",
"rev": "446f3d70f1816305130f307c0cf2bc8db77ed698", "rev": "b0ac8033a448c609645b4d9b5ff5f90de608f326",
"sha256": "1p4yp46kwhii8w9yf882fca9r3addn91wg6f4mv62wnkfm0i6q0f", "sha256": "1vgdjfyz8964mixwfcv30lmkjfgsmsw8vl23x1964izr2cfh2dy6",
"type": "tarball", "type": "tarball",
"url": "https://github.com/vlaci/nix-straight.el/archive/446f3d70f1816305130f307c0cf2bc8db77ed698.tar.gz", "url": "https://github.com/vlaci/nix-straight.el/archive/b0ac8033a448c609645b4d9b5ff5f90de608f326.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"org-mode": { "org-mode": {