Re: [PATCH 2/2] gnu: Add notmuch-vim.

[Marius Bakke <mbakke@fastmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3343 bytes --]

ng0 <ng0@libertad.pw> writes:

> Marius Bakke <mbakke@fastmail.com> writes:
>
>> ng0 <ng0@libertad.pw> 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 <lgradl@openmailbox.org>
>>>  ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
>>>  ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
>>> -;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
>>> +;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
>>>  ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
>>>  ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
>>>  ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
>>> @@ -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:

Oops, you're right. I forgot that the dot was included. Let's just keep
it 'hard-coded' for now. We can add a helper function to determine the
correct directory if/when this becomes a problem / recurring theme.

Yet another reason to put it in vim.scm.. ;-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]