From unknown Wed Jun 18 23:18:29 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#54221 <54221@debbugs.gnu.org> To: bug#54221 <54221@debbugs.gnu.org> Subject: Status: [PATCH 0/4] vim: Detect plugins via search paths. Reply-To: bug#54221 <54221@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:18:29 +0000 retitle 54221 [PATCH 0/4] vim: Detect plugins via search paths. reassign 54221 guix-patches submitter 54221 SeerLite severity 54221 normal tag 54221 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 02 08:14:09 2022 Received: (at submit) by debbugs.gnu.org; 2 Mar 2022 13:14:09 +0000 Received: from localhost ([127.0.0.1]:39343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOnx-0002H2-LD for submit@debbugs.gnu.org; Wed, 02 Mar 2022 08:14:09 -0500 Received: from lists.gnu.org ([209.51.188.17]:33478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOnw-0002Gv-V9 for submit@debbugs.gnu.org; Wed, 02 Mar 2022 08:14:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPOno-0004l0-U9 for guix-patches@gnu.org; Wed, 02 Mar 2022 08:14:03 -0500 Received: from mx.nixnet.email ([94.16.121.167]:41008) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPOnm-0006mx-8V for guix-patches@gnu.org; Wed, 02 Mar 2022 08:13:59 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 998472003BC for ; Wed, 2 Mar 2022 08:13:50 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1646226831; h=from:from:reply-to:subject:subject:to:to:cc; bh=ucFbqb75PYY7HdIuCrOZK2vnNZZEif09UViyuGm7hQA=; b=PgDxrKKnFd2Cml6qtJrPvjY+kCDb47n+wqKpi4WLY34aPP+zhxufOlCclDXJALcSiyks6R NVT/OG0wDxfNqdA4PE2Lb0ljCCSUDhP2abUYeoSizYwkvinE5RwPPHQGRvGyNW3tPQ9AIO ZOLQkbFxnc3gkFfCnGZXLPQazccgiww= Message-ID: Date: Wed, 2 Mar 2022 10:11:36 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 From: SeerLite Subject: [PATCH 0/4] vim: Detect plugins via search paths. To: guix-patches@gnu.org Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=94.16.121.167; envelope-from=seerlite@nixnet.email; helo=mx.nixnet.email X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hi! These patches make Vim use native-search-paths to search for plugins, instead of manually searching for them in a set of hardcoded paths, which is how it was done up till now. I've added the same search paths to Neovim, which unlike Vim, wasn't auto-detecting Vim plugins at all before. Neovim also searches XDG_DATA_DIRS for Neovim-specific plugins, so I'd appreciate if was merged too. Finally, I've updated the package definitions to use the new style with gexps and label-less inputs. SeerLite From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 02 08:19:46 2022 Received: (at 54221) by debbugs.gnu.org; 2 Mar 2022 13:19:47 +0000 Received: from localhost ([127.0.0.1]:39357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOtO-0002Q1-If for submit@debbugs.gnu.org; Wed, 02 Mar 2022 08:19:46 -0500 Received: from mx.nixnet.email ([94.16.121.167]:56630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOtN-0002Pr-9e for 54221@debbugs.gnu.org; Wed, 02 Mar 2022 08:19:45 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 156E22003BC; Wed, 2 Mar 2022 08:19:42 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1646227184; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=udSImFvApcoewVwjElOHRcoDrRBc7i5s34IWjLK7tY4=; b=CG6ZMZZXkccnyaGtBWnHYQ6pk5F0fb4Drxz9vBa3qrXCJYndtlMO+LxFNJaihRKThJGnyo rAGPNRGgc6cgy3HzLnz9RunNAb1QDaT6rJ0Dl0B+c3HgRhIgWRSpTJ179sBdjG24SXQKjl F6lXI+rqwV/ujXi2UO8XOUoHna4P24Q= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH 1/4] gnu: vim: Use native-search-paths to search for plugins. Date: Wed, 2 Mar 2022 10:17:32 -0300 Message-Id: X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 28944dd640..7407ae71d7 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Tissevert ;;; Copyright © 2021 Foo Chuan Wei +;;; Copyright © 2022 SeerLite ;;; ;;; This file is part of GNU Guix. ;;; @@ -150,6 +151,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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 02 08:19:48 2022 Received: (at 54221) by debbugs.gnu.org; 2 Mar 2022 13:19:48 +0000 Received: from localhost ([127.0.0.1]:39360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOtP-0002QF-St for submit@debbugs.gnu.org; Wed, 02 Mar 2022 08:19:48 -0500 Received: from mx.nixnet.email ([94.16.121.167]:56638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOtO-0002Q0-Jp for 54221@debbugs.gnu.org; Wed, 02 Mar 2022 08:19:47 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 03EEF2020E7; Wed, 2 Mar 2022 08:19:44 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1646227186; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=FGn2RtqG+omSIqoSvtOy1imHWWHz0ee1V9UsU+NTRTg=; b=Oy5c+825I4sbuP7M/qEs9qryWWR8+4OsNfNckW8mZKiRDkmylp9CBrtm+097HQi0+voq3M MFfuIlCRuHoXTOyxN40Q230VAaHxqAtbuF0GI8uNjl7ufR/FeZ2NtM5trFm6cnH30Fa/YM IDBF1jc+mUixM9L0Rfn3GmFLztaPOQU= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH 2/4] gnu: neovim: Search and use installed plugins, like vim. Date: Wed, 2 Mar 2022 10:17:33 -0300 Message-Id: <39a5e8f9c8f4e3fee5f36824780296f55995ae33.1646227054.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/vim.scm (neovim)[phases]{install-guix.vim}: New phase. [native-search-paths]: Add search path specification for 'GUIX_VIMRUNTIME'. --- gnu/packages/vim.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 7407ae71d7..3997797201 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -714,7 +714,18 @@ (define-public neovim ;; doubles its size. We remove the refirence here. (substitute* "cmake/GetCompileFlags.cmake" (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc")) - #t))))) + #t)) + (add-after 'install 'install-guix.vim + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((nvimdir (string-append (assoc-ref outputs "out") "/share/nvim"))) + (mkdir-p nvimdir) + (copy-file (assoc-ref inputs "guix.vim") + (string-append nvimdir "/sysinit.vim")))))))) + (native-search-paths + (list (search-path-specification + (variable "GUIX_VIMRUNTIME") + (separator ",") + (files (list "share/vim/vimfiles"))))) (inputs `(("libuv" ,libuv) ("msgpack" ,msgpack) @@ -730,7 +741,8 @@ (define-public neovim (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) - ("gperf" ,gperf))) + ("gperf" ,gperf) + ("guix.vim" ,(search-auxiliary-file "guix.vim")))) (home-page "https://neovim.io") (synopsis "Fork of vim focused on extensibility and agility") (description "Neovim is a project that seeks to aggressively -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 02 08:19:53 2022 Received: (at 54221) by debbugs.gnu.org; 2 Mar 2022 13:19:53 +0000 Received: from localhost ([127.0.0.1]:39364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOtV-0002QY-4c for submit@debbugs.gnu.org; Wed, 02 Mar 2022 08:19:53 -0500 Received: from mx.nixnet.email ([94.16.121.167]:56642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOtR-0002QO-CD for 54221@debbugs.gnu.org; Wed, 02 Mar 2022 08:19:51 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id B89822001F6; Wed, 2 Mar 2022 08:19:46 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1646227188; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=W/rNzeA4HrQZR4lnAUIZbfhKgvv3iFtY39lDxkywJc4=; b=FB9JHkIzDdwpsMBAtTYuqlJrOnEZmkOIhzWQ7mGJyCphokYtoPtT1NQjMPidOGiVLwTEit QZFip4KXGmdI6Vv/o8p5mqHWzqSuqe2RJ83y756pg+YqZSjIX18+Axk0xyiT5tgoUq7TTM sAc2gLRLxyGDz9dDoiGj7/1vvjH3K9c= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH 3/4] gnu: vim: Update package style. Date: Wed, 2 Mar 2022 10:17:34 -0300 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/vim.scm (vim)[native-inputs]: Remove "guix.vim" gexp and remove labels. [arguments]: Convert to list of gexps and inline the "guix.vim" gexp. --- gnu/packages/vim.scm | 127 +++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 65 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 3997797201..d5d8b412f7 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -89,68 +89,69 @@ (define-public vim "1jppzgmngcdd7jfb5rnkkvf5d47svnjbn7qj4mvjacd9az3c7s9r")))) (build-system gnu-build-system) (arguments - `(#:test-target "test" - #:parallel-tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-absolute-paths - (lambda _ - (substitute* "runtime/tools/mve.awk" - (("/usr/bin/nawk") (which "gawk"))) - (substitute* '("src/testdir/Makefile" - "src/testdir/test_normal.vim" - "src/testdir/test_popupwin.vim" - "src/testdir/test_shell.vim" - "src/testdir/test_system.vim" - "src/testdir/test_terminal.vim" - "src/testdir/test_terminal2.vim") - (("/bin/sh") (which "sh"))) - (substitute* "src/testdir/test_autocmd.vim" - (("/bin/kill") (which "kill"))))) - (add-before 'check 'set-environment-variables - (lambda* (#:key inputs #:allow-other-keys) - ;; One of the tests tests timezone-dependent functions. - (setenv "TZDIR" - (search-input-directory inputs "share/zoneinfo")) + (list + #:test-target "test" + #:parallel-tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'patch-absolute-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "runtime/tools/mve.awk" + (("/usr/bin/nawk") (search-input-file inputs "bin/gawk"))) + (substitute* '("src/testdir/Makefile" + "src/testdir/test_normal.vim" + "src/testdir/test_popupwin.vim" + "src/testdir/test_shell.vim" + "src/testdir/test_system.vim" + "src/testdir/test_terminal.vim" + "src/testdir/test_terminal2.vim") + (("/bin/sh") (search-input-file inputs "bin/sh"))) + (substitute* "src/testdir/test_autocmd.vim" + (("/bin/kill") (search-input-file inputs "bin/kill"))))) + (add-before 'check 'set-environment-variables + (lambda* (#:key inputs #:allow-other-keys) + ;; One of the tests tests timezone-dependent functions. + (setenv "TZDIR" + (search-input-directory inputs "share/zoneinfo")) - ;; Make sure the TERM environment variable is set for the tests - (setenv "TERM" "xterm"))) - (add-before 'check 'skip-or-fix-failing-tests - (lambda _ - ;; This test assumes that PID 1 is run as root and that the user - ;; running the test suite does not have permission to kill(1, 0) - ;; it. This is not true in the build container, where both PID 1 - ;; and the test suite are run as the same user. Skip the test. - ;; An alternative fix would be to patch the PID used to a random - ;; 32-bit value and hope it never shows up in the test environment. - (substitute* "src/testdir/test_swap.vim" - (("if !IsRoot\\(\\)") "if 0")) + ;; Make sure the TERM environment variable is set for the tests + (setenv "TERM" "xterm"))) + (add-before 'check 'skip-or-fix-failing-tests + (lambda _ + ;; This test assumes that PID 1 is run as root and that the user + ;; running the test suite does not have permission to kill(1, 0) + ;; it. This is not true in the build container, where both PID 1 + ;; and the test suite are run as the same user. Skip the test. + ;; An alternative fix would be to patch the PID used to a random + ;; 32-bit value and hope it never shows up in the test environment. + (substitute* "src/testdir/test_swap.vim" + (("if !IsRoot\\(\\)") "if 0")) - ;; These tests check how the terminal looks after executing some - ;; actions. The path of the bash binary is shown, which results in - ;; a difference being detected. Patching the expected result is - ;; non-trivial due to the special format used, so skip the test. - (substitute* "src/testdir/test_terminal.vim" - ((".*Test_open_term_from_cmd.*" line) - (string-append line "return\n")) - ((".*Test_terminal_postponed_scrollback.*" line) - (string-append line "return\n")) - ((".*Test_combining_double_width.*" line) - (string-append line "return\n"))) - (substitute* "src/testdir/test_popupwin.vim" - ((".*Test_popup_drag_termwin.*" line) - (string-append line "return\n"))))) - (add-before 'install 'fix-installman.sh - (lambda _ - (substitute* "src/installman.sh" - (("/bin/sh") - (which "sh"))))) - (add-after 'install 'install-guix.vim - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((vimdir (string-append (assoc-ref outputs "out") "/share/vim"))) - (mkdir-p vimdir) - (copy-file (assoc-ref inputs "guix.vim") - (string-append vimdir "/vimrc")))))))) + ;; These tests check how the terminal looks after executing some + ;; actions. The path of the bash binary is shown, which results in + ;; a difference being detected. Patching the expected result is + ;; non-trivial due to the special format used, so skip the test. + (substitute* "src/testdir/test_terminal.vim" + ((".*Test_open_term_from_cmd.*" line) + (string-append line "return\n")) + ((".*Test_terminal_postponed_scrollback.*" line) + (string-append line "return\n")) + ((".*Test_combining_double_width.*" line) + (string-append line "return\n"))) + (substitute* "src/testdir/test_popupwin.vim" + ((".*Test_popup_drag_termwin.*" line) + (string-append line "return\n"))))) + (add-before 'install 'fix-installman.sh + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/installman.sh" + (("/bin/sh") + (search-input-file inputs "bin/sh"))))) + (add-after 'install 'install-guix.vim + (lambda _ + (let ((vimdir (string-append #$output "/share/vim")) + (vimrc #$(local-file (search-auxiliary-file "guix.vim")))) + (mkdir-p vimdir) + (copy-file vimrc (string-append vimdir "/vimrc")))))))) (native-search-paths (list (search-path-specification (variable "GUIX_VIMRUNTIME") @@ -159,11 +160,7 @@ (define-public vim (inputs (list gawk ncurses perl tcsh)) ; For runtime/tools/vim32 (native-inputs - `(("libtool" ,libtool) - ("guix.vim" ,(search-auxiliary-file "guix.vim")) - - ;; For tests. - ("tzdata" ,tzdata-for-tests))) + (list libtool tzdata-for-tests)) (home-page "https://www.vim.org/") (synopsis "Text editor based on vi") ;; The description shares language with the vim-full package. When making -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 02 08:19:55 2022 Received: (at 54221) by debbugs.gnu.org; 2 Mar 2022 13:19:55 +0000 Received: from localhost ([127.0.0.1]:39366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOtW-0002Qm-KP for submit@debbugs.gnu.org; Wed, 02 Mar 2022 08:19:54 -0500 Received: from mx.nixnet.email ([94.16.121.167]:56650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPOtU-0002QX-UP for 54221@debbugs.gnu.org; Wed, 02 Mar 2022 08:19:53 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 7F53B2020E7; Wed, 2 Mar 2022 08:19:49 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1646227190; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=W5MRP2bthoyalRBsVZ+YH/MoHgrawKTxZzY493OV+lg=; b=MxMuTvHkzDEyXW0kPM+O2XTzn4hKYXA8Uoq3oIMc053jQNZY0Ps+n1EyK6X7vvnMSYdDPR coeEMzCyC4TDhsOmupXf3Gj4+v5H5ViT/xjEBLTUT7HvEWfp1k/Za6THc7PdzwEHZupu6P 2yfPF5HuKIdGT6UX27ggUdeiewvmF8A= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH 4/4] gnu: neovim: Update package style. Date: Wed, 2 Mar 2022 10:17:35 -0300 Message-Id: <0ee8ec7a501cf53dc1b70b0ba21f72c0f3dc2d58.1646227054.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/vim.scm (neovim)[inputs]: Remove labels. [native-inputs]: Remove "guix.vim" gexp and remove labels. [arguments]: Convert to list of gexps, inline the "guix.vim" gexp, adjust lua input names and remove trailing #t's. --- gnu/packages/vim.scm | 114 +++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 59 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index d5d8b412f7..5e6439ed00 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -676,70 +676,66 @@ (define-public neovim (base32 "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m")))) (build-system cmake-build-system) (arguments - `(#:modules ((srfi srfi-26) + (list + #:modules `((srfi srfi-26) (guix build cmake-build-system) (guix build utils)) - #:configure-flags '("-DPREFER_LUA:BOOL=YES") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-lua-paths - (lambda* (#:key inputs #:allow-other-keys) - (let* ((lua-version "5.1") - (lua-cpath-spec - (lambda (prefix) - (let ((path (string-append prefix "/lib/lua/" lua-version))) - (string-append path "/?.so;" path "/?/?.so")))) - (lua-path-spec - (lambda (prefix) - (let ((path (string-append prefix "/share/lua/" lua-version))) - (string-append path "/?.lua;" path "/?/?.lua")))) - (lua-inputs (map (cute assoc-ref inputs <>) - '("lua" - "lua-luv" - "lua-lpeg" - "lua-bitop" - "lua-libmpack")))) - (setenv "LUA_PATH" - (string-join (map lua-path-spec lua-inputs) ";")) - (setenv "LUA_CPATH" - (string-join (map lua-cpath-spec lua-inputs) ";")) - #t))) - (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)) - (add-after 'install 'install-guix.vim - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((nvimdir (string-append (assoc-ref outputs "out") "/share/nvim"))) - (mkdir-p nvimdir) - (copy-file (assoc-ref inputs "guix.vim") - (string-append nvimdir "/sysinit.vim")))))))) + #:configure-flags #~(list "-DPREFER_LUA:BOOL=YES") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-lua-paths + (lambda* (#:key inputs #:allow-other-keys) + (let* ((lua-version "5.1") + (lua-cpath-spec + (lambda (prefix) + (let ((path (string-append prefix "/lib/lua/" lua-version))) + (string-append path "/?.so;" path "/?/?.so")))) + (lua-path-spec + (lambda (prefix) + (let ((path (string-append prefix "/share/lua/" lua-version))) + (string-append path "/?.lua;" path "/?/?.lua")))) + (lua-inputs (map (cute assoc-ref inputs <>) + '("lua" + "lua5.1-luv" + "lua5.1-lpeg" + "lua5.1-bitop" + "lua5.1-libmpack")))) + (setenv "LUA_PATH" + (string-join (map lua-path-spec lua-inputs) ";")) + (setenv "LUA_CPATH" + (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")))) + (add-after 'install 'install-guix.vim + (lambda _ + (let ((vimdir (string-append #$output "/share/nvim")) + (vimrc #$(local-file (search-auxiliary-file "guix.vim")))) + (mkdir-p vimdir) + (copy-file vimrc (string-append vimdir "/sysinit.vim")))))))) (native-search-paths - (list (search-path-specification - (variable "GUIX_VIMRUNTIME") - (separator ",") - (files (list "share/vim/vimfiles"))))) + (list (search-path-specification + (variable "GUIX_VIMRUNTIME") + (separator ",") + (files (list "share/vim/vimfiles"))))) (inputs - `(("libuv" ,libuv) - ("msgpack" ,msgpack) - ("libtermkey" ,libtermkey) - ("libvterm" ,libvterm) - ("unibilium" ,unibilium) - ("jemalloc" ,jemalloc) - ("lua" ,lua-5.1) - ("lua-luv" ,lua5.1-luv) - ("lua-lpeg" ,lua5.1-lpeg) - ("lua-bitop" ,lua5.1-bitop) - ("lua-libmpack" ,lua5.1-libmpack))) + (list libuv + msgpack + libtermkey + libvterm + unibilium + jemalloc + lua-5.1 + lua5.1-luv + lua5.1-lpeg + lua5.1-bitop + lua5.1-libmpack)) (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("gperf" ,gperf) - ("guix.vim" ,(search-auxiliary-file "guix.vim")))) + (list pkg-config gettext-minimal gperf)) (home-page "https://neovim.io") (synopsis "Fork of vim focused on extensibility and agility") (description "Neovim is a project that seeks to aggressively -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 02 13:25:20 2022 Received: (at 54221) by debbugs.gnu.org; 2 Mar 2022 18:25:20 +0000 Received: from localhost ([127.0.0.1]:40720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPTf6-00023a-3T for submit@debbugs.gnu.org; Wed, 02 Mar 2022 13:25:20 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:48616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPTf4-00023N-BX for 54221@debbugs.gnu.org; Wed, 02 Mar 2022 13:25:18 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by xavier.telenet-ops.be with bizsmtp id 1WRG2700p4UW6Th01WRGhq; Wed, 02 Mar 2022 19:25:17 +0100 Message-ID: Subject: Re: [bug#54221] [PATCH 3/4] gnu: vim: Update package style. From: Maxime Devos To: SeerLite , 54221@debbugs.gnu.org Date: Wed, 02 Mar 2022 19:25:16 +0100 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-E3vZoc4lLaYiSK/0Ponq" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1646245517; bh=lU5YpusfCmnogkszeIhrkVBuMfgSJ5TdBkrgad4jGSc=; h=Subject:From:To:Date:In-Reply-To:References; b=SnkNVepc765EZTtJWs9xkA3yjcChSgQ6eNgSPxeP+zkEcEfIAJKc1zs9l+OP1whxL DT1HM/2IvVpoTQktEbTL/dnUKL+Er7t2pWRYfRJbzRhSsgwT9L6rfaqMRO8R2w6isz fYDbn0+1Qz0rurCZahArJOWo0YEfqnwKVBC0TbezrPmRFFSlWBjC9PrSrhas5bOL7B xIP+njtsVSYoSnfoYGm4nANqbvMr3RMQxsRq0yRF5Po6a2FdJIfl6rsobAdLOoo+kR aMQNd9pE1zInCPl3TVPesWtj8wVfaosH3NHJ930VQTRIj08+45V2djDfEnSKLWVpZX TtZu9qmjT9sdA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-E3vZoc4lLaYiSK/0Ponq Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 U2VlckxpdGUgdmlhIEd1aXgtcGF0Y2hlcyB2aWEgc2NocmVlZiBvcCB3byAwMi0wMy0yMDIyIG9t IDEwOjE3IFstCjAzMDBdOgo+ICvCoMKgwqDCoMKgwqDCoMKgwqAgKGFkZC1iZWZvcmUgJ2NoZWNr ICdzZXQtZW52aXJvbm1lbnQtdmFyaWFibGVzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxh bWJkYSogKCM6a2V5IGlucHV0cyAjOmFsbG93LW90aGVyLWtleXMpCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIDs7IE9uZSBvZiB0aGUgdGVzdHMgdGVzdHMgdGltZXpvbmUtZGVwZW5kZW50 IGZ1bmN0aW9ucy4KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHNldGVudiAiVFpESVIi Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc2VhcmNoLWlu cHV0LWRpcmVjdG9yeSBpbnB1dHMgInNoYXJlL3pvbmVpbmZvIikpCj4gwqAKPiAtwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIDs7IE1ha2Ugc3VyZSB0aGUgVEVSTSBlbnZpcm9ubWVudCB2YXJpYWJs ZSBpcyBzZXQgZm9yIHRoZSB0ZXN0cwo+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHNldGVu diAiVEVSTSIgInh0ZXJtIikpKQoKVGhlIHR6ZGF0YSBpbiBpbiAnbmF0aXZlLWlucHV0cycsIG5v dCAnaW5wdXRzJywgc28gdGhpcyBjb2RlIG5lZWRzIHRvCmxvb2sgaW4gJyhvciBuYXRpdmUtaW5w dXRzIGlucHV0cyknLCBub3QgJ2lucHV0cycsIG90aGVyd2lzZSB0aGlzIGNvZGUKd2lsbCBmYWls IHdpdGggYSAnJnNlYXJjaC1wYXRoJyBleGNlcHRpb24gZnJvbSAnc2VhcmNoLWlucHV0LWRpcmVj dG9yeScKd2hlbiBjcm9zcy1jb21waWxpbmcgKHVudGVzdGVkKS4KCkdyZWV0aW5ncywKTWF4aW1l Lgo= --=-E3vZoc4lLaYiSK/0Ponq Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYh+2jBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7kwkAP9G3w8yY1vDsRJMyliQdr9lH1hX fDcel4jA65juJAV6cgEA+bmQlr2ZWEwuWKPze++75I50/Xg8355xhgqbHs2PwwI= =EV5m -----END PGP SIGNATURE----- --=-E3vZoc4lLaYiSK/0Ponq-- From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 02 13:29:52 2022 Received: (at 54221) by debbugs.gnu.org; 2 Mar 2022 18:29:52 +0000 Received: from localhost ([127.0.0.1]:40728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPTjT-0002BZ-VJ for submit@debbugs.gnu.org; Wed, 02 Mar 2022 13:29:52 -0500 Received: from baptiste.telenet-ops.be ([195.130.132.51]:56524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPTjS-0002BR-4T for 54221@debbugs.gnu.org; Wed, 02 Mar 2022 13:29:50 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by baptiste.telenet-ops.be with bizsmtp id 1WVo270024UW6Th01WVoRH; Wed, 02 Mar 2022 19:29:48 +0100 Message-ID: <6002b969ed2f353fef0e8fa87d4fc7d01d3344fa.camel@telenet.be> Subject: Re: [bug#54221] [PATCH 3/4] gnu: vim: Update package style. From: Maxime Devos To: SeerLite , 54221@debbugs.gnu.org Date: Wed, 02 Mar 2022 19:29:47 +0100 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-q5QZQbr5xhhARHfg7dim" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1646245788; bh=egUjjU5E/qtNt7j3+5u/WnVDrucOOnTAUZdDSrb7bLo=; h=Subject:From:To:Date:In-Reply-To:References; b=ZA4d9ZkDKfkB36f+S+8G0zn+fpmSBUWxInAbozdwu28NyO/xxoSrOe6lxxAaLGuXy H9PeFs9THHtF5LITElSsOngyIOFhdqVHI2YU3xFgjan8uUmFzcgI8VOS3DK5eXgB2A 8809bEC8XEdDw5veQHXkJTtdWclrxBWE+wUWA8qCveqqasBTpRkwSxh64oEc+hica8 8qgZhOtzChOxt98qpa2r57yQFaJNzHgjuYLyN5hQeo7pj6wMn7FfXUcp8YeUdbS04g CNcphQl4W0XFzo9taJcRCHnkrZ/7wgSgXdl8OmGtIpXXnI7RbKYZGS9oZvpGssPruR 9QtBgJHEMtNTQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-q5QZQbr5xhhARHfg7dim Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 U2VlckxpdGUgdmlhIEd1aXgtcGF0Y2hlcyB2aWEgc2NocmVlZiBvcCB3byAwMi0wMy0yMDIyIG9t IDEwOjE3IFstCjAzMDBdOgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEqICgjOmtl eSBpbnB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCBbdGhpcyBbYnJhY2tldGVkIGxpbmVdIHNlZW1zIGlycmVsZXZhbnQgZm9yIG15IGNvbW1lbnRd Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdWJzdGl0dXRlKiAnKCJzcmMvdGVzdGRp ci9NYWtlZmlsZSIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgInNyYy90ZXN0ZGlyL3Rlc3Rfbm9ybWFsLnZpbSIKPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgInNyYy90ZXN0 ZGlyL3Rlc3RfcG9wdXB3aW4udmltIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAic3JjL3Rlc3RkaXIvdGVzdF9zaGVsbC52aW0iCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg ICJzcmMvdGVzdGRpci90ZXN0X3N5c3RlbS52aW0iCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJzcmMvdGVzdGRpci90ZXN0X3Rlcm1p bmFsLnZpbSIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgInNyYy90ZXN0ZGlyL3Rlc3RfdGVybWluYWwyLnZpbSIpCj4gK8KgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoKCIvYmluL3NoIikgKHNlYXJjaC1pbnB1dC1maWxlIGlu cHV0cyAiYmluL3NoIikpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3Vic3RpdHV0 ZSogInNyYy90ZXN0ZGlyL3Rlc3RfYXV0b2NtZC52aW0iCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAoKCIvYmluL2tpbGwiKSAoc2VhcmNoLWlucHV0LWZpbGUgaW5wdXRzICJiaW4v a2lsbCIpKSkpKQoKVGhpcyBpcyB0ZXN0IHN0dWZmLCBhbmQgdGhlc2UgYmluYXJpZXMgZG8gbm90 IHNlZW0gdG8gYmUgcHJlc2VudCBpbgonaW5wdXRzJywgdGhleSB3b3VsZCBiZSBpbiB0aGUgaW1w bGljaXQgJ25hdGl2ZS1pbnB1dHMnLCBzbyB0aGVzZSB3b3VsZApuZWVkIHRvIHNlYXJjaCBpbiAn KG9yIG5hdGl2ZS1pbnB1dHMgaW5wdXRzKScgaW5zdGVhZCBvZiAnaW5wdXRzJyB0bwphdm9pZCAm c2VhcmNoLXBhdGggZXhjZXB0aW9ucyB3aGVuIGNyb3NzLWNvbXBpbGluZzoKCihzdWJzdGl0dXRl KiAnKCJzcmMvdGVzdGRpci8uLi4iKQogICgoIi9iaW4vc2giKSAoc2VhcmNoLWlucHV0LWZpbGUg KG9yIG5hdGl2ZS1pbnB1dHMgaW5wdXRzKSAiYmluL3NoIikpKQoKT3Igc2ltcGxlciwgdGhlcmUn cyBhIHByb2NlZHVyZSBmb3IgbG9va2luZyBmb3IgJ2Jpbi9UT09MJyBpbiBuYXRpdmUtCmlucHV0 czogJ3doaWNoJyEKCjs7IHRoZSBvcmlnaW5hbCBjb2RlIQooc3Vic3RpdHV0ZSogJygic3JjL3Rl c3RkaXIvLi4uIikKICAoKCIvYmluL3NoIikgKHdoaWNoICJzaCIpKSkKCldoeSB0aGUgY2hhbmdl IGZyb20gJ3doaWNoJyB0byAnc2VhcmNoLWlucHV0LWZpbGUnPwoKR3JlZXRpbmdzLApNYXhpbWUu Cg== --=-q5QZQbr5xhhARHfg7dim Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYh+3mxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7iImAQCExhQsoJf1cYwAYPzKi8OwgAWn QAKjSAktZX7Fyvm6XwD+PhVlkHCd4zVUhhXZ2uAxto1sZ4/RZgPfLK7mu/F9ug0= =i+g4 -----END PGP SIGNATURE----- --=-q5QZQbr5xhhARHfg7dim-- From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 02 13:30:36 2022 Received: (at 54221) by debbugs.gnu.org; 2 Mar 2022 18:30:36 +0000 Received: from localhost ([127.0.0.1]:40740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPTkC-0002Fj-Ir for submit@debbugs.gnu.org; Wed, 02 Mar 2022 13:30:36 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:55066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPTkB-0002Fb-AV for 54221@debbugs.gnu.org; Wed, 02 Mar 2022 13:30:35 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by xavier.telenet-ops.be with bizsmtp id 1WWa2700A4UW6Th01WWaUg; Wed, 02 Mar 2022 19:30:34 +0100 Message-ID: Subject: Re: [bug#54221] [PATCH 2/4] gnu: neovim: Search and use installed plugins, like vim. From: Maxime Devos To: SeerLite , 54221@debbugs.gnu.org Date: Wed, 02 Mar 2022 19:30:33 +0100 In-Reply-To: <39a5e8f9c8f4e3fee5f36824780296f55995ae33.1646227054.git.seerlite@nixnet.email> References: <39a5e8f9c8f4e3fee5f36824780296f55995ae33.1646227054.git.seerlite@nixnet.email> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-8bt81WLU3RiUF6S/CH9Q" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1646245834; bh=U4nC8XXdwnD9hcpeji2N5Zdmq8FQfquIXR46OFQBGqY=; h=Subject:From:To:Date:In-Reply-To:References; b=JgKF3vGir7PgkN229y1fkyE76mIfM8M3+qqEezO5PMuwz7VqnLDAymicMn/na/rLS vfKKHyIk6oIy/s30Jqxq9+aUgsRZu/Ogz5zDz+901EVnrfneKsCes4LWg09EOc887C AOxPJgziHp4r8eVq0Uu4m/xWkGQ3MlHi9e3cCZOeXHZpZETuX/JG0MC4FT3sXrmco2 ShDnPJRZp4g5JMoICf5ze+8JIsC6Il+zS1PR/N/aIfOMhumz5Jis2oXh14iLBlLL+z ZzY2S/c6wyzOFVgKJ6haAKgwtZOTjf86/9qCQxVKgJTbys//ntJ3vypGjwQY6djReZ 6+veWpDsU72zQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-8bt81WLU3RiUF6S/CH9Q Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 U2VlckxpdGUgdmlhIEd1aXgtcGF0Y2hlcyB2aWEgc2NocmVlZiBvcCB3byAwMi0wMy0yMDIyIG9t IDEwOjE3IFstCjAzMDBdOgo+ICvCoMKgwqAgKG5hdGl2ZS1zZWFyY2gtcGF0aHMKPiArwqDCoMKg wqDCoCAobGlzdCAoc2VhcmNoLXBhdGgtc3BlY2lmaWNhdGlvbgo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKHZhcmlhYmxlICJHVUlYX1ZJTVJVTlRJTUUiKQo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKHNlcGFyYXRvciAiLCIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZmls ZXMgKGxpc3QgInNoYXJlL3ZpbS92aW1maWxlcyIpKSkpKQoKdGhpcyBjYW4gYmUgc2ltcGxpZmll ZDoKCiAgKG5hdGl2ZS1zZWFyY2gtcGF0aHMgKHBhY2thZ2UtbmF0aXZlLXNlYXJjaC1wYXRocyB2 aW0pKQoKR3JlZXRpbmdzLApNYXhpbWUuCg== --=-8bt81WLU3RiUF6S/CH9Q Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYh+3yRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7qGaAP93MeIsVVFvd0zphBwq4dE3KMwS JhJ7zkYltYz6XQ28+QD/SF9nhYDOS2kRqAdVQnwoXlnp3cESmqGqxY9ty8mLTgM= =wu8X -----END PGP SIGNATURE----- --=-8bt81WLU3RiUF6S/CH9Q-- From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 02 13:33:30 2022 Received: (at 54221) by debbugs.gnu.org; 2 Mar 2022 18:33:30 +0000 Received: from localhost ([127.0.0.1]:40755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPTn0-0002LG-6l for submit@debbugs.gnu.org; Wed, 02 Mar 2022 13:33:30 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:58578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPTmy-0002L8-JV for 54221@debbugs.gnu.org; Wed, 02 Mar 2022 13:33:29 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by xavier.telenet-ops.be with bizsmtp id 1WZT2700K4UW6Th01WZTs4; Wed, 02 Mar 2022 19:33:27 +0100 Message-ID: <1acd5a1f1b0c8ecdd001f93ca236933de0ea9c23.camel@telenet.be> Subject: Re: [bug#54221] [PATCH 1/4] gnu: vim: Use native-search-paths to search for plugins. From: Maxime Devos To: SeerLite , 54221@debbugs.gnu.org Date: Wed, 02 Mar 2022 19:33:27 +0100 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-CrUANkDeXVlm14LVzwGS" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1646246007; bh=FN/ij39XlHT7zLj79ViyfwqCisfmFUVn5vPhkKrkn2c=; h=Subject:From:To:Date:In-Reply-To:References; b=Cl4KXumn5uj3IZSW0Nc2WvWHPhT4Hc9R7KfgXwapeBeAFN6/6ao/RA+7fashrnpsK 01ei9A56IMiIm/yV4Fk27ss4nHfe59RIMQxDZ4Q4dEZjRaaMtLh+SZL+D/xZZA3bsw rr0y5MVbZbwPAhTJ520fivZ4z5yRWQW3RTcxGTlPFgD3/Fr03qG2Nwm7tke0vQG4lw T2CE85x3MybCcs5g7+4E0foVhqAxgKn8DZEw2lqIbbMxt5k1qx60BaXaCuhdilpr7L 2GzxI8tRqHNVbsvNrIOM1J7N6JepCFUtKp9N0zHbFaQRefo0FBgIAAVXg1CtTnXwgX w5YJ9uVQRjTKQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-CrUANkDeXVlm14LVzwGS Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable SeerLite via Guix-patches via schreef op wo 02-03-2022 om 10:17 [- 0300]: > -" 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] > -=C2=A0=C2=A0=C2=A0 let vimplugins =3D directory . "/share/vim/vimfiles" > -=C2=A0=C2=A0=C2=A0 if isdirectory(vimplugins) > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 let &rtp =3D join([&rtp,vimpl= ugins], ',') > -=C2=A0=C2=A0=C2=A0 endif > -endfor > +if !empty($GUIX_VIMRUNTIME) > +=C2=A0=C2=A0=C2=A0 set rtp+=3D$GUIX_VIMRUNTIME > +endif Nice! That would make the "--pure" option in "guix shell --pure vim perhaps-some-vim-plugins ... -- vim" actually work! (untested, I'm just _looking_ at the patches, not actually testing them) Greetings, Maxime. --=-CrUANkDeXVlm14LVzwGS Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYh+4dxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7pkqAP98Da0Lw+znYLFCBpMM6LG2Wo+S a8yHpaLPxvu5E3tsbgEAmBm8obMebXzXjeUCNljxUCrvRji5JNYZ8K4iAWJMTgw= =GaZ2 -----END PGP SIGNATURE----- --=-CrUANkDeXVlm14LVzwGS-- From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 02 13:35:36 2022 Received: (at 54221) by debbugs.gnu.org; 2 Mar 2022 18:35:36 +0000 Received: from localhost ([127.0.0.1]:40760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPTp2-0002OY-IU for submit@debbugs.gnu.org; Wed, 02 Mar 2022 13:35:36 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:60868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPTp1-0002OQ-1l for 54221@debbugs.gnu.org; Wed, 02 Mar 2022 13:35:35 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by xavier.telenet-ops.be with bizsmtp id 1WbZ2700W4UW6Th01Wba7G; Wed, 02 Mar 2022 19:35:34 +0100 Message-ID: <588f885b9a2ea8c7533dac470462e7ea0783de73.camel@telenet.be> Subject: Re: [bug#54221] [PATCH 3/4] gnu: vim: Update package style. From: Maxime Devos To: SeerLite , 54221@debbugs.gnu.org Date: Wed, 02 Mar 2022 19:35:33 +0100 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-eiZ8YJaDxIXeAC7sR9pM" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1646246134; bh=8INeT3MVJR5jYLVDikEtVHEgbFGoqcMDesCcxWU6PSU=; h=Subject:From:To:Date:In-Reply-To:References; b=FUE/pG6Ejql5+TllMXX4ppZxqAc/kxqiQWLsHyLbjxV6rBNU4Le6VHSV+26eLgc4m DJldxH81lmtDK66Z0EZcLx70ZU6hsu8GvFpizmY6h6YzVBb7iccVEX96nn2FhemZ2Q bK+nxPhS0oKlCJBCEwXoTsuaq6bpgTmzguzBGxTiECU3Pd/LJQqhqeTiWQG1Yt9pZZ KLmCUjvz8mp8ehjzKe5sUCAIqG1+nejO44xy/ctAttSedSs5U4r//csE1pLn0LUoCf 3iWlQiAlwk1V59a84tQsR5wqNhW9cGPZy7FsOaCW9nNbNjR5SXYOVdp2JjaSz8LN/v L1bBBduf3nz9A== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-eiZ8YJaDxIXeAC7sR9pM Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 U2VlckxpdGUgdmlhIEd1aXgtcGF0Y2hlcyB2aWEgc2NocmVlZiBvcCB3byAwMi0wMy0yMDIyIG9t IDEwOjE3IFstCjAzMDBdOgo+ICvCoMKgwqDCoMKgwqDCoMKgwqAgKGFkZC1iZWZvcmUgJ2luc3Rh bGwgJ2ZpeC1pbnN0YWxsbWFuLnNoCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSog KCM6a2V5IGlucHV0cyAjOmFsbG93LW90aGVyLWtleXMpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIChzdWJzdGl0dXRlKiAic3JjL2luc3RhbGxtYW4uc2giCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAoKCIvYmluL3NoIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKHNlYXJjaC1pbnB1dC1maWxlIGlucHV0cyAiYmluL3NoIikpKSkpCgpJcyAiaW5z dGFsbG1hbi5zaCIgdXNlZCBkdXJpbmcgdGhlIGJ1aWxkLCBvciB3aGVuIHZpbSBpcyBydW4/Cklu IHRoZSBmb3JtZXIgY2FzZSwgdGhpcyBzaG91bGQgbG9vayBpbnRvIChvciBuYXRpdmUtaW5wdXRz CmlucHV0cynCoGluc3RlYWQgZm9yIGNyb3NzLWNvbXBpbGF0aW9uIHJlYXNvbnMsIGFuZCBjb3Vs ZCBiZSBzaW1wbGlmaWVkCnRvOgoKKCgiL2Jpbi9zaCIpICh3aGljaCAic2giKSkKCkdyZWV0aW5n cywKTWF4aW1lLgo= --=-eiZ8YJaDxIXeAC7sR9pM Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYh+49RccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7rr5AP9l4nQxTD7sGCel0HbUXkwOWeCr RwrW9mrktDNagW0huwD/V3scM0VU7HDIXw3SsWg5wjbgkGTEqiA6mvHi+zqoUA4= =lPL1 -----END PGP SIGNATURE----- --=-eiZ8YJaDxIXeAC7sR9pM-- From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 02 13:40:30 2022 Received: (at 54221) by debbugs.gnu.org; 2 Mar 2022 18:40:30 +0000 Received: from localhost ([127.0.0.1]:40765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPTtm-0002VR-4Z for submit@debbugs.gnu.org; Wed, 02 Mar 2022 13:40:30 -0500 Received: from andre.telenet-ops.be ([195.130.132.53]:43082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPTtk-0002VI-LM for 54221@debbugs.gnu.org; Wed, 02 Mar 2022 13:40:29 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by andre.telenet-ops.be with bizsmtp id 1WgT270074UW6Th01WgTum; Wed, 02 Mar 2022 19:40:27 +0100 Message-ID: Subject: Re: [bug#54221] [PATCH 4/4] gnu: neovim: Update package style. From: Maxime Devos To: SeerLite , 54221@debbugs.gnu.org Date: Wed, 02 Mar 2022 19:40:26 +0100 In-Reply-To: <0ee8ec7a501cf53dc1b70b0ba21f72c0f3dc2d58.1646227054.git.seerlite@nixnet.email> References: <0ee8ec7a501cf53dc1b70b0ba21f72c0f3dc2d58.1646227054.git.seerlite@nixnet.email> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-iCGrXH4Cf4rJrxrQodDV" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1646246427; bh=OSBYXKGw0V8QUNKUjt5KLjDEMd6mzVaCy7AJefcIu1A=; h=Subject:From:To:Date:In-Reply-To:References; b=IZaKdqn068GQUMRKEyk+Lxs9SfR76PoNooHVzlqsGGl6gdC6iS/mayeuhk8MeZrWN NhLH7GkIPGS9z7u+BTLeYuUCu6MZNd4t42WVLansCqnETCenH9x5Q25tSskb2Nm52J Z2E0YpG1yUy7CJhwmsQcAKAvrUZ1g5/QS+zhYUzEWkEpIobKy07RBvXNhoLhN1mgUX uO4bbe+vxqDrwWTMSrvQZHkDGx8weVwYG+Ml6IwoCyjOgNs3WtipMe4/8pXqApzRcR ofXej649XejFsLo2jyCGJl9ZMk4CyRyc7+CRRPIPZciDyvBW2nahqfXbUKS3jA668u 353w5RAmLJPNQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-iCGrXH4Cf4rJrxrQodDV Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable SeerLite via Guix-patches via schreef op wo 02-03-2022 om 10:17 [- 0300]: > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (vimrc #$(local-file (sear= ch-auxiliary-file "guix.vim")))) This stops package transformations from being able to change the guix.vim used. WDYT of using a variant of 'search-input-file', that strips the /gnu/store/HASH- part of the store item names and tests if the remainder equals the string "guix.vim"? Such a procedure does not currently exist to my knowledge, but it could be written and would be useful outside the neovim definition. Greetings, Maxime. --=-iCGrXH4Cf4rJrxrQodDV Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYh+6GhccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7qJmAP95u4leQG1sJfKvlsIqiFgMoHih 5rU+xvbf8a1B6ur87QD+M1IcJH61Rp/cn4cAtFTz6QFIw01ViZyzQierHVL2tgc= =rUUI -----END PGP SIGNATURE----- --=-iCGrXH4Cf4rJrxrQodDV-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 03 11:52:20 2022 Received: (at 54221) by debbugs.gnu.org; 3 Mar 2022 16:52:20 +0000 Received: from localhost ([127.0.0.1]:43555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPogS-0001bq-8N for submit@debbugs.gnu.org; Thu, 03 Mar 2022 11:52:20 -0500 Received: from mx.nixnet.email ([94.16.121.167]:40372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPogQ-0001bg-4B for 54221@debbugs.gnu.org; Thu, 03 Mar 2022 11:52:06 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id E6257200232; Thu, 3 Mar 2022 11:52:01 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1646326322; h=from:from:reply-to:subject:subject:to:to:cc; bh=cAvDFXCAKhr6minD9t/JDWUp0u6tRBJ6zxzq2yF/fyA=; b=fNHkzmOkw9jIf38PWmdzEzBvMpECAA/ZCdg7W6clRkWTh+pR5wnIMAJZB2qxshMcXx6OL0 rE0jfD2f9XIh19jyKNDwxbGTjht10tyVtmUl8YszD90nWfiwt4Kczvv8DhT+2B9dRT+uiI C++d9tbv2devxq+awk2pMZSUTNGis8g= Message-ID: Date: Thu, 3 Mar 2022 13:49:44 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [bug#54221] [PATCH 3/4] gnu: vim: Update package style. Content-Language: en-US To: Maxime Devos , 54221@debbugs.gnu.org References: <6002b969ed2f353fef0e8fa87d4fc7d01d3344fa.camel@telenet.be> From: SeerLite In-Reply-To: <6002b969ed2f353fef0e8fa87d4fc7d01d3344fa.camel@telenet.be> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, thanks for the review! On 3/2/22 14:29, Maxime Devos wrote: > This is test stuff, and these binaries do not seem to be present in > 'inputs', they would be in the implicit 'native-inputs', so these would > need to search in '(or native-inputs inputs)' instead of 'inputs' to > avoid &search-path exceptions when cross-compiling: > > (substitute* '("src/testdir/...") > (("/bin/sh") (search-input-file (or native-inputs inputs) "bin/sh"))) > > Or simpler, there's a procedure for looking for 'bin/TOOL' in native- > inputs: 'which'! > > ;; the original code! > (substitute* '("src/testdir/...") > (("/bin/sh") (which "sh"))) Whoops, I forgot I made this change. > Why the change from 'which' to 'search-input-file'? The blog post that introduces label-less inputs also introduces 'search-input-file', which made me think they were both part of the "package definition modernization process". I asked on IRC if that was the case, and although I didn't get a clear answer for that, someone told me they preferred using 'search-input-file' because it raises an exception when no file is found. What do you think about that? Should I stick with 'search-input-file' or is 'which' alright? It makes sense that I'd have to use native-inputs though. My bad! From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 03 12:36:14 2022 Received: (at 54221) by debbugs.gnu.org; 3 Mar 2022 17:36:14 +0000 Received: from localhost ([127.0.0.1]:43605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPpN8-0004wV-4x for submit@debbugs.gnu.org; Thu, 03 Mar 2022 12:36:14 -0500 Received: from mx.nixnet.email ([94.16.121.167]:41486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPpN6-0004wM-PG for 54221@debbugs.gnu.org; Thu, 03 Mar 2022 12:36:13 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 535FF200232; Thu, 3 Mar 2022 12:36:10 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1646328971; h=from:from:reply-to:subject:subject:to:to:cc; bh=DTI8/qzAbO1m1ILE4rpH/bDyUrrt/46sS/97X7e/1D8=; b=UmJezPg7TKVqKgaz6ybV4Gaih82+TOrwNNBaFtgOyUMrEWCrK+QnzsdUNMgthWQZ/aldvW /UmxU92WIb5JUFzy/l8KDMTLnL9yud0sRo0k6RwAad4Z6TLvZuH+SoC3KZWq3jHziCrfMs SyU6yhaASFTCtKwgnQl3qzxGD/bi74s= Message-ID: Date: Thu, 3 Mar 2022 14:36:07 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [bug#54221] [PATCH 4/4] gnu: neovim: Update package style. Content-Language: en-US To: Maxime Devos , 54221@debbugs.gnu.org References: <0ee8ec7a501cf53dc1b70b0ba21f72c0f3dc2d58.1646227054.git.seerlite@nixnet.email> From: SeerLite In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 3/2/22 14:40, Maxime Devos wrote: > SeerLite via Guix-patches via schreef op wo 02-03-2022 om 10:17 [- > 0300]: >> +                     (vimrc #$(local-file (search-auxiliary-file "guix.vim")))) > > This stops package transformations from being able to change the > guix.vim used. WDYT of using a variant of 'search-input-file', that > strips the /gnu/store/HASH- part of the store item names and tests > if the remainder equals the string "guix.vim"? Such a procedure does > not currently exist to my knowledge, but it could be written and would > be useful outside the neovim definition. Ah, is this also why package inputs are specified explicitly instead of using gexps? Is there any benefit to being able to change such a file via a transformation? Editing the vimrc feels like editing the default configuration of the package, rather than swapping a dependency. And that looks odd to me, maybe because I'm more used to package dependencies as inputs. The procedure sounds like a good idea, but wouldn't it be easier to just make `local-file` not prepend the hash to the filename by storing it inside a parent directory with said hash instead? Is something like that possible? From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 03 12:40:57 2022 Received: (at 54221) by debbugs.gnu.org; 3 Mar 2022 17:40:57 +0000 Received: from localhost ([127.0.0.1]:43610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPpRh-00053H-NS for submit@debbugs.gnu.org; Thu, 03 Mar 2022 12:40:57 -0500 Received: from mx.nixnet.email ([94.16.121.167]:41612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPpRg-000539-68 for 54221@debbugs.gnu.org; Thu, 03 Mar 2022 12:40:56 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id A0381200232; Thu, 3 Mar 2022 12:40:54 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1646329255; h=from:from:reply-to:subject:subject:to:to:cc; bh=GvvXsstrj1I2a9OwpD+s9ytoyb2YEN1BbtvyD/MescQ=; b=h8So5+S0RTVAi3MIgxP1e9IDoo548ig+Nb2UcUxC+8ZnD8jskaG/lOsWLg/iwapnYLMr6x h6e4sCU9kKsVi/BLHW+oU1fr80hNCqjtzu6ahwZSz8+qoMQisfs/agd2ZuOb5N94V7u/TP c6DEf45CklLJRg2fQ8xJBsKbajWMqoc= Message-ID: <049b8019-cd8a-59c6-f33f-426c5ac2fa3d@nixnet.email> Date: Thu, 3 Mar 2022 14:40:51 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [bug#54221] [PATCH 3/4] gnu: vim: Update package style. Content-Language: en-US To: Maxime Devos , 54221@debbugs.gnu.org References: <588f885b9a2ea8c7533dac470462e7ea0783de73.camel@telenet.be> From: SeerLite In-Reply-To: <588f885b9a2ea8c7533dac470462e7ea0783de73.camel@telenet.be> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Thank you again for the corrections. Should I send the entire patch series again or only the patches I want to correct? I'm new to the whole debbugs/email patch workflow. From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 03 12:46:45 2022 Received: (at 54221) by debbugs.gnu.org; 3 Mar 2022 17:46:45 +0000 Received: from localhost ([127.0.0.1]:43615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPpXJ-0005Ct-Ab for submit@debbugs.gnu.org; Thu, 03 Mar 2022 12:46:45 -0500 Received: from laurent.telenet-ops.be ([195.130.137.89]:34068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPpXG-0005Cj-Rw for 54221@debbugs.gnu.org; Thu, 03 Mar 2022 12:46:43 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by laurent.telenet-ops.be with bizsmtp id 1tmg2700h4UW6Th01tmhHt; Thu, 03 Mar 2022 18:46:41 +0100 Message-ID: Subject: Re: [bug#54221] [PATCH 3/4] gnu: vim: Update package style. From: Maxime Devos To: SeerLite , 54221@debbugs.gnu.org Date: Thu, 03 Mar 2022 18:46:33 +0100 In-Reply-To: References: <6002b969ed2f353fef0e8fa87d4fc7d01d3344fa.camel@telenet.be> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-fQZU9w8BPMG0FZP7KzLu" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1646329601; bh=ZQGeztsofHn4FgBdeOoeor+mfqtwlVxpDdqjiT4Ahmc=; h=Subject:From:To:Date:In-Reply-To:References; b=eo2USFOvc6qyQyEurD1B4TbPPsmtR+j12txoSfRu+W9qne0WrUe4iqluqpbCdKtZy rO2EKOt6N8gjGsV1SR6VmuR5yoSzIn3wRwne2bEglwxpD8XUs26b5Q9oz5z2ia+K7l emMQXFHeZIh4U8qt8h9mYnHn6KCdZSXs3D8Ibjqg5XiBmiti8poeqssk1HCfUHpN3I V8KgL7hqoskyCVRna04WHE2+1B0e2y/rQ6YOD2u3q9FJbVr9kzqhhAaMYK1Fkykxj5 rBCV5Pi/ccPvhL3ei95fgi54FDRsz13OPebW2ofAqMZvsBLYqVhU0fn7PmY7q/2+K/ Dq5xIq7Sn03Vw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-fQZU9w8BPMG0FZP7KzLu Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable SeerLite schreef op do 03-03-2022 om 13:49 [-0300]: > The blog post that introduces label-less inputs also introduces=20 > 'search-input-file', which made me think they were both part of the=20 > "package definition modernization process". The problem with 'which' was that it looks in 'native-inputs' (+ inputs when compiling natively), even when we need 'inputs'. To fix this, adding an 'inputs/native-inputs' argument was proposed (https://issues.guix.gnu.org/47869). That interface was considered a bit weird, so then (string-append (assoc-ref ...) "bin/...") was proposed. That's rather verbose though, so 'search-input-file' was introduced. In short, 'search-input-file' was introduced to help with locating binaries from 'inputs' (at least from my POV, shortly after ludo began using 'search-input-file' for delabelification). For looking in native-inputs (compilation tools etc.), I would prefer 'which' above the 'search-input-file' because it's a lot more concise, though I suppose there is an argument to be made for using 'search- input-file' for consistency. There's the downside of not raising an exception in case the file is not found though. However, there appears to be very few code that actually relies on the 'return #f' behaviour (search for '(or (which' and '(if (which'), so I think the behaviour can be changed without much trouble (on 'core-updates'). Greetings, Maxime. --=-fQZU9w8BPMG0FZP7KzLu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYiD++RccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7rurAP4mpUFtsiTZUpCfqF0YJTcX50Jd i5qX/4fMw8NF6gQ4DgEAjOs9O1WJ+cUc85zD7Ymy9GSmObdkpZjKvr+roOOZ4QI= =7vmX -----END PGP SIGNATURE----- --=-fQZU9w8BPMG0FZP7KzLu-- From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 16 10:17:01 2022 Received: (at 54221) by debbugs.gnu.org; 16 Mar 2022 14:17:01 +0000 Received: from localhost ([127.0.0.1]:51941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUUST-0006bQ-Fi for submit@debbugs.gnu.org; Wed, 16 Mar 2022 10:17:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUUSR-0006b3-KI for 54221@debbugs.gnu.org; Wed, 16 Mar 2022 10:16:59 -0400 Received: from [2001:470:142:3::e] (port=60848 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUUSJ-0005Aq-QM; Wed, 16 Mar 2022 10:16:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=mFg+wn0oDovxMKkkNLp1ckTVdn6ZGBIiRwE4M+Ve+BM=; b=Yi8Bo135n7Q8CqquC2yV jSv4dscFmnuXH0/C2tzGfbgo9WhDP5V+w73maWOidb9BWGPVFAiXkpeqZfMHBQ+rZYlZadB7MGhhe 28aT1Kr3DPLbb3tX7aB4QGtmX7V24fsyuGxKHKU3rH+EvjaZitojaDphSc0K9QM2TN8zaQMUhbcJU QGsX6kXRWs2ifTwAAx5Gf5e4TxOnjSyqBd6fcf+kgyMP43HXTtLRNx45F+xGcoUBC8McCkoLzutTI 8N7cMgI3BFsQvfkPtnJeEHeUtpvNmSObq5gV05qNqTnNz7LWo0B3X1oVP5w4ICxNUZqBRMRVGPDyp AkV+YDyqud28bw==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:59530 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nUUSJ-0002sC-0E; Wed, 16 Mar 2022 10:16:51 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: SeerLite Subject: Re: bug#54221: [PATCH 0/4] vim: Detect plugins via search paths. References: <588f885b9a2ea8c7533dac470462e7ea0783de73.camel@telenet.be> <049b8019-cd8a-59c6-f33f-426c5ac2fa3d@nixnet.email> Date: Wed, 16 Mar 2022 15:16:48 +0100 In-Reply-To: <049b8019-cd8a-59c6-f33f-426c5ac2fa3d@nixnet.email> (seerlite@nixnet.email's message of "Thu, 3 Mar 2022 14:40:51 -0300") Message-ID: <87ilsedltb.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54221 Cc: Maxime Devos , 54221@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Seerlite, SeerLite skribis: > Thank you again for the corrections. Should I send the entire patch > series again or only the patches I want to correct? I'm new to the > whole debbugs/email patch workflow. To avoid confusion, it=E2=80=99s more convenient if you resend the entire p= atch series; make sure to use =E2=80=98git format-patch --subject-prefix=3D"PATC= H v2"=E2=80=99. Thank you! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu May 12 22:17:50 2022 Received: (at 54221) by debbugs.gnu.org; 13 May 2022 02:17:50 +0000 Received: from localhost ([127.0.0.1]:42635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npKsI-00036W-Fm for submit@debbugs.gnu.org; Thu, 12 May 2022 22:17:50 -0400 Received: from mx.nixnet.email ([94.16.121.167]:55252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npKsE-00036L-QD for 54221@debbugs.gnu.org; Thu, 12 May 2022 22:17:48 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 13E3E20054B; Thu, 12 May 2022 22:17:43 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1652408265; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=LXG6RQ6+7qp2sKzcaoBWx25sESpiYLsDuzYRIDeVvRM=; b=WLdZiaXv7upE1gpkVcYNNpw7sRxDMgWzs3M8v83UZ124uKYofTiwjvxu7ChrzDSbdR//YX l8yeFYSn9Gbm9iz3XzQPggCPfsl1coFyQq+UQYjfbPWepWtkVPsba+u+Y21/1XneDr+uSE EeRwmeOuy2NTxFQtmTuLlBvk+g1Jq0E= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH v2 1/2] gnu: vim: Use native-search-paths to search for plugins. Date: Thu, 12 May 2022 22:17:26 -0400 Message-Id: <84af4a68a12d4838fa88e99e6c654930e33694fa.1652408245.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 bb459933b0..0c8e689b5a 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 -- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 12 22:17:54 2022 Received: (at 54221) by debbugs.gnu.org; 13 May 2022 02:17:54 +0000 Received: from localhost ([127.0.0.1]:42637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npKsL-00036n-RB for submit@debbugs.gnu.org; Thu, 12 May 2022 22:17:54 -0400 Received: from mx.nixnet.email ([94.16.121.167]:55256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npKsI-00036V-8V for 54221@debbugs.gnu.org; Thu, 12 May 2022 22:17:50 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 9DA102005FD; Thu, 12 May 2022 22:17:46 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1652408267; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=8+U49ZqsnG/a3Gl+GsEs/4YRY0Ip2jE01t1XHH95Mhw=; b=nACAaL8DPqI1UWe4IbrbpsQIbr+1BxRt0vmNwmJ+K33QTrEy7+8Ob67tH6Q5uZVvcQo1c7 DUWynENeFdsYBRsSA7TVwPQMtoQvPFG732MrjN3wWpbaBVehhse3vxkdFBbsrf+5BGLZmP X+FxV1AmIzqczCf8uouWJ13feimYNbI= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH v2 2/2] gnu: neovim: Search and use installed plugins, like vim. Date: Thu, 12 May 2022 22:17:27 -0400 Message-Id: <2d93d3dd08699c95c26aa59783a17d8c5cf8635c.1652408245.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.36.0 In-Reply-To: <84af4a68a12d4838fa88e99e6c654930e33694fa.1652408245.git.seerlite@nixnet.email> References: <84af4a68a12d4838fa88e99e6c654930e33694fa.1652408245.git.seerlite@nixnet.email> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/vim.scm (neovim)[phases]{install-guix.vim}: New phase. [native-search-paths]: Add search path specification for 'GUIX_VIMRUNTIME'. --- gnu/packages/vim.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 0c8e689b5a..530303a318 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -717,7 +717,18 @@ (define-public neovim ;; doubles its size. We remove the refirence here. (substitute* "cmake/GetCompileFlags.cmake" (("\\$\\{CMAKE_C_COMPILER\\}") "/gnu/store/.../bin/gcc")) - #t))))) + #t)) + (add-after 'install 'install-guix.vim + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((nvimdir (string-append (assoc-ref outputs "out") "/share/nvim"))) + (mkdir-p nvimdir) + (copy-file (assoc-ref inputs "guix.vim") + (string-append nvimdir "/sysinit.vim")))))))) + (native-search-paths + (list (search-path-specification + (variable "GUIX_VIMRUNTIME") + (separator ",") + (files (list "share/vim/vimfiles"))))) (inputs `(("libuv" ,libuv) ("msgpack" ,msgpack) @@ -739,7 +750,8 @@ (define-public neovim (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) - ("gperf" ,gperf))) + ("gperf" ,gperf) + ("guix.vim" ,(search-auxiliary-file "guix.vim")))) (home-page "https://neovim.io") (synopsis "Fork of vim focused on extensibility and agility") (description "Neovim is a project that seeks to aggressively -- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Thu May 12 22:34:24 2022 Received: (at 54221) by debbugs.gnu.org; 13 May 2022 02:34:24 +0000 Received: from localhost ([127.0.0.1]:42645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npL8K-0003ZI-9t for submit@debbugs.gnu.org; Thu, 12 May 2022 22:34:24 -0400 Received: from mx.nixnet.email ([94.16.121.167]:55652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npL8I-0003Z6-9f for 54221@debbugs.gnu.org; Thu, 12 May 2022 22:34:22 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 9F2DD20010C; Thu, 12 May 2022 22:34:19 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1652409260; h=from:from:reply-to:subject:subject:to:to:cc; bh=Tx2L5fYbAy9gSPiHpmyT5YsZVfbuHUcpPZ49T1foYTc=; b=DVaOHtueE6oMS9JvtToJGvIR11kqdJG3ndm/z+GErHcMxHYTDjblk6cJy49yhuQ9uvTBoG XPvmKeix5hkPNSbdrIvlICF/3jszafOcNNkBHPQ4yQNRE2mwCWMAY5SUZIVFynZQiaB1S5 ATtaPjYiC4ifnK376X21tq693yMeX/s= Message-ID: Date: Thu, 12 May 2022 22:34:16 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 From: seerlite@nixnet.email To: =?UTF-8?Q?Ludovic_Court=c3=a8s?= , Maxime Devos , 54221@debbugs.gnu.org Subject: Re: bug#54221: [PATCH 0/4] vim: Detect plugins via search paths. References: <588f885b9a2ea8c7533dac470462e7ea0783de73.camel@telenet.be> <049b8019-cd8a-59c6-f33f-426c5ac2fa3d@nixnet.email> <87ilsedltb.fsf_-_@gnu.org> In-Reply-To: <87ilsedltb.fsf_-_@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! Sorry for the delay, I've been very busy. I sent the rebased patches but only the bits that added search paths. There were some updates to both Vim and Neovim since I sent the first patch and I didn't want to deal with fixing the conflicts and re-understanding the style changes I had even forgotten I made. So I'm sending just the functional parts of the patch and hopefully someone else can update the package styles if necessary :) Oh and I'd like to remind you of this patch: which along with my patch would make it so Neovim can finally use both Vim and Neovim-exclusive plugins. I'd appreciate if it got merged too. SeerLite From debbugs-submit-bounces@debbugs.gnu.org Wed May 18 20:51:06 2022 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= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH v3 1/2] gnu: vim: Use native-search-paths to search for plugins. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 -- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 18 20:51:09 2022 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= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH v3 2/2] gnu: neovim: Search and use installed plugins, like vim. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 18 21:08:24 2022 Received: (at 54221) by debbugs.gnu.org; 19 May 2022 01:08:24 +0000 Received: from localhost ([127.0.0.1]:33979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUeO-0002Fg-CA for submit@debbugs.gnu.org; Wed, 18 May 2022 21:08:24 -0400 Received: from mx.nixnet.email ([94.16.121.167]:40250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUeM-0002FX-C0 for 54221@debbugs.gnu.org; Wed, 18 May 2022 21:08:23 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id A9A3F200882; Wed, 18 May 2022 21:08:19 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1652922500; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=KqK7bjunYRJpvtwYeJL85IKNh9AjR+gIhkHnXmsRBCo=; b=EGt3khi591oeS5+WupdYI6GO2orbTK14nBrxy9onV4FBZAYAtuUcF1TPo5xFILSGtp6zQh nbUDJnaIg/oolpUltPgpoJ5yh/zkwbWSwcxT+uM1Jsn4/OsCkVmKz7NfPRU1kAlXlZV3QM Pdo+a+2DKcAXpi8EHoYf28A2oumnZmI= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH v4 1/2] gnu: vim: Use native-search-paths to search for plugins. Date: Wed, 18 May 2022 21:08:15 -0400 Message-Id: X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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'. [phases]: Search for tzdata files in the correct input fields. --- gnu/packages/aux-files/guix.vim | 11 ++++------- gnu/packages/vim.scm | 8 +++++++- 2 files changed, 11 insertions(+), 8 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..011521babd 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. ;;; @@ -111,7 +112,7 @@ (define-public vim (lambda* (#:key inputs #:allow-other-keys) ;; One of the tests tests timezone-dependent functions. (setenv "TZDIR" - (search-input-directory inputs "share/zoneinfo")) + (search-input-directory (or native-inputs inputs) "share/zoneinfo")) ;; Make sure the TERM environment variable is set for the tests (setenv "TERM" "xterm"))) @@ -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 -- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 18 21:08:27 2022 Received: (at 54221) by debbugs.gnu.org; 19 May 2022 01:08:28 +0000 Received: from localhost ([127.0.0.1]:33982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUeR-0002Fx-M9 for submit@debbugs.gnu.org; Wed, 18 May 2022 21:08:27 -0400 Received: from mx.nixnet.email ([94.16.121.167]:40254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUeO-0002Fh-Op for 54221@debbugs.gnu.org; Wed, 18 May 2022 21:08:25 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 1F9412007B5; Wed, 18 May 2022 21:08:20 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1652922502; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=BPTsV1dglvHVga2mf8yh6Iov7l6DcnLhUGRHxf7148k=; b=j7gFzf4t1JZOPggiAZ4E1sjM25y42MuyWR9EBvzEn9qpvT5rA7ZBch1Tqp8K7HQlsKX0Bs eUgDtl8G7GCHMr/dJEnSOCvNR8pOvkdvQ4dXg7CP2CZfDbMxI9M9rUceLf5uHQ5IuOLdXE yQNTLpnBNFYI2Yy1ir/XIiPO9UCwMNM= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH v4 2/2] gnu: neovim: Search and use installed plugins, like vim. Date: Wed, 18 May 2022 21:08:16 -0400 Message-Id: <1548e2407322432808e83389d07cfc6b92379cae.1652922494.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.36.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 011521babd..7697a03ef6 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 -- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 18 21:11:44 2022 Received: (at 54221) by debbugs.gnu.org; 19 May 2022 01:11:44 +0000 Received: from localhost ([127.0.0.1]:33987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUhc-0002Kr-5a for submit@debbugs.gnu.org; Wed, 18 May 2022 21:11:44 -0400 Received: from mx.nixnet.email ([94.16.121.167]:40336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUha-0002Kj-Up for 54221@debbugs.gnu.org; Wed, 18 May 2022 21:11:43 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 23EA62007B5; Wed, 18 May 2022 21:11:40 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1652922702; h=from:from:reply-to:subject:subject:to:to:cc; bh=PV4WZ7ORISTCouXZ3XnCSOxmFArYEhVrnPseSS6X+88=; b=AbIBpr2KQjfj2ra6oW8vdIpiSJ2aIhm9NoQ44I5UOzFQdbIOJHAaqjQWf0NBVV552h7Z0E mqllkH0irFT9SAOzLO9caJjWfZd7IJX6Nlfdv0Rr0qiWwzgHHEW0NiojZZKf5YpIDe7Ny9 IhR6gmcWGA2hO4uckXgMMfK0czP7u3U= Message-ID: Date: Wed, 18 May 2022 21:11:37 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: [PATCH v4 2/2] gnu: neovim: Search and use installed plugins, like vim. Content-Language: en-US From: SeerLite To: =?UTF-8?Q?Ludovic_Court=c3=a8s?= , Maxime Devos , 54221@debbugs.gnu.org References: <588f885b9a2ea8c7533dac470462e7ea0783de73.camel@telenet.be> <049b8019-cd8a-59c6-f33f-426c5ac2fa3d@nixnet.email> <87ilsedltb.fsf_-_@gnu.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Rebased on top of 182b25fb () and fixed the wrong lookup for tzdata files in inputs instead of native-inputs again, as Maxime had pointed out (something I thought was caused by my previous style/gexp patch when it was not). I wasn't able to figure out how to test it though. SeerLite From debbugs-submit-bounces@debbugs.gnu.org Wed May 18 21:14:12 2022 Received: (at 54221) by debbugs.gnu.org; 19 May 2022 01:14:12 +0000 Received: from localhost ([127.0.0.1]:33991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUk0-0002Of-I3 for submit@debbugs.gnu.org; Wed, 18 May 2022 21:14:12 -0400 Received: from mx.nixnet.email ([94.16.121.167]:40432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUjy-0002OX-Pv for 54221@debbugs.gnu.org; Wed, 18 May 2022 21:14:11 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id EE8BF2007B5; Wed, 18 May 2022 21:14:08 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1652922849; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=KqK7bjunYRJpvtwYeJL85IKNh9AjR+gIhkHnXmsRBCo=; b=DSDx6s0o61rxNaotUqeDOBXt9jK7eJgRbQmGsaQny0N9kDHHM6yTJejQ8fHc0FRGhG61O6 gRQN274L6zzolGhrWgVOAjl0kKX5USAm45yIOuP2iVIwwVxX9be3rivrYXVyaT64nq02BC 21UsYdWvn9jO8wy0lEheOIBjDtxsndw= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH v5 1/2] gnu: vim: Use native-search-paths to search for plugins. Date: Wed, 18 May 2022 21:14:04 -0400 Message-Id: X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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'. [phases]: Search for tzdata files in the correct input fields. --- gnu/packages/aux-files/guix.vim | 11 ++++------- gnu/packages/vim.scm | 8 +++++++- 2 files changed, 11 insertions(+), 8 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..011521babd 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. ;;; @@ -111,7 +112,7 @@ (define-public vim (lambda* (#:key inputs #:allow-other-keys) ;; One of the tests tests timezone-dependent functions. (setenv "TZDIR" - (search-input-directory inputs "share/zoneinfo")) + (search-input-directory (or native-inputs inputs) "share/zoneinfo")) ;; Make sure the TERM environment variable is set for the tests (setenv "TERM" "xterm"))) @@ -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 -- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 18 21:14:20 2022 Received: (at 54221) by debbugs.gnu.org; 19 May 2022 01:14:20 +0000 Received: from localhost ([127.0.0.1]:33994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUk7-0002Oz-Tj for submit@debbugs.gnu.org; Wed, 18 May 2022 21:14:20 -0400 Received: from mx.nixnet.email ([94.16.121.167]:40436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUk0-0002Og-W6 for 54221@debbugs.gnu.org; Wed, 18 May 2022 21:14:18 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 7B0BA200882; Wed, 18 May 2022 21:14:10 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1652922851; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=8N82Y01C55fyFWEkRpIdrQckCUR+4hsu2r8JRX+0kFw=; b=ZhRUbf+JrMuexHMeu7VEKAEQy54UePDZdUpKXC7UYI9ZGoxFrR0a/DAZ8gXPqoIRjUOUMQ /b65ljvZ24KaUOyJ0YD2XNtgKvgi6zPCd8QU15wf/ml9Gwca7e7bM/gyNUldVRTov1Dyej PPG/E9m17IvtReJq47fKm+dP7gdDnaA= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH v5 2/2] gnu: neovim: Search and use installed plugins, like vim. Date: Wed, 18 May 2022 21:14:05 -0400 Message-Id: <82f09ad897560b759cd3b86ef7a2d3449fd0100f.1652922844.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.36.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 011521babd..14e6f86544 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 -- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 18 21:15:25 2022 Received: (at 54221) by debbugs.gnu.org; 19 May 2022 01:15:25 +0000 Received: from localhost ([127.0.0.1]:34000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUlB-0002RC-8l for submit@debbugs.gnu.org; Wed, 18 May 2022 21:15:25 -0400 Received: from mx.nixnet.email ([94.16.121.167]:40480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrUl9-0002R4-Nn for 54221@debbugs.gnu.org; Wed, 18 May 2022 21:15:24 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 460C5200882 for <54221@debbugs.gnu.org>; Wed, 18 May 2022 21:15:22 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1652922923; h=from:from:reply-to:subject:subject:to:to:cc; bh=tX6dSZGhshkFrvbyjl+jzS03prPHDP9QD79owsnPIVM=; b=QAwr2fLKgejZbIl49wxQIcG5ZknYlvGpgGW0xLpC9oiP+EBmcy2JOM84xkwllPtde+Z17I 4Vp76jGdUiqojNp+VGVC3KT5NIis2cZVB4RXG2qh2I0LLb6P+tZfrIc18dla8draaIliLy ZKUuJCNpBLRGEwn6gXm7PJYJjUWxgyY= Message-ID: <9be1ffe3-0455-0995-f91d-7c6c8d68a39d@nixnet.email> Date: Wed, 18 May 2022 21:15:20 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH v5 2/2] gnu: neovim: Search and use installed plugins, like vim. Content-Language: en-US To: 54221@debbugs.gnu.org References: <82f09ad897560b759cd3b86ef7a2d3449fd0100f.1652922844.git.seerlite@nixnet.email> From: SeerLite In-Reply-To: <82f09ad897560b759cd3b86ef7a2d3449fd0100f.1652922844.git.seerlite@nixnet.email> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fixed missing ')'. Whoops. SeerLite From debbugs-submit-bounces@debbugs.gnu.org Mon May 23 20:42:06 2022 Received: (at 54221) by debbugs.gnu.org; 24 May 2022 00:42:07 +0000 Received: from localhost ([127.0.0.1]:50460 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ntIcg-0000Z9-E0 for submit@debbugs.gnu.org; Mon, 23 May 2022 20:42:06 -0400 Received: from mx.nixnet.email ([94.16.121.167]:40516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ntIcc-0000Yg-6O for 54221@debbugs.gnu.org; Mon, 23 May 2022 20:42:04 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 5854B200306; Mon, 23 May 2022 20:41:59 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1653352920; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=AG3MYRko1fdcK+NeZZaCzK4tQJ2NHAon/EYHXhaf12A=; b=NU7QoR0sP9Argu9jlgBFU6x3Mv7t8TcLdIomqdz/a+Ojyf0n1KVg2VNxBLcj96h3Wuu6Mz u8DS00VnwYtdxNBrqS1eTsgUT9QdwJ1wcBv9vrXd9C+zAFU0kdk4WRsMxOKewQ1/iMsULP n272N255K0xdFjVXbyJqh/Ntxi0mgrc= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH v6 1/2] gnu: vim: Use native-search-paths to search for plugins. Date: Mon, 23 May 2022 20:41:54 -0400 Message-Id: <81321483b3ea03870a94a5fce3931ba176269f73.1653352914.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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'. [phases]: Search for tzdata files in the correct input fields. --- gnu/packages/aux-files/guix.vim | 11 ++++------- gnu/packages/vim.scm | 10 ++++++++-- 2 files changed, 12 insertions(+), 9 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..791aecbb83 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. ;;; @@ -108,10 +109,10 @@ (define-public vim (substitute* "src/testdir/test_autocmd.vim" (("/bin/kill") (which "kill"))))) (add-before 'check 'set-environment-variables - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) ;; One of the tests tests timezone-dependent functions. (setenv "TZDIR" - (search-input-directory inputs "share/zoneinfo")) + (search-input-directory (or native-inputs inputs) "share/zoneinfo")) ;; Make sure the TERM environment variable is set for the tests (setenv "TERM" "xterm"))) @@ -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 -- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Mon May 23 20:42:12 2022 Received: (at 54221) by debbugs.gnu.org; 24 May 2022 00:42:12 +0000 Received: from localhost ([127.0.0.1]:50463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ntIck-0000ZQ-TU for submit@debbugs.gnu.org; Mon, 23 May 2022 20:42:12 -0400 Received: from mx.nixnet.email ([94.16.121.167]:40520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ntIcg-0000Z8-EN for 54221@debbugs.gnu.org; Mon, 23 May 2022 20:42:06 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id C9FEA20046A; Mon, 23 May 2022 20:42:00 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1653352921; h=from:from:reply-to:subject:subject:to:to:cc:cc; bh=l4UNo4KqF27O4u40bXpCZIE4sxRnL0roQAWLNV+tH7M=; b=cg3G28Bo0vJ4ptETiKMLn6B/BSgkL1lC8HVP0VPui/COz8u6H1IFxcohhEDTDIaWsSsEK2 AHXsZVzI0Cku7J7pTLGbYCCwOdUEQABF2EV8mDN32R9aAtFRVi1/X+b9ZR33i6+vG0LTDC I8jlskx+Fzpv4IOPhkuTSgpKwYj1aLE= From: SeerLite To: 54221@debbugs.gnu.org Subject: [PATCH v6 2/2] gnu: neovim: Search and use installed plugins, like vim. Date: Mon, 23 May 2022 20:41:55 -0400 Message-Id: <81b3246dc028d82086a94bef402cb539a5b7184a.1653352914.git.seerlite@nixnet.email> X-Mailer: git-send-email 2.36.0 In-Reply-To: <81321483b3ea03870a94a5fce3931ba176269f73.1653352914.git.seerlite@nixnet.email> References: <81321483b3ea03870a94a5fce3931ba176269f73.1653352914.git.seerlite@nixnet.email> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 791aecbb83..5e3cb4484d 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 vimdir "/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 -- 2.36.0 From debbugs-submit-bounces@debbugs.gnu.org Mon May 23 21:52:26 2022 Received: (at 54221) by debbugs.gnu.org; 24 May 2022 01:52:26 +0000 Received: from localhost ([127.0.0.1]:50526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ntJij-0002NF-VM for submit@debbugs.gnu.org; Mon, 23 May 2022 21:52:26 -0400 Received: from mx.nixnet.email ([94.16.121.167]:41930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ntJii-0002N7-Ci for 54221@debbugs.gnu.org; Mon, 23 May 2022 21:52:24 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by mx.nixnet.email (Postfix) with ESMTPSA id 2CEAB200306 for <54221@debbugs.gnu.org>; Mon, 23 May 2022 21:52:21 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nixnet.email; s=202002021149; t=1653357142; h=from:from:reply-to:subject:subject:to:to:cc; bh=MX1m2b3Air/WL+PGb9qbPCYdgKftM1m23lKNBlidpkA=; b=otnYk9SxzBpWBrQGlygopk81AFy6rPfCYO1dpeYDnzJ8wBGaOZtd8C/2TOzYTKgJBDW4z1 qXnEMD1LejtqUzADH3weaNZNfH0bXQ/o46xHOlV79PPRDLV6rOmVVTBMsQnf3gLHmQZr2b wiHgmGhqgx21X3/Y7Tr9aTeseX97Mbo= Message-ID: <1afb9a6e-a1b3-c09d-be35-d6376707a24d@nixnet.email> Date: Mon, 23 May 2022 21:52:18 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH v6 1/2] gnu: vim: Use native-search-paths to search for plugins. Content-Language: en-US To: 54221@debbugs.gnu.org References: <81321483b3ea03870a94a5fce3931ba176269f73.1653352914.git.seerlite@nixnet.email> From: SeerLite In-Reply-To: <81321483b3ea03870a94a5fce3931ba176269f73.1653352914.git.seerlite@nixnet.email> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The last patches were broken. I did not realize I had done a "make clean" inside my Guix repo and that made ./pre-inst-env guix use my profile channel instead of the repo. Sorry about that:) Now both build fine and work correctly. I also tested cross-compilation (guix build --target=x86_64-linux-gnu and also --target=aarch64-linux-gnu) but both fail. Note however that that was also the case before my patches, and I've got no idea how to get it working myself. SeerLite From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 22 15:07:59 2023 Received: (at 54221) by debbugs.gnu.org; 22 Feb 2023 20:07:59 +0000 Received: from localhost ([127.0.0.1]:60416 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pUvPC-0005Gj-RT for submit@debbugs.gnu.org; Wed, 22 Feb 2023 15:07:59 -0500 Received: from knopi.disroot.org ([178.21.23.139]:57102) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pUvPA-0005GY-NS for 54221@debbugs.gnu.org; Wed, 22 Feb 2023 15:07:58 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2429141497; Wed, 22 Feb 2023 21:07:55 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id voI2xGSJASuI; Wed, 22 Feb 2023 21:07:54 +0100 (CET) From: SeerLite DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1677096474; bh=1JC8WokH3UlzxGzU+sXcJBehkg7TRyqKkjnEIugaLhU=; h=From:To:Cc:Subject:Date; b=Oa7UJ1T3wxnc8akC0uG8EmaReGpPAaUwvpUlHZFZmoJvIVl2q55XSJYOLxF5bRLlU G82Yp/PguzkASsiIGXbFzAwF8ttce4+BP4RfEvjnU1koSNg52ioQBEhQZc/j/Oaqoh aLDUfkhnsZLfFSuZyTv0r42CK/QUY/mggIkNT94/w7B6joLVktIjdMRLRdZTnnnvRa +rTFRD0x+CWH89PmI3gSM0atNS1Z8Tg7Z4t3i9+Ua3iWaiaIvyFVfBPjjrxCLPsZht 00bSEql7TxlK+qbye5HaZGI2L0jN4L70fC/9MPW+A/ot6JjkAKU8gWZvozKGrjAtdi pc0gWMjGcqAAQ== To: 54221@debbugs.gnu.org Subject: [PATCH 1/2] gnu: vim: Use native-search-paths to search for plugins. Date: Wed, 22 Feb 2023 17:07:28 -0300 Message-Id: <06694925c423c7e08e49e8384c0009c9f1cd2aa9.1677096448.git.seerlite@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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'. [phases]: Search for tzdata files in the correct input fields. --- gnu/packages/aux-files/guix.vim | 11 ++++------- gnu/packages/vim.scm | 10 ++++++++-- 2 files changed, 12 insertions(+), 9 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 6baf10915a..d4e4f88756 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, 2023 Luis Henrique Gomes Higino +;;; Copyright © 2023 SeerLite ;;; ;;; This file is part of GNU Guix. ;;; @@ -112,10 +113,10 @@ (define-public vim (substitute* "src/if_cscope.c" (("/bin/sh") (search-input-file inputs "/bin/sh"))))) (add-before 'check 'set-environment-variables - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) ;; One of the tests tests timezone-dependent functions. (setenv "TZDIR" - (search-input-directory inputs "share/zoneinfo")) + (search-input-directory (or native-inputs inputs) "share/zoneinfo")) ;; Make sure the TERM environment variable is set for the tests (setenv "TERM" "xterm"))) @@ -154,6 +155,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 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 22 15:08:02 2023 Received: (at 54221) by debbugs.gnu.org; 22 Feb 2023 20:08:03 +0000 Received: from localhost ([127.0.0.1]:60421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pUvPG-0005HK-GM for submit@debbugs.gnu.org; Wed, 22 Feb 2023 15:08:02 -0500 Received: from knopi.disroot.org ([178.21.23.139]:57418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pUvPC-0005Gi-Pg for 54221@debbugs.gnu.org; Wed, 22 Feb 2023 15:07:59 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2C8694156D; Wed, 22 Feb 2023 21:07:58 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KKVUx6gPsqCY; Wed, 22 Feb 2023 21:07:57 +0100 (CET) From: SeerLite DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1677096477; bh=42sciHB8kPLxhuuHRVLw1vsrE2MwASno5h/t7oYKK+w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bKEYMuVErc8LM/PrZNgg+Anas85kuWrlkYIOiWHt5tIdUd4n5PBtc+xaDaOZRACu8 EgNp+DEubdoVxJ0we6wPI+3JvLAn2WYAZhB6pBylyYf16dlMLF9LtDe9YupGm0SxxQ XMBnmSLrxjnYXpaz/PnNOMp+GHsXMXuU8NCJxFMNQFoKUzZoKc5DROLEMTcwhfEYqu SbVDgme7OuG1W3bew68P3tpSe3oyJ3iCL8VVQZCKnbtbbnV4cMZR3plcgyThq7vqpt eI7eOc3vkNAvHa3OQj7dKLx5kpBuyJGdKLV0/g8w/yoXdmtl21quMZKMNVmCh/xjX0 B8ac9DjlQJx/Q== To: 54221@debbugs.gnu.org Subject: [PATCH 2/2] gnu: neovim: Search and use installed plugins, like vim. Date: Wed, 22 Feb 2023 17:07:29 -0300 Message-Id: <0313ee2476aeb999ca0f73609f2eff54865028bc.1677096448.git.seerlite@disroot.org> In-Reply-To: <06694925c423c7e08e49e8384c0009c9f1cd2aa9.1677096448.git.seerlite@disroot.org> References: <06694925c423c7e08e49e8384c0009c9f1cd2aa9.1677096448.git.seerlite@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 54221 Cc: SeerLite X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 d4e4f88756..c6bcd096a0 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -751,16 +751,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 vimdir "/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 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 05 08:28:16 2023 Received: (at 54221) by debbugs.gnu.org; 5 Aug 2023 12:28:16 +0000 Received: from localhost ([127.0.0.1]:56031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSGOG-0004bY-G1 for submit@debbugs.gnu.org; Sat, 05 Aug 2023 08:28:16 -0400 Received: from mail-lj1-x22d.google.com ([2a00:1450:4864:20::22d]:51318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSGOC-0004bE-39 for 54221@debbugs.gnu.org; Sat, 05 Aug 2023 08:28:14 -0400 Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2b9bf52cd08so45788591fa.2 for <54221@debbugs.gnu.org>; Sat, 05 Aug 2023 05:28:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691238485; x=1691843285; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=zzkuKDBdZusl+yq3xfFfGjfZDdZyibuapIuoSj+z9qg=; b=VP4L+3fU+a3HJ32w9rAtzuyI5zB1Mn7WC5uUlheZyZL77i5sOXc3ujRutDI/6Ys6AW XW4q7bUfL5tCoVZOf3XUIp7JIZP1QscJ3JBRPfIa+bZ8cq9Db3Xpc3MXKSaBVHaUJoXf jdi61ZREBACJTZ8eaXCMv5tDSDY0XwtgT4wLDyDvIvnOhBWyJKDLpyyWjUidWObduDqB rd/5el3vRYI0PLodNcd2Jhgkobn6/IV5x1zZiOe1XN4BLgsDeXhMnEE8lid4DgquFLBx NhtPa3VthkVGxiTKcwsBLRVYRNoUe4Uaq1eIrIl4LFO8tv3G3qnqkFDVCOOFHlGMv3Pu gV+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691238485; x=1691843285; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zzkuKDBdZusl+yq3xfFfGjfZDdZyibuapIuoSj+z9qg=; b=caxhZGHpcjVvW3Qkfv+zAgrq5t/syIcmD4tp/G9FvLRNucOMk3mzD6tKGKAZvAe60f PaQuUXrLj+9Bn5AbL4W2sBhkKSaOF1HcsOHDYaDsCSw77bMdAkjwiL+BYmgDR3KKVeWv q1Tk99EBGWaPxs3AatdkDokPNa+UGpN2xt/KcGebm2LsmTaNIcdJiup8ooJv64jGLkRu IAe94ezbClOGidma4p0/fQiANinQTRpjnf6dwsh5PztdsW2XxRIDSkMgc5IiVovuQFmV houdVo/vdCyaWTu4glhJLO777Qn2Es+UTd/ydppUel22ndLXA5lPdbOGMca8P74NUuw1 IMSw== X-Gm-Message-State: AOJu0Yxqg3gTJbh7Qlrh3YYJPrDaWgFDa5dyUGar2koSPh0GbzCBEeYy oOpdY/8MoqDRTje3SSxq+j0= X-Google-Smtp-Source: AGHT+IFX66eoESh2LtGO+8EFZBBqAcANbNJeN0DcnR15wd3CeCsANy+50pczOnn/VoFnjEQi2Qco9A== X-Received: by 2002:a2e:8290:0:b0:2b6:cf6f:159e with SMTP id y16-20020a2e8290000000b002b6cf6f159emr3037773ljg.44.1691238485370; Sat, 05 Aug 2023 05:28:05 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n22-20020a7bc5d6000000b003fe195cecb3sm9211083wmk.38.2023.08.05.05.28.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Aug 2023 05:28:04 -0700 (PDT) Message-ID: <9d53f0ee9b5e0100203b0e8796f9bdd2880990f3.camel@gmail.com> Subject: Re: [PATCH 1/2] gnu: vim: Use native-search-paths to search for plugins. From: Liliana Marie Prikler To: SeerLite , 54221@debbugs.gnu.org Date: Sat, 05 Aug 2023 14:28:03 +0200 In-Reply-To: <06694925c423c7e08e49e8384c0009c9f1cd2aa9.1677096448.git.seerlite@disroot.org> References: <06694925c423c7e08e49e8384c0009c9f1cd2aa9.1677096448.git.seerlite@disroot.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 22.02.2023 um 17:07 -0300 schrieb SeerLite: > 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. >=20 > * 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'. > [phases]: Search for tzdata files in the correct input fields. Should be [#:phases]. For clarity's sake, I think this phase should be renamed to , so that it doesn't look as though these variables affect the build output. Otherwise LGTM, but I'm not a vim person. From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 05 08:34:46 2023 Received: (at 54221) by debbugs.gnu.org; 5 Aug 2023 12:34:46 +0000 Received: from localhost ([127.0.0.1]:56044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSGUY-0004mX-3F for submit@debbugs.gnu.org; Sat, 05 Aug 2023 08:34:46 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:47461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSGUU-0004mI-Ii for 54221@debbugs.gnu.org; Sat, 05 Aug 2023 08:34:45 -0400 Received: by mail-wm1-x341.google.com with SMTP id 5b1f17b1804b1-3fbc63c2e84so29966765e9.3 for <54221@debbugs.gnu.org>; Sat, 05 Aug 2023 05:34:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691238877; x=1691843677; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=j7Cgzxc6TfzJvf1ISEVtdLPwF2MvpnVpBVe713df2jo=; b=nHQ8slSWFyaFhPDrWQwKafkoA/3VIG9o56dK3/EcwiRmqbmbDsxjSXtqWiFeCz9854 ZAk9Cf5v4OpdZjhEMQ1Ee276Bx5B8oZN86LMiN6u93VXfmzsVDCif55azzMPFH/+4RKy EnCjDtCdoPX5Sf35TM5cZMqIx7YWthLYf1VSwbdEhbnqcy+NIfZdC0e9kn3m3Gg3Y//h Rl6KQVlVmDm1bRO7zVj/l1aJ8jFOZPuHu/kT9oDZRTE0id9mYtk33daldgrvcPCpkmLC JfKU7glyxhCsF73D+gKvzN3i6EdPC+NnGkaXSMY6F753BeiZQaF7QjrlITaOibeSMY4y KwHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691238877; x=1691843677; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=j7Cgzxc6TfzJvf1ISEVtdLPwF2MvpnVpBVe713df2jo=; b=cVZzryC3vNuIukQoLnVThac52NTh/OAeeqkxjOUbrEbCXstlFHCfwm9a7L5r5Nd0+s 7hi10xJ9TOBehSlp5sZGV4S1trtIwTSjWVZdo+0ATX75V+93hfSnWiDRUJTVe5b1mNV+ S8oHGgk8UZ+WW8iS638iEm2cEDooW5qPGFwjQb6DiANEandfVTr23DKOgZTHe609SLiS BWuTIaGAeHm1WlTqoFfE3r05ER9clmUkCwczg3SMth3PrLrpwmvia+gdmQ2VQJ08jlf+ cXCw7NSu6HebBSaZLYIeahRRzSZkxDNE5+HF870Fe+yIWNQ1L8aBhwcBeswfW0bWIKeu FaSA== X-Gm-Message-State: AOJu0YxvKQhlu2gStC//tjEQzioQGnTtmwskhbvwGLOQLgPH6YDBiMA1 Q0t3woFp243lBAyOomthcGQ= X-Google-Smtp-Source: AGHT+IHXLAGU8+oQhXzKTbRO5btHbW1o9PWbYPIA0nOoIk0IN4B2lq+feWvIU3sr4jhuBoa83rnzsQ== X-Received: by 2002:a05:600c:3646:b0:3fe:a5b:e504 with SMTP id y6-20020a05600c364600b003fe0a5be504mr3538477wmq.22.1691238876530; Sat, 05 Aug 2023 05:34:36 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id j6-20020a5d6186000000b0031455482d1fsm5063261wru.47.2023.08.05.05.34.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Aug 2023 05:34:35 -0700 (PDT) Message-ID: Subject: Re: [PATCH 2/2] gnu: neovim: Search and use installed plugins, like vim. From: Liliana Marie Prikler To: SeerLite , 54221@debbugs.gnu.org Date: Sat, 05 Aug 2023 14:34:34 +0200 In-Reply-To: <0313ee2476aeb999ca0f73609f2eff54865028bc.1677096448.git.seerlite@disroot.org> References: <06694925c423c7e08e49e8384c0009c9f1cd2aa9.1677096448.git.seerlite@disroot.org> <0313ee2476aeb999ca0f73609f2eff54865028bc.1677096448.git.seerlite@disroot.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 22.02.2023 um 17:07 -0300 schrieb SeerLite: > * gnu/packages/vim.scm (neovim)[phases]: Add 'install-guix.vim phase > and remove trailing #t's. Again, should be [#:phases]. When you need to join sentences with "and" it's typically a sign that these are unrelated changes. At the very least, you should write out those sentences. I'm also a proponent of doing stylistic changes in a separate patch, but since you're already waiting for this a long time, I'm willing to take this series without that. > [native-search-paths]: Add search path specification for > 'GUIX_VIMRUNTIME'. Can we inherit this from vim via (package-native-search-paths vim)? Sadly, this patch currently doesn't apply on master; or at least what I have for master, which lacks any changes in vim.scm, though. Could you send one with these points adjusted and --reroll-count=3D8? Cheers