From 6c82ba40136f0191f53a31d69def74c4a3b0a8ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 9 Jul 2024 07:47:38 -0700 Subject: [PATCH 1/2] Revert "python312Packages.xlib: disable tests for python 3.12" This reverts commit e0e95085aeb1d2bc0f67f02c14526010aa1cf66c. --- pkgs/development/python-modules/xlib/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index aef20fb59e26..d01c81883e54 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -8,7 +8,6 @@ setuptools-scm, xorg, python, - pythonOlder, mock, pynose, pytestCheckHook, @@ -35,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - doCheck = !stdenv.isDarwin && pythonOlder "3.12"; + doCheck = !stdenv.isDarwin; nativeCheckInputs = [ pytestCheckHook From 78f943535f499c87972213eb44943c915a5b31fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 9 Jul 2024 07:45:15 -0700 Subject: [PATCH 2/2] python312Packages.xlib: don't use nose --- pkgs/development/python-modules/xlib/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index d01c81883e54..97672413a4dd 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -9,7 +9,6 @@ xorg, python, mock, - pynose, pytestCheckHook, util-linux, }: @@ -39,7 +38,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook mock - pynose util-linux xorg.xauth xorg.xvfb