mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
nototools: move to top-level (#410417)
This commit is contained in:
Martin Weinelt
GitHub
commit
ec33278c39
9 changed files with 21 additions and 167 deletions
|
|
@ -7,18 +7,11 @@
|
|||
cairo,
|
||||
imagemagick,
|
||||
zopfli,
|
||||
nototools,
|
||||
pngquant,
|
||||
which,
|
||||
}:
|
||||
|
||||
let
|
||||
emojiPythonEnv = buildPackages.python3.withPackages (
|
||||
p: with p; [
|
||||
fonttools
|
||||
nototools
|
||||
]
|
||||
);
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "noto-fonts-color-emoji";
|
||||
version = "2.047";
|
||||
|
|
@ -39,9 +32,10 @@ stdenvNoCC.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
imagemagick
|
||||
zopfli
|
||||
nototools
|
||||
pngquant
|
||||
which
|
||||
emojiPythonEnv
|
||||
buildPackages.python3.pkgs.fonttools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,45 +1,14 @@
|
|||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
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,
|
||||
pillow,
|
||||
six,
|
||||
bash,
|
||||
setuptools-scm,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nototools";
|
||||
version = "0.2.20";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlefonts";
|
||||
repo = "nototools";
|
||||
|
|
@ -51,9 +20,14 @@ buildPythonPackage rec {
|
|||
sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
build-system = with python3Packages; [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pythonRemoveDeps = [
|
||||
# https://github.com/notofonts/nototools/pull/901
|
||||
"typed-ast"
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
afdko
|
||||
appdirs
|
||||
attrs
|
||||
|
|
@ -74,7 +48,6 @@ buildPythonPackage rec {
|
|||
regex
|
||||
scour
|
||||
toml
|
||||
typed-ast
|
||||
ufonormalizer
|
||||
ufoprocessor
|
||||
unicodedata2
|
||||
|
|
@ -82,8 +55,8 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pillow
|
||||
six
|
||||
python3Packages.pillow
|
||||
python3Packages.six
|
||||
bash
|
||||
];
|
||||
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
fetchFromGitHub,
|
||||
cairo,
|
||||
imagemagick,
|
||||
nototools,
|
||||
pkg-config,
|
||||
pngquant,
|
||||
python3,
|
||||
|
|
@ -25,14 +26,6 @@ let
|
|||
rev = "v${version}";
|
||||
hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo=";
|
||||
};
|
||||
|
||||
pythonEnv = python3.withPackages (
|
||||
ps: with ps; [
|
||||
fonttools
|
||||
nototools
|
||||
]
|
||||
);
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "twitter-color-emoji";
|
||||
|
|
@ -52,10 +45,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cairo
|
||||
python3.pkgs.fonttools
|
||||
imagemagick
|
||||
nototools
|
||||
pkg-config
|
||||
pngquant
|
||||
pythonEnv
|
||||
which
|
||||
zopfli
|
||||
];
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
fetchFromGitHub,
|
||||
imagemagick,
|
||||
nix-update-script,
|
||||
nototools,
|
||||
pngquant,
|
||||
python3Packages,
|
||||
which,
|
||||
zopfli,
|
||||
}:
|
||||
|
|
@ -29,8 +29,8 @@ stdenvNoCC.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
imagemagick
|
||||
nototools
|
||||
pngquant
|
||||
python3Packages.nototools
|
||||
which
|
||||
zopfli
|
||||
];
|
||||
|
|
|
|||
|
|
@ -10,26 +10,13 @@
|
|||
h2,
|
||||
onecache,
|
||||
# test dependencies
|
||||
asgiref,
|
||||
black,
|
||||
django,
|
||||
click,
|
||||
httpx,
|
||||
proxy-py,
|
||||
pytest-aiohttp,
|
||||
pytest-asyncio,
|
||||
pytest-cov-stub,
|
||||
pytest-django,
|
||||
pytest-mock,
|
||||
pytest-sugar,
|
||||
pytest-timeout,
|
||||
uvicorn,
|
||||
httptools,
|
||||
typed-ast,
|
||||
uvloop,
|
||||
requests,
|
||||
aiohttp,
|
||||
aiodns,
|
||||
pytestCheckHook,
|
||||
stdenv,
|
||||
}:
|
||||
|
|
@ -66,27 +53,13 @@ buildPythonPackage rec {
|
|||
|
||||
nativeCheckInputs = [
|
||||
aiohttp
|
||||
aiodns
|
||||
asgiref
|
||||
black
|
||||
django
|
||||
click
|
||||
httpx
|
||||
proxy-py
|
||||
pytest-aiohttp
|
||||
pytest-asyncio
|
||||
pytest-cov-stub
|
||||
pytest-django
|
||||
pytest-mock
|
||||
pytest-sugar
|
||||
pytest-timeout
|
||||
uvicorn
|
||||
httptools
|
||||
typed-ast
|
||||
uvloop
|
||||
requests
|
||||
pytestCheckHook
|
||||
nodejs
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aiosonic" ];
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonAtLeast,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
pytest,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "typed-ast";
|
||||
version = "1.5.5";
|
||||
pyproject = true;
|
||||
|
||||
# error: unknown type name ‘PyFutureFeatures’
|
||||
disabled = pythonAtLeast "3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python";
|
||||
repo = "typed_ast";
|
||||
tag = version;
|
||||
hash = "sha256-A/FA6ngu8/bbpKW9coJ7unm9GQezGuDhgBWjOhAxm2o=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytest ];
|
||||
|
||||
preCheck = ''
|
||||
rm -rf typed_ast
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"typed_ast"
|
||||
"typed_ast.ast27"
|
||||
"typed_ast.ast3"
|
||||
"typed_ast.conversions"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python AST modules with type comment support";
|
||||
homepage = "https://github.com/python/typed_ast";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-typed-ast";
|
||||
version = "1.5.8.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-93lfb51ZezUhIxQEC5k/ZhO1HYFzjtzjweOj6e9lUSQ=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "typed_ast-stubs" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing stubs for typed-ast";
|
||||
homepage = "https://github.com/python/typeshed";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ veehaitch ];
|
||||
};
|
||||
}
|
||||
|
|
@ -777,9 +777,11 @@ mapAliases ({
|
|||
twitter-common-lang = throw "twitter-common-lang has been removed because it is abandoned and unmaintained"; # added 2024-07-14
|
||||
twitter-common-log = throw "twitter-common-log has been removed because it is abandoned and unmaintained"; # added 2024-07-14
|
||||
twitter-common-options = throw "twitter-common-options has been removed because it is abandoned and unmaintained"; # added 2024-07-14
|
||||
typed-ast = throw "typed-ast was removed because it went end of life in July 2023"; # added 2025-05-24
|
||||
types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30
|
||||
types-enum34 = throw "types-enum34 is obselete since Python 3.4"; # added 2025-02-15
|
||||
types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
|
||||
types-typed-ast = throw "types-typed-ast was removed because so was typed-ast"; # added 2025-05-24
|
||||
ufoLib2 = ufolib2; # added 2024-01-07
|
||||
ukrainealarm = throw "ukrainealarm has been removed, as it has been replaced as a home-assistant dependency by uasiren."; # added 2024-01-05
|
||||
unblob-native = throw "unblob-native has been removed because its functionality is merged into unblob 25.4.14."; # Added 2025-05-02
|
||||
|
|
|
|||
|
|
@ -10123,8 +10123,6 @@ self: super: with self; {
|
|||
|
||||
notobuilder = callPackage ../development/python-modules/notobuilder { };
|
||||
|
||||
nototools = callPackage ../development/python-modules/nototools { };
|
||||
|
||||
notus-scanner = callPackage ../development/python-modules/notus-scanner { };
|
||||
|
||||
nox = callPackage ../development/python-modules/nox { };
|
||||
|
|
@ -17911,8 +17909,6 @@ self: super: with self; {
|
|||
inherit (pkgs) file zlib;
|
||||
};
|
||||
|
||||
typed-ast = callPackage ../development/python-modules/typed-ast { };
|
||||
|
||||
typed-settings = callPackage ../development/python-modules/typed-settings { };
|
||||
|
||||
typedunits = callPackage ../development/python-modules/typedunits { };
|
||||
|
|
@ -18357,8 +18353,6 @@ self: super: with self; {
|
|||
|
||||
types-tqdm = callPackage ../development/python-modules/types-tqdm { };
|
||||
|
||||
types-typed-ast = callPackage ../development/python-modules/types-typed-ast { };
|
||||
|
||||
types-ujson = callPackage ../development/python-modules/types-ujson { };
|
||||
|
||||
types-urllib3 = callPackage ../development/python-modules/types-urllib3 { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue