Unverified Commit ec33278c authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

nototools: move to top-level (#410417)

parents 5e53a6c8 a66500f7

pkgs/by-name/no/noto-fonts-color-emoji/package.nix

+3 −9
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/development/python-modules/nototools/default.nix→pkgs/by-name/no/nototools/package.nix

+11 −38
Original line number Diff line number Diff line 
{

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



  pythonRemoveDeps = [

    # https://github.com/notofonts/nototools/pull/901

    "typed-ast"

  ];



  propagatedBuildInputs = [

  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

  ];

pkgs/by-name/tw/twitter-color-emoji/package.nix

+3 −9
Original line number Diff line number Diff line
@@ -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

  ];

pkgs/by-name/wh/whatsapp-emoji-font/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

  ];

pkgs/development/python-modules/aiosonic/default.nix

+0 −27
Original line number Diff line number Diff line
@@ -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" ];