From cbd3a3b252a63ce1677c928374f0bc1dfbefd61e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 27 Aug 2019 21:24:39 -0400 Subject: [PATCH] Fix #1697: use 2.0 branch for ensime package --- modules/lang/scala/packages.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/lang/scala/packages.el b/modules/lang/scala/packages.el index cc85e38ea..93c1f879e 100644 --- a/modules/lang/scala/packages.el +++ b/modules/lang/scala/packages.el @@ -5,4 +5,7 @@ (package! scala-mode) (unless (featurep! +lsp) - (package! ensime)) + ;; Fix #1697: Ensime doesn't have a master branch and its MELPA recipe doesn't + ;; specify a branch. Straight can't handle packages with non-standard primary + ;; branches (at the time of writing), so we must specify it manually: + (package! ensime :recipe (:branch "2.0")))