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: 370d483a0d34
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 33cb21574be0
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 26, 2019

  1. pythonPackages.jedi: 0.14.1 -> 0.15.1

    @matthuszagh
    matthuszagh committed Oct 26, 2019
    Copy the full SHA
    a260b9a View commit details

  2. pythonPackages.python-language-server: 0.28.3 -> 0.29.1 

    Fixes a failing test due to a pylint update.
    @matthuszagh
    matthuszagh committed Oct 26, 2019
    Copy the full SHA
    b754310 View commit details

Commits on Oct 28, 2019

  1. Merge branch 'master' into python-language-server

    @Mic92
    Mic92 authored Oct 28, 2019
    Copy the full SHA
    9b9cf32 View commit details

  2. pythonPackages.python-language-server: 0.28.3 -> 0.29.1 (#72045) 

    pythonPackages.python-language-server: 0.28.3 -> 0.29.1
    @Mic92
    Mic92 authored Oct 28, 2019
    Copy the full SHA
    33cb215 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/development/python-modules/python-language-server/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/python-language-server/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server
, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8
, pytest, mock, pytestcov, coverage, setuptools
, # Allow building a limited set of providers, e.g. ["pycodestyle"].
providers ? ["*"]
@@ -21,13 +21,13 @@ in

buildPythonPackage rec {
pname = "python-language-server";
version = "0.28.3";
version = "0.29.1";

src = fetchFromGitHub {
owner = "palantir";
repo = "python-language-server";
rev = version;
sha256 = "16d8i43r75h0cijggkkmmpnycn29wlbjp63mgg3s4nbrxfa96x2k";
sha256 = "0hsp0h8vma8z6f0mg311hp59h6hayl7zzxmy295x5fl2l9iiakfv";
};

# The tests require all the providers, disable otherwise.
@@ -44,7 +44,7 @@ buildPythonPackage rec {
HOME=$TEMPDIR pytest
'';

propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ]
propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ]
++ stdenv.lib.optional (withProvider "autopep8") autopep8
++ stdenv.lib.optional (withProvider "mccabe") mccabe
++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle