Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions pkgs/by-name/no/noto-fonts-color-emoji/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -39,9 +32,10 @@ stdenvNoCC.mkDerivation rec {
nativeBuildInputs = [
imagemagick
zopfli
nototools
pngquant
which
emojiPythonEnv
buildPackages.python3.pkgs.fonttools
];

postPatch = ''
Expand Down
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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 ];

pythonRemoveDeps = [
# https://github.com/notofonts/nototools/pull/901
"typed-ast"
];

propagatedBuildInputs = [
dependencies = with python3Packages; [
afdko
appdirs
attrs
Expand All @@ -74,16 +48,15 @@ buildPythonPackage rec {
regex
scour
toml
typed-ast
ufonormalizer
ufoprocessor
unicodedata2
zopfli
];

nativeCheckInputs = [
pillow
six
python3Packages.pillow
python3Packages.six
bash
];

Expand Down
12 changes: 3 additions & 9 deletions pkgs/by-name/tw/twitter-color-emoji/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
fetchFromGitHub,
cairo,
imagemagick,
nototools,
pkg-config,
pngquant,
python3,
Expand All @@ -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";
Expand All @@ -52,10 +45,11 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
cairo
python3.pkgs.fonttools
imagemagick
nototools
pkg-config
pngquant
pythonEnv
which
zopfli
];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/wh/whatsapp-emoji-font/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
fetchFromGitHub,
imagemagick,
nix-update-script,
nototools,
pngquant,
python3Packages,
which,
zopfli,
}:
Expand All @@ -29,8 +29,8 @@ stdenvNoCC.mkDerivation rec {

nativeBuildInputs = [
imagemagick
nototools
pngquant
python3Packages.nototools
which
zopfli
];
Expand Down
27 changes: 0 additions & 27 deletions pkgs/development/python-modules/aiosonic/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}:
Expand Down Expand Up @@ -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" ];
Expand Down
48 changes: 0 additions & 48 deletions pkgs/development/python-modules/typed-ast/default.nix

This file was deleted.

28 changes: 0 additions & 28 deletions pkgs/development/python-modules/types-typed-ast/default.nix

This file was deleted.

2 changes: 2 additions & 0 deletions pkgs/top-level/python-aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down Expand Up @@ -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 { };
Expand Down Expand Up @@ -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 { };
Expand Down