diff options
| -rw-r--r-- | third_party/emacs/carp-mode.nix | 23 | ||||
| -rw-r--r-- | tools/emacs/default.nix | 22 |
2 files changed, 25 insertions, 20 deletions
diff --git a/third_party/emacs/carp-mode.nix b/third_party/emacs/carp-mode.nix new file mode 100644 index 0000000000..869cf05c19 --- /dev/null +++ b/third_party/emacs/carp-mode.nix @@ -0,0 +1,23 @@ +{ pkgs, ... }: + +with pkgs.third_party; +with emacsPackagesNg; + +melpaBuild rec { + pname = "carp-mode"; + version = "3.0"; + packageRequires = [ clojure-mode ]; + + recipe = builtins.toFile "recipe" '' + (carp-mode :fetcher github + :repo "carp-lang/carp" + :files ("emacs/*.el")) + ''; + + src = fetchFromGitHub { + owner = "carp-lang"; + repo = "carp"; + rev = "6954642cadee730885717201c3180c7acfb1bfa9"; + sha256 = "1pz4x2qkwjbz789bwc6nkacrjpzlxawxhl2nv0xdp731y7q7xyk9"; + }; +} diff --git a/tools/emacs/default.nix b/tools/emacs/default.nix index 0589b274e2..841b3016bb 100644 --- a/tools/emacs/default.nix +++ b/tools/emacs/default.nix @@ -5,29 +5,11 @@ with pkgs; with third_party.emacsPackagesNg; +with third_party.emacs; let emacsWithPackages = (third_party.emacsPackagesNgGen third_party.emacs26).emacsWithPackages; - carpMode = melpaBuild { - pname = "carp-mode"; - ename = "carp-mode"; - version = "3.0"; - recipe = builtins.toFile "recipe" '' - (carp-mode :fetcher github - :repo "carp-lang/carp" - :files ("emacs/*.el")) - ''; - - packageRequires = [ clojure-mode ]; - src = third_party.fetchFromGitHub { - owner = "carp-lang"; - repo = "carp"; - rev = "6954642cadee730885717201c3180c7acfb1bfa9"; - sha256 = "1pz4x2qkwjbz789bwc6nkacrjpzlxawxhl2nv0xdp731y7q7xyk9"; - }; - }; - tazjinsEmacs = (emacsWithPackages(epkgs: # Actual ELPA packages (the enlightened!) (with epkgs.elpaPackages; [ @@ -99,7 +81,7 @@ let ]) ++ # Custom packages - [ carpMode ] + [ carp-mode ] )); in third_party.writeShellScriptBin "tazjins-emacs" '' exec ${tazjinsEmacs}/bin/emacs \ |