From 9edc36f2c261064d5383102d4bb86d0bdf3737a3 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 4 May 2025 12:43:30 +0200 Subject: [PATCH 1/2] python312Packages.mpl-scatter-density: fix build --- .../mpl-scatter-density/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/mpl-scatter-density/default.nix b/pkgs/development/python-modules/mpl-scatter-density/default.nix index 269425357b5f..2c8c5c0f64aa 100644 --- a/pkgs/development/python-modules/mpl-scatter-density/default.nix +++ b/pkgs/development/python-modules/mpl-scatter-density/default.nix @@ -1,9 +1,9 @@ { lib, + stdenv, buildPythonPackage, pytestCheckHook, fetchFromGitHub, - fetchpatch, pythonOlder, setuptools-scm, setuptools, @@ -12,12 +12,13 @@ numpy, wheel, pytest-mpl, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "mpl-scatter-density"; version = "0.8"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -28,15 +29,6 @@ buildPythonPackage rec { sha256 = "sha256-pDiKJAN/4WFf5icNU/ZGOvw0jqN3eGZHgilm2oolpbE="; }; - patches = [ - # https://github.com/astrofrog/mpl-scatter-density/pull/37 - (fetchpatch { - name = "distutils-removal.patch"; - url = "https://github.com/ifurther/mpl-scatter-density/commit/6feedabe1e82da67d8eec46a80eb370d9f334251.patch"; - sha256 = "sha256-JqWlSm8mIwqjRPa+kMEaKipJyzGEO+gJK+Q045N1MXA="; - }) - ]; - nativeBuildInputs = [ setuptools setuptools-scm @@ -52,8 +44,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-mpl + writableTmpDirAsHomeHook ]; + # Need to set MPLBACKEND=agg for headless `matplotlib` on darwin. + # https://github.com/matplotlib/matplotlib/issues/26292 + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "agg"; + disabledTests = [ # AssertionError: (240, 240) != (216, 216) # Erroneous pinning of figure DPI, sensitive to runtime environment From ff51c326b64dfcfa3eaf97bdb400822ad010f072 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 4 May 2025 12:48:56 +0200 Subject: [PATCH 2/2] python312Packages.mpl-scatter-density: refactor --- .../python-modules/mpl-scatter-density/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mpl-scatter-density/default.nix b/pkgs/development/python-modules/mpl-scatter-density/default.nix index 2c8c5c0f64aa..f8b4444ec0d8 100644 --- a/pkgs/development/python-modules/mpl-scatter-density/default.nix +++ b/pkgs/development/python-modules/mpl-scatter-density/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, pytestCheckHook, fetchFromGitHub, - pythonOlder, setuptools-scm, setuptools, fast-histogram, @@ -20,22 +19,20 @@ buildPythonPackage rec { version = "0.8"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "astrofrog"; repo = pname; tag = "v${version}"; - sha256 = "sha256-pDiKJAN/4WFf5icNU/ZGOvw0jqN3eGZHgilm2oolpbE="; + hash = "sha256-pDiKJAN/4WFf5icNU/ZGOvw0jqN3eGZHgilm2oolpbE="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm wheel ]; - propagatedBuildInputs = [ + dependencies = [ matplotlib numpy fast-histogram