diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 464b1187d40d..a8716b17f91d 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -12,16 +12,21 @@ rich-argparse, setuptools-scm, wcwidth, + python, }: buildPythonPackage rec { pname = "cmd2"; - version = "3.2.1"; + version = if python.isPy313 then "3.1.0" else "3.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bGNyobJs0Uu2IJZTyJ1zAP58FDno3KMPW2tv/bXyFPo="; + hash = + if python.isPy313 then + "sha256-zOOuzgGLCxBVmIraoraHrJwd84v9Kr/Cnb61GpcH3jM=" + else + "sha256-bGNyobJs0Uu2IJZTyJ1zAP58FDno3KMPW2tv/bXyFPo="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/rich-argparse/default.nix b/pkgs/development/python-modules/rich-argparse/default.nix index bec5f717d606..d7bbc910a363 100644 --- a/pkgs/development/python-modules/rich-argparse/default.nix +++ b/pkgs/development/python-modules/rich-argparse/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + python, fetchFromGitHub, hatchling, pytestCheckHook, @@ -28,6 +29,8 @@ buildPythonPackage rec { disabledTests = [ # coloring mismatch in fixture "test_subparsers_usage" + ] + ++ lib.optionals (!python.isPy313) [ # solid vs dash line mismatch "test_rich_renderables" ]; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 78ad8add1fd9..8c0e9f34b409 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + python, # build-system poetry-core, @@ -27,14 +28,18 @@ buildPythonPackage rec { pname = "rich"; - version = "14.3.3"; + version = if python.isPy313 then "14.2.0" else "14.3.3"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "rich"; tag = "v${version}"; - hash = "sha256-6udVO7N17ineQozlCG/tI9jJob811gqb4GtY50JZFb0="; + hash = + if python.isPy313 then + "sha256-oQbxRbZnVr/Ln+i/hpBw5FlpUp3gcp/7xsxi6onPkn8=" + else + "sha256-6udVO7N17ineQozlCG/tI9jJob811gqb4GtY50JZFb0="; }; build-system = [ poetry-core ];