From ce2b64a6e2f3825e95eaa683c0733f1073d9d8d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 Apr 2026 21:16:34 -0700 Subject: [PATCH 1/2] python3Packages.encutils: init at 1.0.0 --- .../python-modules/encutils/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/encutils/default.nix diff --git a/pkgs/development/python-modules/encutils/default.nix b/pkgs/development/python-modules/encutils/default.nix new file mode 100644 index 000000000000..37f91db5a007 --- /dev/null +++ b/pkgs/development/python-modules/encutils/default.nix @@ -0,0 +1,39 @@ +{ + buildPythonPackage, + chardet, + fetchPypi, + flit-core, + lib, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "encutils"; + version = "1.0.0"; + pyproject = true; + + # pyproject.toml on GitHub uses coherent.build as build-system + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-OOylrxjOur2L5DwX8UydP7uoPMX3rI46schuJMSyuRo="; + }; + + build-system = [ flit-core ]; + + dependencies = [ + chardet + ]; + + pythonImportsCheck = [ "encutils" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Collection of helper functions to detect encodings of text files"; + homepage = "https://github.com/coherent-oss/encutils"; + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.dotlambda ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c14b91280b61..74d7d715d049 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5016,6 +5016,8 @@ self: super: with self; { encodec = callPackage ../development/python-modules/encodec { }; + encutils = callPackage ../development/python-modules/encutils { }; + energyflip-client = callPackage ../development/python-modules/energyflip-client { }; energyflow = callPackage ../development/python-modules/energyflow { }; From 3ad1b95f6ee276da9aec24e35f42d6eec785198d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 Apr 2026 21:07:50 -0700 Subject: [PATCH 2/2] python3Packages.cssutils: 2.11.1 -> 2.14.0 Diff: https://github.com/jaraco/cssutils/compare/v2.11.1...v2.14.0 Changelog: https://github.com/jaraco/cssutils/blob/refs/tags/v2.14.0/NEWS.rst --- .../python-modules/cssutils/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index 1cc7266a5e85..9d38d4398146 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, setuptools-scm, + encutils, more-itertools, cssselect, jaraco-test, @@ -13,19 +14,27 @@ buildPythonPackage rec { pname = "cssutils"; - version = "2.11.1"; + version = "2.14.0"; pyproject = true; src = fetchFromGitHub { owner = "jaraco"; repo = "cssutils"; tag = "v${version}"; - hash = "sha256-U9myMfKz1HpYVJXp85izRBpm2wjLHYZj8bUVt3ROTEg="; + hash = "sha256-kuqHfwJn+GT1VIC2PWu5Oj1X6SGn/bi2QPN8kfposVs="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"coherent.licensed",' "" + ''; + build-system = [ setuptools-scm ]; - dependencies = [ more-itertools ]; + dependencies = [ + encutils + more-itertools + ]; nativeCheckInputs = [ cssselect @@ -37,7 +46,6 @@ buildPythonPackage rec { disabledTests = [ # access network - "encutils" "website.logging" ];