From e7ed54d44ef244e742e175e8ab449c09371348c9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 30 Jul 2022 04:20:00 +0000 Subject: [PATCH] python310Packages.rx: use fetchPypi Use fetchPypi to avoid the updater script to incorrectly migrate to `reactivex` which is being developed in the same repository. --- pkgs/development/python-modules/rx/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix index 5febbe9f9a9d..8d7277823a7b 100644 --- a/pkgs/development/python-modules/rx/default.nix +++ b/pkgs/development/python-modules/rx/default.nix @@ -1,16 +1,16 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, nose }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, nose }: buildPythonPackage rec { pname = "rx"; version = "3.2.0"; disabled = pythonOlder "3.6"; - # There are no tests on the pypi source - src = fetchFromGitHub { - owner = "ReactiveX"; - repo = "rxpy"; - rev = "v${version}"; - sha256 = "159ln0c721rrdz0mqyl3zvv6qsry7ql7ddlpwpnxs9q15ik15mnj"; + # Use fetchPypi to avoid the updater script to migrate it to `reactivex` which + # is being developed in the same repository + src = fetchPypi { + inherit version; + pname = "Rx"; + sha256 = "b657ca2b45aa485da2f7dcfd09fac2e554f7ac51ff3c2f8f2ff962ecd963d91c"; }; checkInputs = [ nose ]; @@ -20,6 +20,8 @@ buildPythonPackage rec { # test_new_thread_scheduler_timeout: https://hydra.nixos.org/build/74949851 doCheck = false; + pythonImportsCheck = [ "rx" ]; + meta = { homepage = "https://github.com/ReactiveX/RxPY"; description = "Reactive Extensions for Python";