public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mypy: add missing dep, rename mypy_extensions to mypy-extensions

This commit is contained in:
Frederik Rietdijk 2019-10-24 09:56:26 +02:00
parent 2e5b23d86b
commit 5e8be2fb84
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/buku/default.nix
View File

@ -18,7 +18,7 @@ with python3.pkgs; buildPythonApplication rec {
pylint pylint
flake8 flake8
pyyaml pyyaml
mypy_extensions mypy-extensions
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/development/python-modules/mypy/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchPypi, buildPythonPackage, typed-ast, psutil, isPy3k { stdenv, fetchPypi, buildPythonPackage, typed-ast, psutil, isPy3k
,mypy_extensions }: , mypy-extensions
, typing-extensions
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "mypy"; pname = "mypy";
@ -15,7 +17,7 @@ buildPythonPackage rec {
disabled = !isPy3k; disabled = !isPy3k;
propagatedBuildInputs = [ typed-ast psutil mypy_extensions ]; propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Optional static typing for Python"; description = "Optional static typing for Python";

5
pkgs/development/python-modules/mypy/extensions.nix
View File

@ -1,14 +1,15 @@
{ stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }: { stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "mypy_extensions"; pname = "mypy-extensions";
version = "0.4.3"; version = "0.4.3";
# Tests not included in pip package. # Tests not included in pip package.
doCheck = false; doCheck = false;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit version;
pname = "mypy_extensions";
sha256 = "2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"; sha256 = "2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8";
}; };

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

@ -3,7 +3,7 @@
, fetchPypi , fetchPypi
, pythonOlder , pythonOlder
, six , six
, mypy_extensions , mypy-extensions
, typing , typing
, pytest , pytest
}: }:
@ -18,7 +18,7 @@ buildPythonPackage rec {
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];
propagatedBuildInputs = [ six mypy_extensions ] propagatedBuildInputs = [ six mypy-extensions ]
++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
checkPhase = '' checkPhase = ''

2
pkgs/top-level/python-packages.nix
View File

@ -3913,7 +3913,7 @@ in {
mypy = callPackage ../development/python-modules/mypy { }; mypy = callPackage ../development/python-modules/mypy { };
mypy_extensions = callPackage ../development/python-modules/mypy/extensions.nix { }; mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { };
mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { };