From 4fc3e2c4aa4a703e61e2f32d17616c071b8b5348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 7 Apr 2023 21:16:58 +0200 Subject: [PATCH] python310Packages.yasi: don't mix python versions --- pkgs/development/python-modules/yasi/default.nix | 12 +++++++++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/yasi/default.nix b/pkgs/development/python-modules/yasi/default.nix index 00eb1937fe8c..8759e499b639 100644 --- a/pkgs/development/python-modules/yasi/default.nix +++ b/pkgs/development/python-modules/yasi/default.nix @@ -1,9 +1,11 @@ { lib -, python3 +, buildPythonApplication +, colorama , fetchFromGitHub +, pytestCheckHook }: -python3.pkgs.buildPythonApplication rec { +buildPythonApplication rec { pname = "yasi"; version = "2.1.2"; format = "setuptools"; @@ -15,10 +17,14 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-xKhVTmh/vrtBkatxtk8R4yqbGroH0I+xTKNYUpuikt4="; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ colorama ]; + nativeBuildInputs = [ + pytestCheckHook + ]; + postPatch = '' substituteInPlace setup.py \ --replace "test.test_yasi" "tests.test_yasi" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91ad3ac0646e..140f0ad7650d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12846,7 +12846,7 @@ self: super: with self; { yarl = callPackage ../development/python-modules/yarl { }; - yasi = toPythonModule (callPackage ../development/python-modules/yasi { }); + yasi = callPackage ../development/python-modules/yasi { }; yaspin = callPackage ../development/python-modules/yaspin { };