From 728ba61676f3cae8d38dd552f1543deb5ed46d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 22 Feb 2026 18:18:06 +0100 Subject: [PATCH] Revert "python313Packages: don't apply the previous three commits yet" This reverts commit 73688f666f7a3e09e96b338092aa9a7437459a7e. --- pkgs/development/python-modules/cmd2/default.nix | 9 ++------- .../development/python-modules/rich-argparse/default.nix | 3 --- pkgs/development/python-modules/rich/default.nix | 9 ++------- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index a8716b17f91d..464b1187d40d 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -12,21 +12,16 @@ rich-argparse, setuptools-scm, wcwidth, - python, }: buildPythonPackage rec { pname = "cmd2"; - version = if python.isPy313 then "3.1.0" else "3.2.1"; + version = "3.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = - if python.isPy313 then - "sha256-zOOuzgGLCxBVmIraoraHrJwd84v9Kr/Cnb61GpcH3jM=" - else - "sha256-bGNyobJs0Uu2IJZTyJ1zAP58FDno3KMPW2tv/bXyFPo="; + hash = "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 d7bbc910a363..bec5f717d606 100644 --- a/pkgs/development/python-modules/rich-argparse/default.nix +++ b/pkgs/development/python-modules/rich-argparse/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - python, fetchFromGitHub, hatchling, pytestCheckHook, @@ -29,8 +28,6 @@ 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 8c0e9f34b409..78ad8add1fd9 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - python, # build-system poetry-core, @@ -28,18 +27,14 @@ buildPythonPackage rec { pname = "rich"; - version = if python.isPy313 then "14.2.0" else "14.3.3"; + version = "14.3.3"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "rich"; tag = "v${version}"; - hash = - if python.isPy313 then - "sha256-oQbxRbZnVr/Ln+i/hpBw5FlpUp3gcp/7xsxi6onPkn8=" - else - "sha256-6udVO7N17ineQozlCG/tI9jJob811gqb4GtY50JZFb0="; + hash = "sha256-6udVO7N17ineQozlCG/tI9jJob811gqb4GtY50JZFb0="; }; build-system = [ poetry-core ];