From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id KKvRCh2ahWLnbwEAbAwnHQ (envelope-from ) for ; Thu, 19 May 2022 03:15:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id AP/SCh2ahWLTfAEA9RJhRA (envelope-from ) for ; Thu, 19 May 2022 03:15:09 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BB9F2AC71 for ; Thu, 19 May 2022 03:15:08 +0200 (CEST) Received: from localhost ([::1]:52086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrUkt-0007OW-Tu for larch@yhetil.org; Wed, 18 May 2022 21:15:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrUko-0007OE-RI for guix-patches@gnu.org; Wed, 18 May 2022 21:15:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40097) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrUko-0005qK-If for guix-patches@gnu.org; Wed, 18 May 2022 21:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrUko-0002Q5-Ag for guix-patches@gnu.org; Wed, 18 May 2022 21:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54221] [PATCH v5 1/2] gnu: vim: Use native-search-paths to search for plugins. References: In-Reply-To: Resent-From: SeerLite Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 May 2022 01:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54221 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54221@debbugs.gnu.org Cc: SeerLite Received: via spool by 54221-submit@debbugs.gnu.org id=B54221.16529228529222 (code B ref 54221); Thu, 19 May 2022 01:15:02 +0000 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= 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: SeerLite X-ACL-Warn: , SeerLite via Guix-patches From: SeerLite via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1652922908; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=KqK7bjunYRJpvtwYeJL85IKNh9AjR+gIhkHnXmsRBCo=; b=GoUH7bFGJObhic6aiqtRm25e1xvbi3caZ+aYhbMp7gpBKTQMRYkwbMDBHgpUm5AVtBDRzx qX0F/mKUVkge43cHeTXRxm1ENwB1WE9Uy2CtFOC7ra4JOIKnQYOmsCRowadwfLAWJJFUMq dtachJbFXB6ItDpmOXuldN4HZfM8Famd2loNlBx1o+ozKhJVTEUead9VQ2klULtzgAO0+G NqFQOYwmKNT37kYeXILEnj6QmJW7pW4rhq944lC0zcYd9E2+J98RST/8CrlW7EPFxkNo2b g1zg+rpEE+oVhMfMQCP6j+Eg6HThV8x/HwEkTMUSVqT6hsFyAGsxgY5FoQbEyQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1652922908; a=rsa-sha256; cv=none; b=nQO5jjAqpS+jmrrsoqnih3mGvZDVFrrreZ5OFK393f/wPtxC8Thmd87Lg1H1tJ6N2BRNAh /ZYb5Cr/brbeiusc4VqXroq0gcZptmr/yF8wZDenQ+ZN3n1+29DL8wsAkT/MFN2ryeqA8D GWU/alOwZSeW9pFh79N8Izq34wyV64Xob0btI0UgBD5epVKQBStnyDuAy2v53AlUazHvBu pZAb9WTJ2lgbDJIUYjkJsBDeDOz4GBsd7Q7urq0u+RewEudSpglr8v3LiXN2yKylG2DO89 3TGJLK/50b5l9IFBzMUaR+NLeXNIDgTwLJZw2TACXGRfvMMpPQ61fbBWH6Qzfg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=nixnet.email header.s=202002021149 header.b=DSDx6s0o; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.14 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=nixnet.email header.s=202002021149 header.b=DSDx6s0o; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: BB9F2AC71 X-Spam-Score: -4.14 X-Migadu-Scanner: scn0.migadu.com X-TUID: PNw4cNCMB9Mm 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