nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-04-18 08:25:25 +02:00
parent 488fb5829a 28ac309309
commit 9d87ccabce
136 changed files with 5780 additions and 2599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/azure-mgmt-network/default.nix
View File

@@ -15,12 +15,6 @@ buildPythonPackage rec {
sha256 = "cef9bf5d36700966e52f7cea86e29c622bc5bbb92d0ce7a75420e29fb0e75f45";
};
preConfigure = ''
# Patch to make this package work on requests >= 2.11.x
# CAN BE REMOVED ON NEXT PACKAGE UPDATE
sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py
'';
postInstall = ''
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py

4
pkgs/development/python-modules/python-language-server/default.nix
View File

@@ -21,13 +21,13 @@ in
buildPythonPackage rec {
pname = "python-language-server";
version = "0.25.0";
version = "0.26.1";
src = fetchFromGitHub {
owner = "palantir";
repo = "python-language-server";
rev = version;
sha256 = "10la48m10j4alfnpw0xw359fb833scf5kv7kjvh7djf6ij7cfsvq";
sha256 = "003fy8bbvwibnsnyxw1qwg2rxnhbfylqs67ixr6fdnw6mmrzd6fg";
};
# The tests require all the providers, disable otherwise.

11
pkgs/development/python-modules/wsproto/default.nix
View File

@@ -1,12 +1,12 @@
{ buildPythonPackage, fetchPypi, h11, enum34, pytest }:
{ lib, buildPythonPackage, fetchPypi, h11, enum34, pytest }:
buildPythonPackage rec {
pname = "wsproto";
version = "0.13.0";
version = "0.14.0";
src = fetchPypi {
inherit pname version;
sha256 = "fd6020d825022247053400306448e161d8740bdd52e328e5553cd9eee089f705";
sha256 = "1p24dmym6pfsqsyxps6m2cxfl36cmkri0kdy5y5q7s300j3xmhsm";
};
propagatedBuildInputs = [ h11 enum34 ];
@@ -17,4 +17,9 @@ buildPythonPackage rec {
py.test
'';
meta = with lib; {
description = "Pure Python, pure state-machine WebSocket implementation";
homepage = https://github.com/python-hyper/wsproto/;
license = licenses.mit;
};
}

4
pkgs/development/python-modules/xdot/default.nix
View File

@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "xdot";
version = "1.0";
version = "1.1";
src = fetchPypi {
inherit pname version;
sha256 = "18a2ri8vggaxy7im1x9hki34v519y5jy4n07zpqq5br9syb7h1ky";
sha256 = "0cr4rh7dz4dfzyxrk5pzhm0d15gkrgkfp3i5lw178xy81pc56p71";
};
disabled = !isPy3k;

4
pkgs/development/python-modules/yapf/default.nix
View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "yapf";
version = "0.26.0";
version = "0.27.0";
src = fetchPypi {
inherit pname version;
sha256 = "edb47be90a56ca6f3075fe24f119a22225fbd62c66777b5d3916a7e9e793891b";
sha256 = "18a7n85xv0qrab2ck94kw92ncjq2l8vl0k34pm22rjvd8h6gixil";
};
meta = with stdenv.lib; {