Merge pull request #123379 from rmcgibbo/aplpy

python3Packages.aplpy: fix with latest matplotlib

authored by Robert Scott and committed by GitHub c9587434 2ee5afcf

+15 -2
+15 -2
pkgs/development/python-modules/aplpy/default.nix
··· 27 27 sha256 = "239f3d83635ca4251536aeb577df7c60df77fc4d658097b92094719739aec3f3"; 28 28 }; 29 29 30 - patches = [ (fetchpatch { 31 - # Can be removed in next release after 2.0.3 30 + patches = [ 31 + # Fixes compatibility with astropy-helpers. This patch has been merged into 32 + # the master branch as of May 2020, and should be part of the next 33 + # upstream release (v2.0.3 was tagged in Feb. 2019). 34 + (fetchpatch { 32 35 url = "https://github.com/aplpy/aplpy/pull/448.patch"; 33 36 sha256 = "1pnzh7ykjc8hwahzbzyryrzv5a8fddgd1bmzbhagkrn6lmvhhpvq"; 34 37 excludes = [ "tox.ini" "azure-pipelines.yml" ".circleci/config.yml" "MANIFEST.in" ".gitignore" 35 38 "setup.cfg" "appveyor.yml" "readthedocs.yml" "CHANGES.rst" ".gitmodules" ".travis.yml" "astropy_helpers" ]; 39 + }) 40 + # Fix for matplotlib >= 3.4 (https://github.com/aplpy/aplpy/pull/466) 41 + # Note: because of a security thing, github will refuse to serve this patch from the 42 + # "normal" location 43 + # (https://github.com/aplpy/aplpy/commit/56c1cc694fdea69e7da8506d3212c4495adb0ca5.patch) 44 + # due to the fact that it contains the PDF magic bytes, but it will serve it from 45 + # this githubusercontent domain. 46 + (fetchpatch { 47 + url = "https://patch-diff.githubusercontent.com/raw/aplpy/aplpy/pull/466/commit/56c1cc694fdea69e7da8506d3212c4495adb0ca5.patch"; 48 + sha256 = "0jna2n1cgfzr0a27m5z94wwph7qg25hs7lycrdb2dp3943rb35g4"; 36 49 }) 37 50 ]; 38 51