diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix index 15d3b4dd43f6..578552a03f13 100644 --- a/pkgs/by-name/ar/ark-pixel-font/package.nix +++ b/pkgs/by-name/ar/ark-pixel-font/package.nix @@ -6,13 +6,13 @@ python312Packages.buildPythonPackage rec { pname = "ark-pixel-font"; - version = "2024.04.05"; + version = "2024.05.12"; src = fetchFromGitHub { owner = "TakWolf"; - repo = pname; - rev = version; - hash = "sha256-G34cu/mSt/p8UPJt+Q1T2qy6d9LGgT1Jslt9syRz5eo="; + repo = "ark-pixel-font"; + rev = "refs/tags/${version}"; + hash = "sha256-PGhhKWHDpvOqa3vaI40wuIsAEdWGb62cN7QJeHQqiss="; }; format = "other"; diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix index f5cd8f943121..29cbe658db4d 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.20"; + version = "0.0.24"; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-T0gTtudsZmL0VZ3a3+C/v+dWAwbXUgf0PEdNtkxWROw="; + hash = "sha256-3HJwtBV78zsMUlmwJrPj74Vd5cru1zflvies5mNGcy4="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/pcffont/default.nix b/pkgs/development/python-modules/pcffont/default.nix new file mode 100644 index 000000000000..7c4c0ca54dd3 --- /dev/null +++ b/pkgs/development/python-modules/pcffont/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, bdffont +, pytestCheckHook +, nix-update-script +}: + +buildPythonPackage rec { + pname = "pcffont"; + version = "0.0.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "TakWolf"; + repo = "pcffont"; + rev = "refs/tags/${version}"; + hash = "sha256-gu9niWxYTw3rcA++z8B+MdKp5XaqAGjmvd+PdSDosfg="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + bdffont + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pcffont" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Library for manipulating Portable Compiled Format (PCF) fonts"; + homepage = "https://github.com/TakWolf/pcffont"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix index 0ef77bd5521c..d8908fe265ef 100644 --- a/pkgs/development/python-modules/pixel-font-builder/default.nix +++ b/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -10,23 +10,32 @@ , brotli , fonttools , pypng +, pcffont +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "pixel-font-builder"; - version = "0.0.19"; + version = "0.0.24"; + pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { pname = "pixel_font_builder"; inherit version; - hash = "sha256-f38DyM5hojHfv8k/W6kcHxbOjz43hHW6i4Scm6NbHiQ="; + hash = "sha256-hBlTTIPx4TRgeXapVnSaKPUwseR3uYT0gcgKLGmmSZI="; }; - format = "pyproject"; + pythonRelaxDeps = [ + "fonttools" + ]; nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + build-system = [ hatch-vcs hatchling ]; @@ -36,10 +45,11 @@ buildPythonPackage rec { pypng ]; - propagatedBuildInputs = [ + dependencies = [ bdffont brotli fonttools + pcffont ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1bd3efd6068d..6c411e20fd90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1338,6 +1338,8 @@ self: super: with self; { paddlepaddle = callPackage ../development/python-modules/paddlepaddle { }; + pcffont = callPackage ../development/python-modules/pcffont { }; + pueblo = callPackage ../development/python-modules/pueblo { }; pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; };