From 2dace638c971ad6190c59bc824a56915679aeb90 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 11 May 2023 20:35:48 +1000 Subject: [PATCH 1/4] python3Packages.assay: mark broken on python >= 3.11 https://github.com/brandon-rhodes/assay/issues/15 --- pkgs/development/python-modules/assay/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/assay/default.nix b/pkgs/development/python-modules/assay/default.nix index 37c4ccc9392f..881c4bbf730e 100644 --- a/pkgs/development/python-modules/assay/default.nix +++ b/pkgs/development/python-modules/assay/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonAtLeast }: buildPythonPackage rec { pname = "assay"; @@ -18,5 +18,6 @@ buildPythonPackage rec { description = "Attempt to write a Python testing framework I can actually stand"; license = licenses.mit; maintainers = with maintainers; [ zane ]; + broken = pythonAtLeast "3.11"; }; } From 86d5f06a67cf51898107ef6f2d7c4415cd856ed1 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 11 May 2023 20:31:18 +1000 Subject: [PATCH 2/4] python3Packages.skyfield: disable tests on python >= 3.11 --- pkgs/development/python-modules/skyfield/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix index 73e6ea9ed041..f56a7c8aad56 100644 --- a/pkgs/development/python-modules/skyfield/default.nix +++ b/pkgs/development/python-modules/skyfield/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, certifi, numpy, sgp4, jplephem +{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, certifi, numpy, sgp4, jplephem , pandas, ipython, matplotlib, assay }: @@ -17,6 +17,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pandas ipython matplotlib assay ]; + # assay is broken on Python >= 3.11 + # https://github.com/brandon-rhodes/assay/issues/15 + doCheck = pythonOlder "3.11"; + checkPhase = '' runHook preCheck From 34ed5eaaecf3f87b48d121823942a50de97044ce Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 11 May 2023 21:03:40 +1000 Subject: [PATCH 3/4] python3Packages.skyfield: 1.42 -> 1.45 --- pkgs/development/python-modules/skyfield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix index f56a7c8aad56..514ef4c00d18 100644 --- a/pkgs/development/python-modules/skyfield/default.nix +++ b/pkgs/development/python-modules/skyfield/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "skyfield"; - version = "1.42"; + version = "1.45"; src = fetchFromGitHub { owner = "skyfielders"; repo = "python-skyfield"; rev = version; - hash = "sha256-aoSkuLhZcEy+13EJQOBHV2/rgmN6aZQHqfj4OOirOG0="; + hash = "sha256-kZrXNVE+JGPGiVsd6CTwOqfciYLsD2A4pTS3FpqO+Dk="; }; propagatedBuildInputs = [ certifi numpy sgp4 jplephem ]; From 75acbc190e872cd72e7f8e785ca1d39d2c0aa1f0 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 11 May 2023 21:07:05 +1000 Subject: [PATCH 4/4] python3Packages.skyfield: work-around broken tests on aarch64 --- pkgs/development/python-modules/skyfield/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix index 514ef4c00d18..9b6d92e217d6 100644 --- a/pkgs/development/python-modules/skyfield/default.nix +++ b/pkgs/development/python-modules/skyfield/default.nix @@ -13,6 +13,13 @@ buildPythonPackage rec { hash = "sha256-kZrXNVE+JGPGiVsd6CTwOqfciYLsD2A4pTS3FpqO+Dk="; }; + # Fix broken tests on "exotic" platforms. + # https://github.com/skyfielders/python-skyfield/issues/582#issuecomment-822033858 + postPatch = '' + substituteInPlace skyfield/tests/test_planetarylib.py \ + --replace "if IS_32_BIT" "if True" + ''; + propagatedBuildInputs = [ certifi numpy sgp4 jplephem ]; nativeCheckInputs = [ pandas ipython matplotlib assay ];