From a6899dd9187c07166aed1df28daed98312f3075b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 2 Sep 2022 12:30:12 +0200 Subject: [PATCH 1/3] python310Packages.black: 22.6.0 -> 22.8.0 --- pkgs/development/python-modules/black/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 61a93bf98655..d1c28e8066a0 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "black"; - version = "22.6.0"; + version = "22.8.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-bG054ortN5rsQNocZUNMd9deZbtZoeHCg95UX7Tnxsk="; + hash = "sha256-eS9+tUC6mhfoZWU4cB0+sa/LE047RbcfILJcd6jbfm4="; }; nativeBuildInputs = [ setuptools-scm ]; From f6d144637c334de703b453f1c2d007dc2433f6da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 2 Sep 2022 14:56:32 +0200 Subject: [PATCH 2/3] python310Packages.graphql-server-core: remove pseudo black test, little cleanup --- .../python-modules/graphql-server-core/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix index e26e936f48fd..2ba45e099673 100644 --- a/pkgs/development/python-modules/graphql-server-core/default.nix +++ b/pkgs/development/python-modules/graphql-server-core/default.nix @@ -1,16 +1,17 @@ { buildPythonPackage , fetchFromGitHub , lib -, black , graphql-core , promise , fetchpatch , pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "graphql-server-core"; version = "2.0.0"; + disable = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; @@ -19,8 +20,6 @@ buildPythonPackage rec { sha256 = "1w3biv2za2m1brwjy0z049c2m94gm1zfwxzgc6lwrsci724jv9fr"; }; - disable = pythonOlder "3.6"; - patches = [ (fetchpatch { url = "https://github.com/graphql-python/graphql-server-core/commit/865ee9d5602f352c958f6f7e15adbe9abe216784.patch"; @@ -33,18 +32,17 @@ buildPythonPackage rec { promise ]; - checkPhase = "black --check graphql_server tests"; + # fail with: cannot import name 'format_error' from 'graphql' + doCheck = false; checkInputs = [ - black + pytestCheckHook ]; meta = with lib; { description = "Core package for using GraphQL in a custom server easily"; homepage = "https://github.com/graphql-python/graphql-server-core"; license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda - ]; + maintainers = with maintainers; [ kamadorueda ]; }; } From c5b5bcd7860c51a9cb6e2c9da66c9909f0fcbf28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 2 Sep 2022 15:16:33 +0200 Subject: [PATCH 3/3] noto-fonts: remove unused black, update meta --- pkgs/data/fonts/noto-fonts/tools.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index 7d850ef71667..e829e98bee0b 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, lib, buildPythonPackage, pythonOlder -, afdko, appdirs, attrs, black, booleanoperations, brotlipy, click +, afdko, appdirs, attrs, booleanoperations, brotlipy, click , defcon, fontmath, fontparts, fontpens, fonttools, lxml , mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour , toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli @@ -28,7 +28,6 @@ buildPythonPackage rec { afdko appdirs attrs - black booleanoperations brotlipy click @@ -70,9 +69,10 @@ buildPythonPackage rec { cp -r third_party $out ''; - meta = { + meta = with lib; { description = "Noto fonts support tools and scripts plus web site generation"; - license = lib.licenses.asl20; homepage = "https://github.com/googlefonts/nototools"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; }; }