From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: Re: [PATCH 2/2] gnu: Add notmuch-vim. Date: Sat, 14 Jan 2017 17:50:52 +0000 Message-ID: <87sholedj7.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> References: <20170114150811.21767-1-ng0@libertad.pw> <20170114150811.21767-3-ng0@libertad.pw> <87lgud4knh.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSSTR-0002VV-TS for guix-devel@gnu.org; Sat, 14 Jan 2017 12:50:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cSSTN-0002ai-Ro for guix-devel@gnu.org; Sat, 14 Jan 2017 12:50:41 -0500 Received: from aibo.runbox.com ([91.220.196.211]:35127) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cSSTN-0002aN-5n for guix-devel@gnu.org; Sat, 14 Jan 2017 12:50:37 -0500 In-Reply-To: <87lgud4knh.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Marius Bakke Cc: guix-devel@gnu.org Marius Bakke writes: > ng0 writes: > >> * gnu/packages/mail.scm (notmuch-vim): New variable. >> --- >> gnu/packages/mail.scm | 37 ++++++++++++++++++++++++++++++++++++- >> 1 file changed, 36 insertions(+), 1 deletion(-) >> >> diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm >> index 206055751..89aa2444d 100644 >> --- a/gnu/packages/mail.scm >> +++ b/gnu/packages/mail.scm >> @@ -15,7 +15,7 @@ >> ;;; Copyright © 2016 Lukas Gradl >> ;;; Copyright © 2016 Alex Kost >> ;;; Copyright © 2016 Troy Sankey >> -;;; Copyright © 2016 ng0 >> +;;; Copyright © 2016, 2017 ng0 >> ;;; Copyright © 2016 Clément Lassieur >> ;;; Copyright © 2016 Arun Isaac >> ;;; Copyright © 2016 John Darrington >> @@ -71,6 +71,7 @@ >> #:use-module (gnu packages perl) >> #:use-module (gnu packages python) >> #:use-module (gnu packages readline) >> + #:use-module (gnu packages ruby) >> #:use-module (gnu packages search) >> #:use-module (gnu packages texinfo) >> #:use-module (gnu packages compression) >> @@ -83,6 +84,7 @@ >> #:use-module (gnu packages screen) >> #:use-module (gnu packages tls) >> #:use-module (gnu packages networking) >> + #:use-module (gnu packages vim) >> #:use-module (gnu packages web) >> #:use-module (gnu packages xml) >> #:use-module (gnu packages xorg) >> @@ -587,6 +589,39 @@ invoking @command{notifymuch} from the post-new hook.") >> ing, and tagging large collections of email messages.") >> (license gpl3+))) >> >> +(define-public notmuch-vim >> + (package >> + (name "notmuch-vim") >> + (version (package-version notmuch)) >> + ;; The vim plugin is distributed via the notmuch release tarball. >> + (source (package-source notmuch)) >> + (build-system gnu-build-system) >> + (propagated-inputs >> + ;; XXX: This is a plugin, it will not be functional without >> + ;; vim-full (ruby), ruby-mail, and notmuch. >> + `(("notmuch" ,notmuch) >> + ("vim-full" ,vim-full) > > I think if someone installs this plugin, they already have vim and > notmuch, and may want to use other versions etc. So those can be > omitted. > >> + ("ruby-mail" ,ruby-mail))) >> + (arguments >> + `(#:tests? #f ; no "test" target >> + ;; XXX: Replace the "vim80" folder with a dynamic name. >> + #:make-flags (list (string-append "prefix=" >> + (assoc-ref %outputs "out") >> + "/share/vim/vim80")) > ^^ > You can use (version-major+minor (package-version vim)) here. That's not the same as vim80 though... resulting structure: . └── share └── vim └── 8.0 ├── doc │   └── notmuch.txt ├── plugin │   └── notmuch.vim └── syntax ├── notmuch-compose.vim ├── notmuch-folders.vim ├── notmuch-git-diff.vim ├── notmuch-search.vim └── notmuch-show.vim vim itself uses the share/vim/vim80 directory. >> + #:phases >> + (modify-phases %standard-phases >> + (delete 'configure) >> + ;; This package lives in a subdirectory of the notmuch source >> + ;; tree, so chdir into it before building. >> + (add-after 'unpack 'enter-vim-dir >> + (lambda _ (chdir "vim") #t))))) >> + (home-page (package-home-page notmuch)) >> + (synopsis "Vim plugin of the Notmuch mail indexing library") >> + (description >> + "This package provides the Vim plugin to enable access to the > ^^^ > s/the/a Okay > Otherwise LGTM. > >> +Notmuch mail indexing and search library in Vim.") >> + (license gpl3+))) >> + >> (define-public notmuch-addrlookup-c >> (package >> (name "notmuch-addrlookup-c") >> -- >> 2.11.0 -- ♥Ⓐ ng0 -- https://www.inventati.org/patternsinthechaos/