diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index ca7397598269e..f6194970adbd0 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rich"; - version = "10.16.2"; + version = "11.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SVenprbWq+ucQPAM1e9sNVYWbGAeo7qdEBy+cvqAMK8="; + sha256 = "0vkwar22rv1j6a3kqj3c016j0vnnha0kwi79fkd90ib1n501m7rn"; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix index 9759443228d05..13c8107c9aef4 100644 --- a/pkgs/development/python-modules/surepy/default.nix +++ b/pkgs/development/python-modules/surepy/default.nix @@ -33,7 +33,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'aiohttp = {extras = ["speedups"], version = "^3.7.4"}' 'aiohttp = {extras = ["speedups"], version = ">=3.7.4"}' \ - --replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1"' + --replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1"' \ + --replace 'rich = "^10.1.0"' 'rich = ">=10.1.0"' ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix index bdea03896cb58..4e8c1431cc182 100644 --- a/pkgs/development/python-modules/treex/default.nix +++ b/pkgs/development/python-modules/treex/default.nix @@ -27,9 +27,12 @@ buildPythonPackage rec { sha256 = "1hl3wj71c7cp7jzkhyjy7xgs2vc8c89icq0bgfr49y4pwv69n43m"; }; - patches = [ - ./relax-deps.patch - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'rich = "^10.7.0"' 'rich = ">=10.7.0"' \ + --replace 'PyYAML = "^5.4.1"' 'PyYAML = ">=5.4.1"' \ + --replace 'optax = "^0.0.9"' 'optax = ">=0.0.9"' + ''; nativeBuildInputs = [ poetry-core diff --git a/pkgs/development/python-modules/treex/relax-deps.patch b/pkgs/development/python-modules/treex/relax-deps.patch deleted file mode 100644 index 347098a4a6d1b..0000000000000 --- a/pkgs/development/python-modules/treex/relax-deps.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index f0ff8a0..56787ca 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -16,9 +16,9 @@ secondary = true - [tool.poetry.dependencies] - python = "^3.7" - flax = "^0.3.4" --PyYAML = "^5.4.1" -+PyYAML = ">=5.4.1" - rich = "^10.7.0" --optax = "^0.0.9" -+optax = ">=0.0.9" - einops = "^0.3.2" - treeo = "^0.0.9" - # treeo = { path = "../treeo", develop = true }