Unverified Commit 653b603c authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

notmuch: move the vim plugin to another output (#353500)

parents 434c6fad 0082fde4

nixos/doc/manual/release-notes/rl-2505.section.md

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ 
  [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0)

  for more information.



- the notmuch vim plugin now lives in a separate output of the `notmuch`

  package. Installing `notmuch` will not bring the notmuch vim package anymore,

  add `vimPlugins.notmuch-vim` to your (Neo)vim configuration if you want the

  vim plugin.



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->



## Other Notable Changes {#sec-release-25.05-notable-changes}

pkgs/applications/editors/vim/plugins/overrides.nix

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
  languagetool,

  llvmPackages,

  meson,

  notmuch,

  neovim-unwrapped,

  nim1,

  nodePackages,
@@ -1760,6 +1761,8 @@ in 
    nvimRequireCheck = "null-ls";

  };



  notmuch-vim = notmuch.vim;



  NotebookNavigator-nvim = super.NotebookNavigator-nvim.overrideAttrs {

    nvimRequireCheck = "notebook-navigator";

  };

pkgs/applications/networking/mailreaders/notmuch/default.nix

+8 −6
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
, withEmacs ? true

, withRuby ? true

, withSfsexp ? true # also installs notmuch-git, which requires sexp-support

# TODO upstream: it takes too long ! 800 ms here

, withVim ? true

}:
@@ -76,7 +77,8 @@ stdenv.mkDerivation (finalAttrs: { 
  '';



  outputs = [ "out" "man" "info" "bindingconfig" ]

    ++ lib.optional withEmacs "emacs";

    ++ lib.optional withEmacs "emacs"

    ++ lib.optional withVim "vim";



  # if notmuch is built with s-expression support, the testsuite (T-850.sh) only

  # passes if notmuch-git can be executed, so we need to patch its shebang.
@@ -133,14 +135,14 @@ stdenv.mkDerivation (finalAttrs: { 
    cp notmuch-git $out/bin/notmuch-git

    wrapProgram $out/bin/notmuch-git --prefix PATH : $out/bin:${lib.getBin git}/bin

  '' + lib.optionalString withVim ''

    make -C vim DESTDIR="$out/share/vim-plugins/notmuch" prefix="" install

    mkdir -p $out/share/nvim

    ln -s $out/share/vim-plugins/notmuch $out/share/nvim/site

    make -C vim DESTDIR="$vim/share/vim-plugins/notmuch" prefix="" install

    mkdir -p $vim/share/nvim

    ln -s $vim/share/vim-plugins/notmuch $vim/share/nvim/site

  '' + lib.optionalString (withVim && withRuby) ''

    PLUG=$out/share/vim-plugins/notmuch/plugin/notmuch.vim

    PLUG=$vim/share/vim-plugins/notmuch/plugin/notmuch.vim

    cat >> $PLUG << EOF

      let \$GEM_PATH=\$GEM_PATH . ":${finalAttrs.passthru.gemEnv}/${ruby.gemPath}"

      let \$RUBYLIB=\$RUBYLIB . ":$out/${ruby.libPath}/${ruby.system}"

      let \$RUBYLIB=\$RUBYLIB . ":$vim/${ruby.libPath}/${ruby.system}"

      if has('nvim')

    EOF

    for gem in ${finalAttrs.passthru.gemEnv}/${ruby.gemPath}/gems/*/lib; do