Merge pull request #317143 from TakWolf/ark-pixel-deps

ark-pixel-font: dependencies update and fix

maintainers/maintainer-list.nix

@@ -19560,6 +19560,12 @@
     githubId = 870673;
     name = "Takuo Yonezawa";
   };
+  TakWolf = {
+    email = "takwolf@foxmail.com";
+    github = "TakWolf";
+    githubId = 6064962;
+    name = "TakWolf";
+  };
   talkara = {
     email = "taito.horiuchi@relexsolutions.com";
     github = "talkara";

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

@@ -2,42 +2,41 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pytestCheckHook,
   pythonOlder,
+  pytestCheckHook,
   nix-update-script,
-  hatch-vcs,
   hatchling,
-  brotli,
-  fonttools,
 }:
 
 buildPythonPackage rec {
   pname = "bdffont";
   version = "0.0.26";
+  pyproject = true;
 
-  disabled = pythonOlder "3.11";
+  disabled = pythonOlder "3.10";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "bdffont";
+    inherit version;
     hash = "sha256-Q8IqwJmAYFicTX7RrVU9UvGZX+oaPb0RKlIFwArktXk=";
   };
 
-  format = "pyproject";
+  build-system = [ hatchling ];
-
-  nativeBuildInputs = [
-    hatch-vcs
-    hatchling
-  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  pythonImportsCheck = [ "bdffont" ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
     homepage = "https://github.com/TakWolf/bdffont";
-    description = "Library for manipulating .bdf format fonts";
+    description = "A library for manipulating Glyph Bitmap Distribution Format (BDF) Fonts";
     platforms = lib.platforms.all;
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ h7x4 ];
+    maintainers = with lib.maintainers; [
+      TakWolf
+      h7x4
+    ];
   };
 }

pkgs/development/python-modules/character-encoding-utils/default.nix

@@ -2,10 +2,10 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  hatch-vcs,
-  hatchling,
-  pytestCheckHook,
   pythonOlder,
+  pytestCheckHook,
+  nix-update-script,
+  hatchling,
 }:
 
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   version = "0.0.8";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
+  disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     pname = "character_encoding_utils";
@@ -21,19 +21,22 @@ buildPythonPackage rec {
     hash = "sha256-UXX4L/x7fP37ZEFDCPc0KRNyx47xvwY0Jz+lfxzUulg=";
   };
 
-  build-system = [
+  build-system = [ hatchling ];
-    hatch-vcs
-    hatchling
-  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "character_encoding_utils" ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
-    description = "Some character encoding utils";
     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 ];
+    maintainers = with lib.maintainers; [
+      TakWolf
+      h7x4
+    ];
   };
 }

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

@@ -1,11 +1,12 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
+  fetchPypi,
-  hatchling,
+  pythonOlder,
-  bdffont,
   pytestCheckHook,
   nix-update-script,
+  hatchling,
+  bdffont,
 }:
 
 buildPythonPackage rec {
@@ -13,11 +14,12 @@ buildPythonPackage rec {
   version = "0.0.14";
   pyproject = true;
 
-  src = fetchFromGitHub {
+  disabled = pythonOlder "3.10";
-    owner = "TakWolf";
+
-    repo = "pcffont";
+  src = fetchPypi {
-    rev = "refs/tags/${version}";
+    pname = "pcffont";
-    hash = "sha256-UIRhUlsRd3ICdLAjUasQ1NX5NofSKCEqa8cf1c1voGM=";
+    inherit version;
+    hash = "sha256-S3mK4tY7zNGRX8K81QJVvaYpIaTDLx5zn4vKbhrK9VM=";
   };
 
   build-system = [ hatchling ];
@@ -31,9 +33,13 @@ buildPythonPackage rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "Library for manipulating Portable Compiled Format (PCF) fonts";
     homepage = "https://github.com/TakWolf/pcffont";
+    description = "A library for manipulating Portable Compiled Format (PCF) Fonts";
+    platforms = lib.platforms.all;
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [
+      TakWolf
+      h7x4
+    ];
   };
 }

pkgs/development/python-modules/pixel-font-builder/default.nix

@@ -2,17 +2,15 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pytestCheckHook,
   pythonOlder,
+  pytestCheckHook,
   nix-update-script,
-  hatch-vcs,
   hatchling,
-  bdffont,
-  brotli,
   fonttools,
-  pypng,
+  brotli,
+  bdffont,
   pcffont,
-  pythonRelaxDepsHook,
+  pypng,
 }:
 
 buildPythonPackage rec {
@@ -28,26 +26,19 @@ buildPythonPackage rec {
     hash = "sha256-66mGZ7q64z+tTJSSveD7UCkTq7YXgsHTM25MqUSLfvM=";
   };
 
-  pythonRelaxDeps = [ "fonttools" ];
+  build-system = [ hatchling ];
 
-  nativeBuildInputs = [ pythonRelaxDepsHook ];
+  dependencies = [
-
+    fonttools
-  build-system = [
+    brotli
-    hatch-vcs
+    bdffont
-    hatchling
+    pcffont
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
     pypng
   ];
 
-  dependencies = [
+  nativeCheckInputs = [ pytestCheckHook ];
-    bdffont
+
-    brotli
+  pythonImportsCheck = [ "pixel_font_builder" ];
-    fonttools
-    pcffont
-  ];
 
   passthru.updateScript = nix-update-script { };
 
@@ -56,6 +47,9 @@ buildPythonPackage rec {
     description = "Library that helps create pixel style fonts";
     platforms = lib.platforms.all;
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ h7x4 ];
+    maintainers = with lib.maintainers; [
+      TakWolf
+      h7x4
+    ];
   };
 }

pkgs/development/python-modules/unidata-blocks/default.nix

@@ -2,10 +2,9 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pytestCheckHook,
   pythonOlder,
+  pytestCheckHook,
   nix-update-script,
-  hatch-vcs,
   hatchling,
   langcodes,
 }:
@@ -13,8 +12,9 @@
 buildPythonPackage rec {
   pname = "unidata-blocks";
   version = "0.0.10";
+  pyproject = true;
 
-  disabled = pythonOlder "3.11";
+  disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     pname = "unidata_blocks";
@@ -22,17 +22,16 @@ buildPythonPackage rec {
     hash = "sha256-wwiOjfIAx6AZtK98uuPQ0jwblq+CdnMQp+JkQWh+RgM=";
   };
 
-  format = "pyproject";
+  build-system = [ hatchling ];
 
-  nativeBuildInputs = [
+  dependencies = [
-    hatch-vcs
+    langcodes
-    hatchling
   ];
 
-  propagatedBuildInputs = [ langcodes ];
-
   nativeCheckInputs = [ pytestCheckHook ];
 
+  pythonImportsCheck = [ "unidata_blocks" ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
@@ -40,6 +39,9 @@ buildPythonPackage rec {
     description = "Library that helps query unicode blocks by Blocks.txt";
     platforms = lib.platforms.all;
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ h7x4 ];
+    maintainers = with lib.maintainers; [
+      TakWolf
+      h7x4
+    ];
   };
 }