commit 3497b757d3905010a5b6eb1d4f5195a062869afb · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2103.xml

···

       146
       146
        
            <link xlink:href="http://www.mutt.org/relnotes/2.0/">release notes for Mutt 2.0</link>.

     

       147
       147
        
           </para>

     

       148
       148
        
          </listitem>

     

       149
       149
       +
          <listitem>

     

       150
       150
       +
           <para>

     

       151
       151
       +
             <literal>vim</literal> switched to Python 3, dropping all Python 2 support.

     

       152
       152
       +
           </para>

     

       153
       153
       +
          </listitem>

     

       149
       154
        
         </itemizedlist>

     

       150
       155
        
        </section>

     

       151
       156

+7 -8

pkgs/applications/editors/vim/configurable.nix

···

       1
       1
        
       { source ? "default", callPackage, stdenv, ncurses, pkgconfig, gettext

     

       2
       2
       -
       , writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby

     

       2
       2
       +
       , writeText, config, glib, gtk2-x11, gtk3-x11, lua, python3, perl, tcl, ruby

     

       3
       3
        
       , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu

     

       4
       4
        
       , libICE

     

       5
       5
        
       , vimPlugins

     
···

       62
       62
        
       

     

       63
       63
        
         common = callPackage ./common.nix {};

     

       64
       64
        
       

     

       65
       65
       -
         isPython3 = python.isPy3 or false;

     

       66
       66
       -
       

     

       67
       65
        
       in stdenv.mkDerivation rec {

     

       68
       66
        
       

     

       69
       67
        
         pname = "vim_configurable";

     
···

       106
       104
        
           "--with-luajit"

     

       107
       105
        
         ]

     

       108
       106
        
         ++ stdenv.lib.optionals pythonSupport [

     

       109
       109
       -
           "--enable-python${if isPython3 then "3" else ""}interp=yes"

     

       110
       110
       -
           "--with-python${if isPython3 then "3" else ""}-config-dir=${python}/lib"

     

       111
       111
       -
           "--disable-python${if (!isPython3) then "3" else ""}interp"

     

       107
       107
       +
           "--enable-python3interp=yes"

     

       108
       108
       +
           "--with-python3-config-dir=${python3}/lib"

     

       109
       109
       +
           # Disables Python 2

     

       110
       110
       +
           "--disable-pythoninterp"

     

       112
       111
        
         ]

     

       113
       112
        
         ++ stdenv.lib.optional nlsSupport          "--enable-nls"

     

       114
       113
        
         ++ stdenv.lib.optional perlSupport         "--enable-perlinterp"

     
···

       134
       133
        
           ++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11

     

       135
       134
        
           ++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ]

     

       136
       135
        
           ++ stdenv.lib.optional luaSupport lua

     

       137
       137
       -
           ++ stdenv.lib.optional pythonSupport python

     

       136
       136
       +
           ++ stdenv.lib.optional pythonSupport python3

     

       138
       137
        
           ++ stdenv.lib.optional tclSupport tcl

     

       139
       138
        
           ++ stdenv.lib.optional rubySupport ruby;

     

       140
       139
        
       

     
···

       163
       162
        
       

     

       164
       163
        
           ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc

     

       165
       164
        
         '' + stdenv.lib.optionalString wrapPythonDrv ''

     

       166
       166
       -
           wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin"

     

       165
       165
       +
           wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin"

     

       167
       166
        
         '' + stdenv.lib.optionalString (guiSupport == "gtk3") ''

     

       168
       167
        
       

     

       169
       168
        
           rewrap () {