diff options
| -rw-r--r-- | overlays/emacs.nix | 2 | ||||
| -rw-r--r-- | repos/emacs/emacs-feature_tree-sitter.json | 1 | ||||
| -rw-r--r-- | repos/emacs/emacs-master.json | 2 | ||||
| -rwxr-xr-x | repos/emacs/update | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/overlays/emacs.nix b/overlays/emacs.nix index d42bdf266f7c..b0bdc0881dde 100644 --- a/overlays/emacs.nix +++ b/overlays/emacs.nix @@ -112,7 +112,7 @@ let emacsUnstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json { }); - emacsGitTreeSitter = super.lib.makeOverridable (mkGitEmacs "emacs-git-tree-sitter" ../repos/emacs/emacs-feature_tree-sitter.json) { + emacsGitTreeSitter = super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withTreeSitter = true; withTreeSitterPlugins = (plugins: with plugins; [ tree-sitter-bash diff --git a/repos/emacs/emacs-feature_tree-sitter.json b/repos/emacs/emacs-feature_tree-sitter.json deleted file mode 100644 index 1b8c4a89d24f..000000000000 --- a/repos/emacs/emacs-feature_tree-sitter.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "savannah", "repo": "emacs", "rev": "24509731652e11bfed4537d7e5ef544014d2970c", "sha256": "06i2cap05dkdspgldkxln4h21ya6zc4b8n52mp7jq27s5vxamd7p", "version": "20221121.0"} diff --git a/repos/emacs/emacs-master.json b/repos/emacs/emacs-master.json index 18025b32812b..d51f21f11bd1 100644 --- a/repos/emacs/emacs-master.json +++ b/repos/emacs/emacs-master.json @@ -1 +1 @@ -{"type": "savannah", "repo": "emacs", "rev": "f176a36f4629b56c9fd9e3fc15aebd04a168c4f5", "sha256": "0z247fym3xjfc6dy3bbr8278h0kycifxbdird9g2kij30c7gb8zc", "version": "20221121.0"} +{"type": "savannah", "repo": "emacs", "rev": "aeadba1418d8fc18f17b4ae415cde35e9e272e7a", "sha256": "0bg6p4sz0npq108m16ggh0wwxg7xq3mpwzw8yzb8clb2ihfalycm", "version": "20221121.0"} diff --git a/repos/emacs/update b/repos/emacs/update index 12b7daa45f4d..3de0f5309c5b 100755 --- a/repos/emacs/update +++ b/repos/emacs/update @@ -52,6 +52,5 @@ function update_release() { update_savannah_branch master update_release -update_savannah_branch feature/tree-sitter nix-build --no-out-link --show-trace ./test.nix |