Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vim-configurable: fix python support #44167

Merged
merged 1 commit into from Jul 28, 2018
Merged

vim-configurable: fix python support #44167

merged 1 commit into from Jul 28, 2018

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Jul 27, 2018 •
edited

Motivation for this change

This seems to be a regression since #43886, python support currently only works on darwin.

/cc @FRidh

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.
 VIM - Vi IMproved 8.1 (2018 May 18, compiled Jan  1 1970 00:00:01)
 Included patches: 1-146
 Compiled by nixbld
 Huge version without GUI.  Features included (+) or not (-):
-+comments          +libcall           -python            +viminfo
++comments          +libcall           +python            +viminfo
 +conceal           +linebreak         -python3           +vreplace

@FRidh
Copy link
Member

FRidh commented Jul 28, 2018

@LnL7 the Python flags in the previous expression were really confusing so I'm not confused something with regard to it.

FRidh
FRidh approved these changes Jul 28, 2018
View reviewed changes
pkgs/applications/editors/vim/configurable.nix Outdated
@@ -113,11 +113,9 @@ in stdenv.mkDerivation rec {
]
++ stdenv.lib.optionals pythonSupport [
"--enable-python${if isPython3 then "3" else ""}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose this line is legacy

pkgs/applications/editors/vim/configurable.nix Outdated
]
++ stdenv.lib.optionals (pythonSupport && stdenv.isDarwin) [ # Why only for Darwin?
"--enable-python${if isPython3 then "3" else ""}interp=yes" # Duplicate?
"--enable-python${if isPython3 then "3" else ""}interp=yes"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because this line (pythonXInterp) is in line with the other flags.

@LnL7
vim-configurable: fix python support
5b211b6 
Removed --enable-python since that doesn't seem to do anything.
@LnL7 LnL7 merged commit 13c693e into NixOS:master Jul 28, 2018
@LnL7 LnL7 deleted the vim-configurable-python branch July 28, 2018 12:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh approved these changes

Assignees
No one assigned
Labels
6.topic: vim 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@LnL7 @FRidh @GrahamcOfBorg