From 1d38ffc372a4207dc6a7d5b2aede9463e13d00e4 Mon Sep 17 00:00:00 2001
From: risson <18313093+rissson@users.noreply.github.com>
Date: Thu, 9 Jan 2020 15:08:26 +0100
Subject: [PATCH] neovim: un-deprecate the `configure` option (#978)

The `programs.neovim.configure` option is consistent with NixOS's
`wrapNeovim` and offers features not supported by the `extraConfig`
and `plugins` option pair.

Closes #971

(cherry picked from commit 1b7b1bc294e99ab1795fe7dad183c1d2ae58a099)

Co-authored-by: Wael Nasreddine <wael.nasreddine@gmail.com>
---
 modules/programs/neovim.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/programs/neovim.nix b/modules/programs/neovim.nix
index dadda2c71..4101dc0f4 100644
--- a/modules/programs/neovim.nix
+++ b/modules/programs/neovim.nix
@@ -148,8 +148,8 @@ in
 
           </para><para>
 
-          This option is deprecated. Please use the options <varname>extraConfig</varname>
-          and <varname>plugins</varname> which are mutually exclusive with this option.
+          This option is mutually exclusive with <varname>extraConfig</varname>
+          and <varname>plugins</varname>.
         '';
       };
 
@@ -193,11 +193,6 @@ in
       }
     ];
 
-    warnings = optional (cfg.configure != {}) ''
-      The programs.neovim.configure option is deprecated. Please use
-      extraConfig and package option.
-    '';
-
     home.packages = [ cfg.finalPackage ];
 
     programs.neovim.finalPackage = pkgs.wrapNeovim cfg.package {