From f804be29f971dae745c8fd61ba6a9f3205b98b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 Feb 2025 15:54:36 -0800 Subject: [PATCH] python313Packages.aplpy: drop superfluous patches --- .../python-modules/aplpy/default.nix | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix index 3b7f0a06ec8f..1be5e674d1e6 100644 --- a/pkgs/development/python-modules/aplpy/default.nix +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -17,15 +17,12 @@ setuptools, setuptools-scm, shapely, - wheel, }: buildPythonPackage rec { pname = "aplpy"; version = "2.2.0"; - format = "pyproject"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchPypi { pname = "aplpy"; @@ -33,37 +30,12 @@ buildPythonPackage rec { hash = "sha256-oUylUM7/6OyEJFrpkr9MjXilXC/ZIdBQ5au4cvyZiA0="; }; - # Fix build with Astropy 6.1, Python 3.12 and matplotlib 3.9 - patches = [ - # https://github.com/aplpy/aplpy/pull/496 - (fetchpatch { - url = "https://github.com/aplpy/aplpy/commit/d232a4984bc6a83ec86dfdc3ab3bc1b05de44c48.patch"; - hash = "sha256-jGUTzIrVdGNPy0BV8w46jzz045fDXBisiwIn90bn7oY="; - }) - # https://github.com/aplpy/aplpy/pull/497 - (fetchpatch { - url = "https://github.com/aplpy/aplpy/commit/468be394970b39f1aaa6debef51eb674e2dd86d8.patch"; - hash = "sha256-/ovLrFOKb3RQ8TZSviuOV6EYNgz0gtrhVWZLFJBrzFg="; - }) - # https://github.com/aplpy/aplpy/pull/500 - (fetchpatch { - url = "https://github.com/aplpy/aplpy/commit/c9049261b3724821f4d309d85fe73cabcc04d890.patch"; - hash = "sha256-ivdXLh1Z+WG3EL5u1wO+lqz6X1AP6WpyoZix5YiqW0w="; - }) - # https://github.com/aplpy/aplpy/pull/503 - (fetchpatch { - url = "https://github.com/aplpy/aplpy/commit/edc2aa9770b72bd3ac42db95a6e027b276be9c31.patch"; - hash = "sha256-QUZenY3XQ/T2tl5apxZUqjf4ACjOzJWb+1AUp5limi4="; - }) - ]; - - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ astropy matplotlib numpy