From patchwork Thu May 19 00:50:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SeerLite X-Patchwork-Id: 39515 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 34F8127BBE9; Thu, 19 May 2022 01:52:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D6B6D27BBEA for ; Thu, 19 May 2022 01:52:37 +0100 (BST) Received: from localhost ([::1]:45638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrUP7-0000uA-0D for patchwork@mira.cbaines.net; Wed, 18 May 2022 20:52:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrUOa-0000rm-Hw for guix-patches@gnu.org; Wed, 18 May 2022 20:52:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrUOX-0002wa-Pw for guix-patches@gnu.org; Wed, 18 May 2022 20:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrUOX-0001rP-NH for guix-patches@gnu.org; Wed, 18 May 2022 20:52:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54221] [PATCH v3 1/2] gnu: vim: Use native-search-paths to search for plugins. References: In-Reply-To: Resent-From: SeerLite Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 May 2022 00:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54221@debbugs.gnu.org Cc: SeerLite Received: via spool by 54221-submit@debbugs.gnu.org id=B54221.16529214667074 (code B ref 54221); Thu, 19 May 2022 00:52:01 +0000 Received: (at 54221) by debbugs.gnu.org; 19 May 2022 00:51:06 +0000 Received: from localhost ([127.0.0.1]:33966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUNe-0001q1-8C for submit@debbugs.gnu.org; Wed, 18 May 2022 20:51:06 -0400 Received: from mx.nixnet.email ([94.16.121.167]:39806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUNa-0001pW-5U for 54221@debbugs.gnu.org; Wed, 18 May 2022 20:51:05 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 22EC52007B5; Wed, 18 May 2022 20:50:58 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1652921460; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=X49qdmk4R09LmNUku7L0joUy9rcKxCdcqOz8nuPhQI4=; b=XRc5AF9jDJLh3oITqE3EIU3a2CtL1RHe+Sogu+8Exv3m7tSC57uulWeLG/NZcJb2K1zeiU dtvw1PJQ2DY8gumdlJbU7kS6g1VIrdnlGTUjnyRbqME8bt7WsjhBu+s8PjMirfnyEu1mkv Qu5l7tlhs3vGV7ufBUnLLJebZWZZ2SM= Date: Wed, 18 May 2022 20:50:51 -0400 Message-Id: <4736ca5df2bf710fc082eed4f08c1f2ccaf6984f.1652921451.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.36.0 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" Reply-to: SeerLite X-ACL-Warn: , SeerLite via Guix-patches X-Patchwork-Original-From: SeerLite via Guix-patches via From: SeerLite X-getmail-retrieved-from-mailbox: Patches Previously a hardcoded list of directories was used, which albeit quite accurate during normal use, didn't fully respect the active Guix environment and didn't make use of Guix's search-paths feature. * gnu/packages/aux-files/guix.vim: Use 'GUIX_VIMRUNTIME' to set the runtimepath. * gnu/packages/vim.scm (vim)[native-search-paths]: Add search path specification for 'GUIX_VIMRUNTIME'. --- gnu/packages/aux-files/guix.vim | 11 ++++------- gnu/packages/vim.scm | 6 ++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/packages/aux-files/guix.vim b/gnu/packages/aux-files/guix.vim index 9397c53701..3c13a16b7d 100644 --- a/gnu/packages/aux-files/guix.vim +++ b/gnu/packages/aux-files/guix.vim @@ -1,10 +1,7 @@ -" This appends all of the vim plugins to the end of Vim's runtimepath. -for directory in ["/run/current-system/profile", $HOME . "/.guix-profile", $HOME ."/.guix-home/profile", $GUIX_PROFILE, $GUIX_ENVIRONMENT] - let vimplugins = directory . "/share/vim/vimfiles" - if isdirectory(vimplugins) - let &rtp = join([&rtp,vimplugins], ',') - endif -endfor +if !empty($GUIX_VIMRUNTIME) + set rtp+=$GUIX_VIMRUNTIME +endif + " Unconditionally add */after directories last, as intended by upstream " TODO: Remove duplicate */after directories for directory in [$VIM . "/vimfiles", $HOME ."/.vim"] diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index caf9ea85b3..222827e539 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Tissevert ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2022 Luis Henrique Gomes Higino +;;; Copyright © 2022 SeerLite ;;; ;;; This file is part of GNU Guix. ;;; @@ -147,6 +148,11 @@ (define-public vim (mkdir-p vimdir) (copy-file (assoc-ref inputs "guix.vim") (string-append vimdir "/vimrc")))))))) + (native-search-paths + (list (search-path-specification + (variable "GUIX_VIMRUNTIME") + (separator ",") + (files (list "share/vim/vimfiles"))))) (inputs (list gawk ncurses perl tcsh)) ; For runtime/tools/vim32 (native-inputs From patchwork Thu May 19 00:50:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeerLite X-Patchwork-Id: 39514 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 E761027BBEB; Thu, 19 May 2022 01:52:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id ACF3327BBE9 for ; Thu, 19 May 2022 01:52:37 +0100 (BST) Received: from localhost ([::1]:45630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrUP6-0000tg-SN for patchwork@mira.cbaines.net; Wed, 18 May 2022 20:52:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrUOa-0000ro-ID for guix-patches@gnu.org; Wed, 18 May 2022 20:52:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40073) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrUOY-0002wb-4v for guix-patches@gnu.org; Wed, 18 May 2022 20:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrUOY-0001rW-3j for guix-patches@gnu.org; Wed, 18 May 2022 20:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54221] [PATCH v3 2/2] gnu: neovim: Search and use installed plugins, like vim. Resent-From: SeerLite Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 May 2022 00:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54221@debbugs.gnu.org Cc: SeerLite Received: via spool by 54221-submit@debbugs.gnu.org id=B54221.16529214707091 (code B ref 54221); Thu, 19 May 2022 00:52:02 +0000 Received: (at 54221) by debbugs.gnu.org; 19 May 2022 00:51:10 +0000 Received: from localhost ([127.0.0.1]:33969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUNh-0001qH-HB for submit@debbugs.gnu.org; Wed, 18 May 2022 20:51:09 -0400 Received: from mx.nixnet.email ([94.16.121.167]:39818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUNe-0001q2-Im for 54221@debbugs.gnu.org; Wed, 18 May 2022 20:51:06 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 8C6CC2023DA; Wed, 18 May 2022 20:51:00 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1652921461; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=1BqrQr6BKypnMGwbKwYZp9mV9ucTMibYkOCinuUfe58=; b=WcsQup89QZaiU2AbcljuxN7WWzVCoTmUsnXZjcSluO9BClM6y4dbvSR7bhd4bybWXY4mSZ JvXAkDJGwas5ZqUeYY2kNVynAG4AkWAEDssZ7VIGOHxe+ix9JPDXRMuCgO4VJDicC52+sR /q04x4YnS4y4B+Sj5KqS0ddl69k/ixo= Date: Wed, 18 May 2022 20:50:52 -0400 Message-Id: <9337edb149eb9234b17f6c00d5cb7d1be4321bae.1652921451.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.36.0 In-Reply-To: <4736ca5df2bf710fc082eed4f08c1f2ccaf6984f.1652921451.git.seerlite@nixnet.email> References: <4736ca5df2bf710fc082eed4f08c1f2ccaf6984f.1652921451.git.seerlite@nixnet.email> 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" Reply-to: SeerLite X-ACL-Warn: , SeerLite via Guix-patches X-Patchwork-Original-From: SeerLite via Guix-patches via From: SeerLite X-getmail-retrieved-from-mailbox: Patches * gnu/packages/vim.scm (neovim)[phases]: Add 'install-guix.vim phase and remove trailing #t's. [native-search-paths]: Add search path specification for 'GUIX_VIMRUNTIME'. --- gnu/packages/vim.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 222827e539..18f19c0eba 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -716,16 +716,25 @@ (define-public neovim (setenv "LUA_PATH" (string-join (map lua-path-spec lua-inputs) ";")) (setenv "LUA_CPATH" - (string-join (map lua-cpath-spec lua-inputs) ";")) - #t))) + (string-join (map lua-cpath-spec lua-inputs) ";"))))) (add-after 'unpack 'prevent-embedding-gcc-store-path (lambda _ ;; nvim remembers its build options, including the compiler with ;; its complete path. This adds gcc to the closure of nvim, which ;; doubles its size. We remove the refirence here. (substitute* "cmake/GetCompileFlags.cmake" - (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc")) - #t))))) + (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc")))) + (add-after 'install 'install-guix.vim + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((vimdir (string-append (assoc-ref outputs "out") "/share/nvim")) + (vimrc #$(local-file (search-auxiliary-file "guix.vim")))) + (mkdir-p vimdir) + (copy-file vimrc (string-append nvimdir "/sysinit.vim"))))))) + (native-search-paths + (list (search-path-specification + (variable "GUIX_VIMRUNTIME") + (separator ",") + (files (list "share/vim/vimfiles"))))) (inputs (list libuv-for-luv msgpack libtermkey