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" ]; 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 70b29fde8d70..f4e952aff467 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 { };