From 94ee620a3f79064e2615a208cc053894c4c1abcc Mon Sep 17 00:00:00 2001 From: TakWolf Date: Fri, 7 Jun 2024 19:25:30 +0800 Subject: python311Packages.unidata-blocks: set python 3.10 --- .../python-modules/unidata-blocks/default.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix index 63752e22d462a..fc71e13c306b5 100644 --- a/pkgs/development/python-modules/unidata-blocks/default.nix +++ b/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 = [ - hatch-vcs - hatchling + dependencies = [ + langcodes ]; - 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 + ]; }; } -- cgit 1.4.1 From 7fc47397703245060db05bd640d62fea8a07c8cc Mon Sep 17 00:00:00 2001 From: TakWolf Date: Fri, 7 Jun 2024 19:26:18 +0800 Subject: python311Packages.character-encoding-utils: set python 3.10 --- .../character-encoding-utils/default.nix | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/character-encoding-utils/default.nix b/pkgs/development/python-modules/character-encoding-utils/default.nix index a677d8999e375..83d01916d3c63 100644 --- a/pkgs/development/python-modules/character-encoding-utils/default.nix +++ b/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 = [ - hatch-vcs - hatchling - ]; + build-system = [ 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 + ]; }; } -- cgit 1.4.1 From 759d6dcd3ea6801b1e3db758aece4b9a10582250 Mon Sep 17 00:00:00 2001 From: TakWolf Date: Fri, 7 Jun 2024 19:26:45 +0800 Subject: python311Packages.bdffont: set python 3.10 --- .../development/python-modules/bdffont/default.nix | 27 +++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix index 87e4ef29b81b2..c4ac42a60452f 100644 --- a/pkgs/development/python-modules/bdffont/default.nix +++ b/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"; - - nativeBuildInputs = [ - hatch-vcs - hatchling - ]; + build-system = [ 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 + ]; }; } -- cgit 1.4.1 From e617f54ca2979c3f62571c7bcd4dc586bbcf3d68 Mon Sep 17 00:00:00 2001 From: TakWolf Date: Fri, 7 Jun 2024 19:27:32 +0800 Subject: python311Packages.pcffont: use fetchPypi --- .../development/python-modules/pcffont/default.nix | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pcffont/default.nix b/pkgs/development/python-modules/pcffont/default.nix index 30c0c05cae0ef..0f5a49c0692fe 100644 --- a/pkgs/development/python-modules/pcffont/default.nix +++ b/pkgs/development/python-modules/pcffont/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, - fetchFromGitHub, - hatchling, - bdffont, + fetchPypi, + pythonOlder, pytestCheckHook, nix-update-script, + hatchling, + bdffont, }: buildPythonPackage rec { @@ -13,11 +14,12 @@ buildPythonPackage rec { version = "0.0.14"; pyproject = true; - src = fetchFromGitHub { - owner = "TakWolf"; - repo = "pcffont"; - rev = "refs/tags/${version}"; - hash = "sha256-UIRhUlsRd3ICdLAjUasQ1NX5NofSKCEqa8cf1c1voGM="; + disabled = pythonOlder "3.10"; + + src = fetchPypi { + pname = "pcffont"; + 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 + ]; }; } -- cgit 1.4.1 From 689caa9b0d1b23899d20ced7f5462b1610d01d3c Mon Sep 17 00:00:00 2001 From: TakWolf Date: Fri, 7 Jun 2024 19:28:27 +0800 Subject: python311Packages.pixel-font-builder: cleanup --- .../python-modules/pixel-font-builder/default.nix | 38 +++++++++------------- 1 file changed, 16 insertions(+), 22 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix index 7033179d7370b..e30f7c93d32e5 100644 --- a/pkgs/development/python-modules/pixel-font-builder/default.nix +++ b/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,27 +26,20 @@ buildPythonPackage rec { hash = "sha256-66mGZ7q64z+tTJSSveD7UCkTq7YXgsHTM25MqUSLfvM="; }; - pythonRelaxDeps = [ "fonttools" ]; - - nativeBuildInputs = [ pythonRelaxDepsHook ]; - - build-system = [ - hatch-vcs - hatchling - ]; - - nativeCheckInputs = [ - pytestCheckHook - pypng - ]; + build-system = [ hatchling ]; dependencies = [ - bdffont - brotli fonttools + brotli + bdffont pcffont + pypng ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pixel_font_builder" ]; + passthru.updateScript = nix-update-script { }; meta = { @@ -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 + ]; }; } -- cgit 1.4.1