From af75c89f483ef07b598e47006e5859cf8835f35f Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 22 Aug 2023 19:59:24 +0200 Subject: [PATCH 1/7] python3Packages.bdffont: init at 0.0.14 --- .../python-modules/bdffont/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/bdffont/default.nix diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix new file mode 100644 index 000000000000..42b30482ef39 --- /dev/null +++ b/pkgs/development/python-modules/bdffont/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, nix-update-script +, hatch-vcs +, hatchling +, brotli +, fonttools +}: + +buildPythonPackage rec { + pname = "bdffont"; + version = "0.0.14"; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-kDFod0+G05yNgEiAUF0Xm1xelxp2L44LDjQ2LYed3RA="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/TakWolf/bdffont"; + description = "A library for manipulating .bdf format fonts"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b743179d7018..51b1e71a08f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1360,6 +1360,8 @@ self: super: with self; { else callPackage ../development/python-modules/bcrypt { }; + bdffont = callPackage ../development/python-modules/bdffont { }; + beaker = callPackage ../development/python-modules/beaker { }; before-after = callPackage ../development/python-modules/before-after { }; From 09640dbaeb7c4535bf6aaaadbc6c3e1a5365c5bd Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 22 Aug 2023 19:59:55 +0200 Subject: [PATCH 2/7] python3Packages.character-encoding-utils: init at 0.0.6 --- .../character-encoding-utils/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/character-encoding-utils/default.nix diff --git a/pkgs/development/python-modules/character-encoding-utils/default.nix b/pkgs/development/python-modules/character-encoding-utils/default.nix new file mode 100644 index 000000000000..dd0e3b60fe1f --- /dev/null +++ b/pkgs/development/python-modules/character-encoding-utils/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, nix-update-script +, hatch-vcs +, hatchling +}: + +buildPythonPackage rec { + pname = "character-encoding-utils"; + version = "0.0.6"; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + pname = "character_encoding_utils"; + inherit version; + hash = "sha256-ugzWiSpa/xxlraVyVPTSq/uxPg11kOyePgb1cmzX3ug="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + checkInputs = [ pytestCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/TakWolf/character-encoding-utils"; + description = "Some character encoding utils"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51b1e71a08f6..33e39afafe96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1946,6 +1946,8 @@ self: super: with self; { characteristic = callPackage ../development/python-modules/characteristic { }; + character-encoding-utils = callPackage ../development/python-modules/character-encoding-utils { }; + chardet = callPackage ../development/python-modules/chardet { }; charset-normalizer = callPackage ../development/python-modules/charset-normalizer { }; From e64bc6f37f72fd12fa14aa667a6c1436caeab36b Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 22 Aug 2023 20:01:32 +0200 Subject: [PATCH 3/7] python3Packages.unidata-blocks: init at 0.0.6 --- .../python-modules/unidata-blocks/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/unidata-blocks/default.nix diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix new file mode 100644 index 000000000000..9263c2eb89b4 --- /dev/null +++ b/pkgs/development/python-modules/unidata-blocks/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, nix-update-script +, hatch-vcs +, hatchling +, langcodes +}: + +buildPythonPackage rec { + pname = "unidata-blocks"; + version = "0.0.6"; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + pname = "unidata_blocks"; + inherit version; + hash = "sha256-YtIqd5Z4lQdPMNHhQYIdSi741ruXJlqLHLw1pxXhjWc="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ langcodes ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/TakWolf/unidata-blocks"; + description = "A library that helps query unicode blocks by Blocks.txt"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33e39afafe96..94fa5ed4ab1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15262,6 +15262,8 @@ self: super: with self; { unicrypto = callPackage ../development/python-modules/unicrypto { }; + unidata-blocks = callPackage ../development/python-modules/unidata-blocks { }; + unidecode = callPackage ../development/python-modules/unidecode { }; unidic = callPackage ../development/python-modules/unidic { }; From ca98c93050b20d92248cb49efebeee54420b39da Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 22 Aug 2023 20:02:15 +0200 Subject: [PATCH 4/7] python3Packages.pixel-font-builder: init at 0.0.10 --- .../pixel-font-builder/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/pixel-font-builder/default.nix diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix new file mode 100644 index 000000000000..d541cd00dc5a --- /dev/null +++ b/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, nix-update-script +, hatch-vcs +, hatchling +, bdffont +, brotli +, fonttools +, pypng +}: + +buildPythonPackage rec { + pname = "pixel-font-builder"; + version = "0.0.10"; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + pname = "pixel_font_builder"; + inherit version; + hash = "sha256-evLsNRSC9sPZfhNc8tYbZ/bIrBxSbLuiGRD3ld7Jkbo="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + nativeCheckInputs = [ + pytestCheckHook + pypng + ]; + + propagatedBuildInputs = [ + bdffont + brotli + fonttools + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/TakWolf/pixel-font-builder"; + description = "A library that helps create pixel style fonts"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94fa5ed4ab1b..f92b3855070b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9123,6 +9123,8 @@ self: super: with self; { pixelmatch = callPackage ../development/python-modules/pixelmatch { }; + pixel-font-builder = callPackage ../development/python-modules/pixel-font-builder { }; + pixel-ring = callPackage ../development/python-modules/pixel-ring { }; pjsua2 = (toPythonModule (pkgs.pjsip.override { From a0520c4483c6b9bd3d115fd05500c9d0e2b977ec Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 22 Aug 2023 20:02:59 +0200 Subject: [PATCH 5/7] ark-pixel-font: init at 2023.08.15 --- pkgs/by-name/ar/ark-pixel-font/package.nix | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/ar/ark-pixel-font/package.nix diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix new file mode 100644 index 000000000000..f5ffd4f9b2c6 --- /dev/null +++ b/pkgs/by-name/ar/ark-pixel-font/package.nix @@ -0,0 +1,60 @@ +{ lib +, python3Packages +, fetchFromGitHub +, nix-update-script +, ... +}: + +python3Packages.buildPythonPackage rec { + pname = "ark-pixel-font"; + version = "2023.08.15"; + + src = fetchFromGitHub { + owner = "TakWolf"; + repo = pname; + rev = version; + hash = "sha256-Qaa3uuMCPrRG0wo2AGU0v+fonY1c/KuQYTGoyvITcio="; + }; + + format = "other"; + + nativeBuildInputs = with python3Packages; [ + pixel-font-builder + unidata-blocks + character-encoding-utils + pypng + pillow + beautifulsoup4 + jinja2 + gitpython + ]; + + buildPhase = '' + runHook preBuild + + python build.py + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm444 build/outputs/*.bdf -t $out/share/fonts/bdf + install -Dm444 build/outputs/*.otf -t $out/share/fonts/opentype + install -Dm444 build/outputs/*.ttf -t $out/share/fonts/truetype + install -Dm444 build/outputs/*.woff2 -t $out/share/fonts/woff2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Open source pan-CJK pixel font"; + homepage = "https://ark-pixel-font.takwolf.com/"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ h7x4 ]; + platforms = lib.platforms.all; + }; +} From 6893d1929ef162d564a241195ced487362f5b362 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Wed, 15 Nov 2023 11:32:45 +0100 Subject: [PATCH 6/7] python3Packages.bdffont: 0.0.14 -> 0.0.15 --- pkgs/development/python-modules/bdffont/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix index 42b30482ef39..e9e0595f3f15 100644 --- a/pkgs/development/python-modules/bdffont/default.nix +++ b/pkgs/development/python-modules/bdffont/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "bdffont"; - version = "0.0.14"; + version = "0.0.15"; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-kDFod0+G05yNgEiAUF0Xm1xelxp2L44LDjQ2LYed3RA="; + hash = "sha256-aXK6zqLFfqLXa/JLmSSW3gtC2+wtutz3/lLdYPZZ/ys="; }; format = "pyproject"; From d14d14abbb0e2bbf1067adb1de085f1ba3875497 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Wed, 15 Nov 2023 11:36:46 +0100 Subject: [PATCH 7/7] python3Packages.unidata-blocks: 0.0.6 -> 0.0.8 --- pkgs/development/python-modules/unidata-blocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix index 9263c2eb89b4..cded041c46b8 100644 --- a/pkgs/development/python-modules/unidata-blocks/default.nix +++ b/pkgs/development/python-modules/unidata-blocks/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "unidata-blocks"; - version = "0.0.6"; + version = "0.0.8"; disabled = pythonOlder "3.11"; src = fetchPypi { pname = "unidata_blocks"; inherit version; - hash = "sha256-YtIqd5Z4lQdPMNHhQYIdSi741ruXJlqLHLw1pxXhjWc="; + hash = "sha256-Y7OSFuPHgzNc/KtmBWwdVqH7Xy4v4w2UGHBUF9pIuSU="; }; format = "pyproject";