From patchwork Fri Apr 23 19:58:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 28837 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 186E927BC7D; Fri, 23 Apr 2021 20:59:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0E3DD27BC7C for ; Fri, 23 Apr 2021 20:59:09 +0100 (BST) Received: from localhost ([::1]:35622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1la1xE-0007Tj-7y for patchwork@mira.cbaines.net; Fri, 23 Apr 2021 15:59:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1la1x8-0007TZ-Dg for guix-patches@gnu.org; Fri, 23 Apr 2021 15:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1la1x8-0007lx-6M for guix-patches@gnu.org; Fri, 23 Apr 2021 15:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1la1x8-0006oH-42 for guix-patches@gnu.org; Fri, 23 Apr 2021 15:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47963] [PATCH v3] gnu: Add eovim. References: <20210423024046.24776-1-jackhill@jackhill.us> In-Reply-To: <20210423024046.24776-1-jackhill@jackhill.us> Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Apr 2021 19:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47963 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47963@debbugs.gnu.org Received: via spool by 47963-submit@debbugs.gnu.org id=B47963.161920791326139 (code B ref 47963); Fri, 23 Apr 2021 19:59:02 +0000 Received: (at 47963) by debbugs.gnu.org; 23 Apr 2021 19:58:33 +0000 Received: from localhost ([127.0.0.1]:38923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1la1wf-0006nX-AY for submit@debbugs.gnu.org; Fri, 23 Apr 2021 15:58:33 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:51832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1la1we-0006nK-8c for 47963@debbugs.gnu.org; Fri, 23 Apr 2021 15:58:32 -0400 Received: from [2001:470:8:9f5:f850:c9a2:75c6:a2d9] (helo=alperton.home.eronel.org) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1la1wY-0002hq-Jc for 47963@debbugs.gnu.org; Fri, 23 Apr 2021 15:58:26 -0400 From: Jack Hill Date: Fri, 23 Apr 2021 15:58:18 -0400 Message-Id: <20210423195818.4709-1-jackhill@jackhill.us> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/vim (eovim): New variable. --- Version 3: Adds an absolute store reference to the nvim dependency. Users will still be able to use the --nvim option to select a different version. I believe this patch is now ready for review and merging if appropriate. gnu/packages/vim.scm | 45 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 231fae9298..009544f40e 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2019 HiPhish ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019, 2020 Jakub Kądziołka -;;; Copyright © 2020 Jack Hill +;;; Copyright © 2020, 2021 Jack Hill ;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. @@ -42,6 +42,7 @@ #:use-module (gnu packages attr) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages enlightenment) #:use-module (gnu packages fontutils) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) @@ -708,6 +709,48 @@ refactor Vim in order to: ;; except for parts that were contributed under the Vim license. (license (list license:asl2.0 license:vim)))) +(define-public eovim + (package + (name "eovim") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jeanguyomarch/eovim/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06b7crmz3wvvq15ncl0jk20s8j1pmna2jin0k5y5n5qxpafbgp3k")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #false ;no tests + #:phases + (modify-phases %standard-phases + (add-after 'configure 'reference-nvim + (lambda* (#:key inputs #:allow-other-keys) + (let ((nvim (string-append (assoc-ref inputs "neovim") + "/bin/nvim"))) + ;; This substitution should change one line, and replaces the default + ;; value in the struct of options with an absolute store reference. + (substitute* "../source/src/main.c" + (("(^[[:blank:]]+\\.nvim = \")nvim" _ start) + (string-append start nvim)))))) + (add-before 'build 'set-home + (lambda _ (setenv "HOME" "/tmp")))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("efl" ,efl) + ("msgpack" ,msgpack) + ("neovim" ,neovim))) + (home-page "https://github.com/jeanguyomarch/eovim/") + (synopsis "EFL GUI for Neovim") + (description "GUI for Neovim based on the @acronym{EFL, Enlightenment +Foundation Libraries} toolkit. Its features include customizable appearance +and support for fonts with ligatures.") + (license license:expat))) + (define-public vifm (package (name "vifm")