Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5e93492b7f28
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3497b757d390
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 9, 2020

  1. vim: Get rid of Python 2 dependency

    @dasJ
    dasJ committed Nov 9, 2020
    Copy the full SHA
    576a928 View commit details

Commits on Nov 11, 2020

  1. Merge pull request #102472 from helsinki-systems/feat/vim-python3 

    vim: Get rid of Python 2 dependency
    @danieldk
    danieldk authored Nov 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3497b75 View commit details
Showing with 12 additions and 8 deletions.
  1. +5 −0 nixos/doc/manual/release-notes/rl-2103.xml
  2. +7 −8 pkgs/applications/editors/vim/configurable.nix
5 changes: 5 additions & 0 deletions nixos/doc/manual/release-notes/rl-2103.xml
View file
Original file line number Diff line number Diff line change
@@ -146,6 +146,11 @@
<link xlink:href="http://www.mutt.org/relnotes/2.0/">release notes for Mutt 2.0</link>.
</para>
</listitem>
<listitem>
<para>
<literal>vim</literal> switched to Python 3, dropping all Python 2 support.
</para>
</listitem>
</itemizedlist>
</section>

15 changes: 7 additions & 8 deletions pkgs/applications/editors/vim/configurable.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ source ? "default", callPackage, stdenv, ncurses, pkgconfig, gettext
, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby
, writeText, config, glib, gtk2-x11, gtk3-x11, lua, python3, perl, tcl, ruby
, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
, libICE
, vimPlugins
@@ -62,8 +62,6 @@ let

common = callPackage ./common.nix {};

isPython3 = python.isPy3 or false;

in stdenv.mkDerivation rec {

pname = "vim_configurable";
@@ -106,9 +104,10 @@ in stdenv.mkDerivation rec {
"--with-luajit"
]
++ stdenv.lib.optionals pythonSupport [
"--enable-python${if isPython3 then "3" else ""}interp=yes"
"--with-python${if isPython3 then "3" else ""}-config-dir=${python}/lib"
"--disable-python${if (!isPython3) then "3" else ""}interp"
"--enable-python3interp=yes"
"--with-python3-config-dir=${python3}/lib"
# Disables Python 2
"--disable-pythoninterp"
]
++ stdenv.lib.optional nlsSupport "--enable-nls"
++ stdenv.lib.optional perlSupport "--enable-perlinterp"
@@ -134,7 +133,7 @@ in stdenv.mkDerivation rec {
++ stdenv.lib.optional (guiSupport == "gtk3") gtk3-x11
++ stdenv.lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ]
++ stdenv.lib.optional luaSupport lua
++ stdenv.lib.optional pythonSupport python
++ stdenv.lib.optional pythonSupport python3
++ stdenv.lib.optional tclSupport tcl
++ stdenv.lib.optional rubySupport ruby;

@@ -163,7 +162,7 @@ in stdenv.mkDerivation rec {
ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc
'' + stdenv.lib.optionalString wrapPythonDrv ''
wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin"
wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin"
'' + stdenv.lib.optionalString (guiSupport == "gtk3") ''
rewrap () {