Merge pull request #189433 from SuperSandro2000/black

This commit is contained in:
Sandro 2022-09-04 01:49:56 +02:00 committed by GitHub
commit 45daf539bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 14 deletions

View file

@ -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; [ ];
};
}

View file

@ -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 ];

View file

@ -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 ];
};
}