diff --git a/pkgs/development/python-modules/nicegui/default.nix b/pkgs/development/python-modules/nicegui/default.nix index 287d71e36deb..4db5c9ee06aa 100644 --- a/pkgs/development/python-modules/nicegui/default.nix +++ b/pkgs/development/python-modules/nicegui/default.nix @@ -43,17 +43,20 @@ buildPythonPackage (finalAttrs: { pname = "nicegui"; - version = "3.6.1"; + version = "3.7.1"; pyproject = true; src = fetchFromGitHub { owner = "zauberzeug"; repo = "nicegui"; tag = "v${finalAttrs.version}"; - hash = "sha256-umM2ffkiXWJVU2i17fbtnd+ghEt0uVzop9fNhaRTCWM="; + hash = "sha256-+hZUGRHK51x4nlcbOOGbW15U6YZgKsxuzZPBad9mjXA="; }; - pythonRelaxDeps = [ "requests" ]; + pythonRelaxDeps = [ + "orjson" + "requests" + ]; build-system = [ poetry-core diff --git a/pkgs/development/python-modules/vbuild/default.nix b/pkgs/development/python-modules/vbuild/default.nix index 980f0ac52d57..44159eac510b 100644 --- a/pkgs/development/python-modules/vbuild/default.nix +++ b/pkgs/development/python-modules/vbuild/default.nix @@ -8,7 +8,7 @@ pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "vbuild"; version = "0.8.2"; pyproject = true; @@ -16,16 +16,20 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "manatlan"; repo = "vbuild"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-p9v1FiYn0cI+f/25hvjwm7eb1GqxXvNnmXBGwZe9fk0="; }; postPatch = '' # Switch to poetry-core, patch can't be applied, https://github.com/manatlan/vbuild/pull/12 substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' \ + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' \ --replace-fail 'requires = ["poetry>=0.12"]' 'requires = ["poetry-core>=1.0.0"]' \ --replace-fail 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"' + # https://github.com/manatlan/vbuild/commit/b9861bffd5d15491d5b5a4cb2a96bb71ceff0c35 is incomplete + substituteInPlace vbuild/__init__.py \ + --replace-fail ", pkgutil" ", importlib.util" \ + --replace-fail "pkgutil.find_loader" "importlib.util.find_spec" ''; pythonRelaxDeps = [ "pscript" ]; @@ -57,8 +61,8 @@ buildPythonPackage rec { meta = { description = "Module to compile your VueJS components to standalone HTML/JS/CSS"; homepage = "https://github.com/manatlan/vbuild"; - changelog = "https://github.com/manatlan/vbuild/blob/${src.rev}/changelog.md"; + changelog = "https://github.com/manatlan/vbuild/blob/${finalAttrs.src.rev}/changelog.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +})