cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #179842 from LibreCybernetics/update-mypy

Browse source
This commit is contained in:
Martin Weinelt 2022-07-06 01:51:28 +02:00 committed by GitHub
commit 6b511e4312
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/python-modules/mypy/default.nix
View file

@ -14,22 +14,22 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mypy"; pname = "mypy";
version = "0.941"; version = "0.961";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "python"; owner = "python";
repo = "mypy"; repo = "mypy";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-H2SWJA0WWyKV7/5miFawv4JRXu/J7H6Wer1eBL+Tru0="; hash = "sha256-K6p73+/SeWniMSD/mP09qwqFOBr/Pqohl+PaTDVpvZI=";
}; };
patches = [ patches = [
# FIXME: Remove patch after upstream has decided the proper solution. # FIXME: Remove patch after upstream has decided the proper solution.
# https://github.com/python/mypy/pull/11143 # https://github.com/python/mypy/pull/11143
(fetchpatch { (fetchpatch {
url = "https://github.com/python/mypy/commit/e7869f05751561958b946b562093397027f6d5fa.patch"; url = "https://github.com/python/mypy/commit/2004ae023b9d3628d9f09886cbbc20868aee8554.patch";
hash = "sha256-waIZ+m3tfvYE4HJ8kL6rN/C4fMjvLEe9UoPbt9mHWIM="; hash = "sha256-y+tXvgyiECO5+66YLvaje8Bz5iPvfWNIBJcsnZ2nOdI=";
}) })
]; ];

4
pkgs/development/python-modules/progressbar2/default.nix
View file

@ -16,10 +16,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [ python-utils ]; propagatedBuildInputs = [ python-utils ];
# depends on unmaintained pytest-pep8
# https://github.com/WoLpH/python-progressbar/issues/241
doCheck = false;
pythonImportsCheck = [ "progressbar" ]; pythonImportsCheck = [ "progressbar" ];
meta = with lib; { meta = with lib; {

7
pkgs/development/python-modules/python-utils/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, loguru
, pytestCheckHook , pytestCheckHook
, six , six
, pytest-mypy , pytest-mypy
@ -8,14 +9,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-utils"; pname = "python-utils";
version = "3.1.0"; version = "3.3.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "WoLpH"; owner = "WoLpH";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-+NgcVIDM9f2OKBpJNWlSyFxEONltPWJSWIu400/5RkQ= hash = "sha256-U6yamXbG8CUrNnFmGTBpHUelZSgoaNyB2CdUSH9WdMA=";
";
}; };
# disable coverage and linting # disable coverage and linting
@ -25,6 +25,7 @@ buildPythonPackage rec {
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
loguru
six six
]; ];