The version of emacs-evil-collection in guix relies on the company-tng-mode, which isn't in the most recent release of emacs-company, so I'm submitting this patch to bump emacs-company to the latest git commit. From 28e2b3fbf46684ce8b3b53cf59b1495d9e162b97 Mon Sep 17 00:00:00 2001 From: Noah Evans Date: Fri, 12 Feb 2021 01:21:22 -0500 Subject: [PATCH] gnu: emacs-company: Update to 0.9.13-0.5c25e11. --- gnu/packages/emacs-xyz.scm | 39 ++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a89568f43d..dab8e870c4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5225,25 +5225,32 @@ build jobs.") (license license:gpl3+))) (define-public emacs-company - (package - (name "emacs-company") - (version "0.9.13") - (source - (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/" - "company-" version ".tar")) - (sha256 - (base32 "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw")))) - (build-system emacs-build-system) - (home-page "https://company-mode.github.io/") - (synopsis "Modular text completion framework") - (description - "Company is a modular completion mechanism. Modules for retrieving + ;; 0.9.13 is almost a year old and is incompatible with + ;; emacs-evil-collection + (let ((commit "5c25e114c3ac1bee3671abd47f46592a3151d549") + (revision "0")) + (package + (name "emacs-company") + (version (git-version "0.9.13" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/company-mode/company-mode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y6gqc9w4zw1048hlyx0l46gcngbyrmdvzk30flwfphg1ancmcrj")))) + (build-system emacs-build-system) + (home-page "https://company-mode.github.io/") + (synopsis "Modular text completion framework") + (description + "Company is a modular completion mechanism. Modules for retrieving completion candidates are called back-ends, modules for displaying them are front-ends. Company comes with many back-ends, e.g., @code{company-elisp}. These are distributed in separate files and can be used individually.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-company-box ;; There is no release yet. Version is extracted from the main -- 2.30.0