diff --git a/pkgs/by-name/de/devtoolbox/package.nix b/pkgs/by-name/de/devtoolbox/package.nix index 85ea3b387653..3b19da0d9b3f 100644 --- a/pkgs/by-name/de/devtoolbox/package.nix +++ b/pkgs/by-name/de/devtoolbox/package.nix @@ -20,16 +20,17 @@ }: python3Packages.buildPythonApplication rec { pname = "devtoolbox"; - version = "1.2.5"; + version = "1.3.0"; pyproject = false; # uses meson src = fetchFromGitHub { owner = "aleiepure"; repo = "devtoolbox"; tag = "v${version}"; - hash = "sha256-CgpSZvpwBKo2gzp2QbBPFBK0tPhqKFC/DxXdmTWVAwc="; + hash = "sha256-ReF70pNMrMweEB4WAGQT++9TxTN4gV1olln7Y6YWCis="; }; + # test after update postPatch = '' substituteInPlace src/views/reverse_cron.py \ --replace-fail '"\D"' 'r"\D"' @@ -80,6 +81,8 @@ python3Packages.buildPythonApplication rec { python-dateutil rcssmin rjsmin + cryptography + color-parser-py ]; dontWrapGApps = true; diff --git a/pkgs/development/python-modules/color-parser-py/default.nix b/pkgs/development/python-modules/color-parser-py/default.nix new file mode 100644 index 000000000000..9f4ae2bc0b00 --- /dev/null +++ b/pkgs/development/python-modules/color-parser-py/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + rustPlatform, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "color-parser-py"; + version = "0.1.6"; + pyproject = true; + + # PyPI has Cargo.lock + src = fetchPypi { + pname = "color_parser_py"; + inherit version; + hash = "sha256-m1qhVAwQNtCwz+DLSAdfKhzkohMLMjvPHxynKhlJfN8="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-tKXA6sd5gLCJUaqxzFcZ3lePK41Wk2TbLp0HXBacOyo="; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "color_parser_py" ]; + + # Support newer python versions + env.PYO3_USE_ABI3_FORWARD_COMPATIBILITY = true; + + meta = { + description = "Python bindings for color parsing and conversion"; + homepage = "https://github.com/rusiaaman/color-parser-py"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 577faeab5382..89bf114d0d00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2763,6 +2763,8 @@ self: super: with self; { color-operations = callPackage ../development/python-modules/color-operations { }; + color-parser-py = callPackage ../development/python-modules/color-parser-py { }; + colorama = callPackage ../development/python-modules/colorama { }; colorcet = callPackage ../development/python-modules/colorcet { };