From ab74141ab4bcd34aa9b11f363dd8ad4f6fc01cd2 Mon Sep 17 00:00:00 2001
From: exurd <7785022+exurd@users.noreply.github.com>
Date: Sun, 27 Sep 2026 10:11:20 +0100
Subject: [PATCH] Fix minimum macOS version check for PyPy v7.3.8+ (#3570)

* Switch pypy*-7.3.8-aarch64 to -portable
Regular version is no longer available for download

---------

Co-authored-by: Ivan Pozdeev <vano@mail.mipt.ru>
---
 plugins/python-build/share/python-build/pypy2.7-7.3.10  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.11  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.12  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.13  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.14  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.15  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.16  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.17  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.18  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.19  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.20  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.21  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.22  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.23  | 5 +++--
 plugins/python-build/share/python-build/pypy2.7-7.3.8   | 9 +++++----
 plugins/python-build/share/python-build/pypy2.7-7.3.9   | 5 +++--
 plugins/python-build/share/python-build/pypy3.10-7.3.12 | 5 +++--
 plugins/python-build/share/python-build/pypy3.10-7.3.13 | 5 +++--
 plugins/python-build/share/python-build/pypy3.10-7.3.14 | 5 +++--
 plugins/python-build/share/python-build/pypy3.10-7.3.15 | 5 +++--
 plugins/python-build/share/python-build/pypy3.10-7.3.16 | 5 +++--
 plugins/python-build/share/python-build/pypy3.10-7.3.17 | 5 +++--
 plugins/python-build/share/python-build/pypy3.10-7.3.18 | 5 +++--
 plugins/python-build/share/python-build/pypy3.10-7.3.19 | 5 +++--
 plugins/python-build/share/python-build/pypy3.11-7.3.18 | 5 +++--
 plugins/python-build/share/python-build/pypy3.11-7.3.19 | 5 +++--
 plugins/python-build/share/python-build/pypy3.11-7.3.20 | 5 +++--
 plugins/python-build/share/python-build/pypy3.11-7.3.21 | 5 +++--
 plugins/python-build/share/python-build/pypy3.11-7.3.22 | 5 +++--
 plugins/python-build/share/python-build/pypy3.11-7.3.23 | 5 +++--
 plugins/python-build/share/python-build/pypy3.7-7.3.8   | 9 +++++----
 plugins/python-build/share/python-build/pypy3.7-7.3.9   | 5 +++--
 plugins/python-build/share/python-build/pypy3.8-7.3.10  | 5 +++--
 plugins/python-build/share/python-build/pypy3.8-7.3.11  | 5 +++--
 plugins/python-build/share/python-build/pypy3.8-7.3.8   | 9 +++++----
 plugins/python-build/share/python-build/pypy3.8-7.3.9   | 5 +++--
 plugins/python-build/share/python-build/pypy3.9-7.3.10  | 5 +++--
 plugins/python-build/share/python-build/pypy3.9-7.3.11  | 5 +++--
 plugins/python-build/share/python-build/pypy3.9-7.3.12  | 5 +++--
 plugins/python-build/share/python-build/pypy3.9-7.3.13  | 5 +++--
 plugins/python-build/share/python-build/pypy3.9-7.3.14  | 5 +++--
 plugins/python-build/share/python-build/pypy3.9-7.3.15  | 5 +++--
 plugins/python-build/share/python-build/pypy3.9-7.3.16  | 5 +++--
 plugins/python-build/share/python-build/pypy3.9-7.3.8   | 9 +++++----
 plugins/python-build/share/python-build/pypy3.9-7.3.9   | 5 +++--
 45 files changed, 143 insertions(+), 98 deletions(-)

diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.10 b/plugins/python-build/share/python-build/pypy2.7-7.3.10
index 378ccd2c..5dc53c03 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.10
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.10
@@ -1,5 +1,6 @@
 VERSION='7.3.10'
 PYVER='2.7'
+MIN_OSX_VERSION='10.14'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=274342f0e75e99d60ba7a0cfb0e13792e7664163e01450d2f7f2f7825603a0ae
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.11 b/plugins/python-build/share/python-build/pypy2.7-7.3.11
index b46c2dfa..c4383c95 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.11
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.11
@@ -1,5 +1,6 @@
 VERSION='7.3.11'
 PYVER='2.7'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=ea924da1defe9325ef760e288b04f984614e405580f5321eb6a5c8f539bd415a
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.12 b/plugins/python-build/share/python-build/pypy2.7-7.3.12
index 930fd6bf..b7a3988d 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.12
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.12
@@ -1,5 +1,6 @@
 VERSION='7.3.12'
 PYVER='2.7'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=e04dcb6286a7b4724ec3f0e50d3cc1ba8583301dd1658c06d7f37599e4201c59
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.13 b/plugins/python-build/share/python-build/pypy2.7-7.3.13
index 0239066b..5f636b99 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.13
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.13
@@ -1,5 +1,6 @@
 VERSION='7.3.13'
 PYVER='2.7'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=f1e20f833cc86a097c1f1318069fc17d01c3988678c1438fe27ed567fcb5cfd0
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.14 b/plugins/python-build/share/python-build/pypy2.7-7.3.14
index e7af9283..9152db55 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.14
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.14
@@ -1,5 +1,6 @@
 VERSION='7.3.14'
 PYVER='2.7'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=98468f4cc704a2821401afdd001ebddd367e594e05a70c7767fb86f1364fb21a
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.15 b/plugins/python-build/share/python-build/pypy2.7-7.3.15
index 6e146671..13f79bf7 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.15
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.15
@@ -1,5 +1,6 @@
 VERSION='7.3.15'
 PYVER='2.7'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=31b41fca7280636d7818713b7a0fab8f34ece9c82cc88e51d305d43b3e6306d6
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.16 b/plugins/python-build/share/python-build/pypy2.7-7.3.16
index b77482f2..13768e3c 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.16
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.16
@@ -1,5 +1,6 @@
 VERSION='7.3.16'
 PYVER='2.7'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=be44e65dd8c00d2388b2580dbe2af6a5179f951a8f4979efc74360f92f3c7e96
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.17 b/plugins/python-build/share/python-build/pypy2.7-7.3.17
index 54138c49..0a31c16a 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.17
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.17
@@ -1,5 +1,6 @@
 VERSION='7.3.17'
 PYVER='2.7'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=a8df5ce1650f4756933f8780870c91a0a40e7c9870d74629bf241392bcb5c2e3
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.18 b/plugins/python-build/share/python-build/pypy2.7-7.3.18
index c95bee62..26de6c26 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.18
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.18
@@ -1,5 +1,6 @@
 VERSION='7.3.18'
 PYVER='2.7'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=d647cad5be915df65f44277fd051c8d52e708d22838b5cb21b2de033530acc80
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.19 b/plugins/python-build/share/python-build/pypy2.7-7.3.19
index 9bbba97f..ed570b6a 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.19
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.19
@@ -1,5 +1,6 @@
 VERSION='7.3.19'
 PYVER='2.7'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=fe89d4fd4af13f76dfe7315975003518cf176520e3ccec1544a88d174f50910e
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.20 b/plugins/python-build/share/python-build/pypy2.7-7.3.20
index 4e1d62fc..e9914d98 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.20
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.20
@@ -1,5 +1,6 @@
 VERSION='7.3.20'
 PYVER='2.7'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=f22a1be607deeaa4f9be6bc63aae09fe4fb5b990d6a23aa4e7c5960dc5d93c96
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.21 b/plugins/python-build/share/python-build/pypy2.7-7.3.21
index 1b009241..2d14db99 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.21
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.21
@@ -1,5 +1,6 @@
 VERSION='7.3.21'
 PYVER='2.7'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=8aaed1e612e6874235ee9d5bd545a8dcc7b86c867d305351df37969390b0c47b
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.22 b/plugins/python-build/share/python-build/pypy2.7-7.3.22
index fd0dc19e..6fd1d29b 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.22
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.22
@@ -1,5 +1,6 @@
 VERSION='7.3.22'
 PYVER='2.7'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=49829ef97a36d50870b0a4a7d6d67c4817d98a0bbd936e7a86ac6ef615b07205
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.23 b/plugins/python-build/share/python-build/pypy2.7-7.3.23
index 999c40c9..eee100c7 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.23
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.23
@@ -1,5 +1,6 @@
 VERSION='7.3.23'
 PYVER='2.7'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=b0bec20c16b6ab2bd46bd4f5d6049b6070a22a53eaed437ee9ac36d842ceda74
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.8 b/plugins/python-build/share/python-build/pypy2.7-7.3.8
index ca2b4efc..914080ab 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.8
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.8
@@ -1,8 +1,9 @@
 VERSION='7.3.8'
 PYVER='2.7'
+MIN_OSX_VERSION='10.14'
 
 # https://www.pypy.org/checksums.html
-aarch64_hash=ca1f8d3146c83002ee97615906b0930e821297dcce3063b5b28933a0690ef298
+aarch64_hash=b5edfc995d83feea8b4c8aeffccb89753b4b182f076126550bd07cc35faa6208  
 linux32_hash=7c84f173bbcd73d0eb10909259d11b5cc253d4c6ea4492e6da8f2532df9b3da5
 linux64_hash=1f2e84fb539ffce233c34769d2f11647955f894be091e85419e05f48011e8940
 osx64_hash=e5c1ff39ad9916ea23e3deb8012fe42367b6b19284cf13b1a1ea2b2f53a43add
@@ -28,7 +29,7 @@ function pypy_pkg_data {
     case "${pkg}" in
     'linux-aarch64' )
       hash="${aarch64_hash}"
-      url="${baseurl}-aarch64.tar.bz2" # diff url
+      url="${baseurl}-aarch64-portable.tar.bz2" # diff url
       ;;
     'linux' )
       hash="${linux32_hash}"
@@ -39,12 +40,12 @@ function pypy_pkg_data {
       hash="${linux64_hash}"
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
       else
         { echo
           colorize 1 "ERROR"
-          echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < 10.13."
+          echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < ${MIN_OSX_VERSION}."
           echo "try '${basesrc}' to build from source."
           echo
         } >&2
diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.9 b/plugins/python-build/share/python-build/pypy2.7-7.3.9
index 46069676..74bde085 100644
--- a/plugins/python-build/share/python-build/pypy2.7-7.3.9
+++ b/plugins/python-build/share/python-build/pypy2.7-7.3.9
@@ -1,5 +1,6 @@
 VERSION='7.3.9'
 PYVER='2.7'
+MIN_OSX_VERSION='10.14'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=aff4e4dbab53448f662cd01acb2251571d60f836d2f48382a7d8da54ca5b3442
@@ -48,10 +49,10 @@ function pypy_pkg_data {
       hash="${linux64_hash}"
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.10-7.3.12 b/plugins/python-build/share/python-build/pypy3.10-7.3.12
index 24128b7f..bda962af 100644
--- a/plugins/python-build/share/python-build/pypy3.10-7.3.12
+++ b/plugins/python-build/share/python-build/pypy3.10-7.3.12
@@ -1,5 +1,6 @@
 VERSION='7.3.12'
 PYVER='3.10'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=26208b5a134d9860a08f74cce60960005758e82dc5f0e3566a48ed863a1f16a1
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.10-7.3.13 b/plugins/python-build/share/python-build/pypy3.10-7.3.13
index 1690b6ee..627df97e 100644
--- a/plugins/python-build/share/python-build/pypy3.10-7.3.13
+++ b/plugins/python-build/share/python-build/pypy3.10-7.3.13
@@ -1,5 +1,6 @@
 VERSION='7.3.13'
 PYVER='3.10'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=ac476f01c9653358404f2e4b52f62307b2f64ccdb8c96dadcbfe355824d81a63
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.10-7.3.14 b/plugins/python-build/share/python-build/pypy3.10-7.3.14
index 14466576..6a508a86 100644
--- a/plugins/python-build/share/python-build/pypy3.10-7.3.14
+++ b/plugins/python-build/share/python-build/pypy3.10-7.3.14
@@ -1,5 +1,6 @@
 VERSION='7.3.14'
 PYVER='3.10'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=fbef65dfc69dcd6006d843553d268b331f1b13dfc3938492bd35f0f477b5bcf4
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.10-7.3.15 b/plugins/python-build/share/python-build/pypy3.10-7.3.15
index e7e49cf9..3c856cfe 100644
--- a/plugins/python-build/share/python-build/pypy3.10-7.3.15
+++ b/plugins/python-build/share/python-build/pypy3.10-7.3.15
@@ -1,5 +1,6 @@
 VERSION='7.3.15'
 PYVER='3.10'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=52146fccaf64e87e71d178dda8de63c01577ec3923073dc69e1519622bcacb74
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.10-7.3.16 b/plugins/python-build/share/python-build/pypy3.10-7.3.16
index 4f7085e3..f0ecc589 100644
--- a/plugins/python-build/share/python-build/pypy3.10-7.3.16
+++ b/plugins/python-build/share/python-build/pypy3.10-7.3.16
@@ -1,5 +1,6 @@
 VERSION='7.3.16'
 PYVER='3.10'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=fc720999bc5050e1d3706b3b6445e695cf42bfc71ebc7c88ed6bb88828b1d385
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.10-7.3.17 b/plugins/python-build/share/python-build/pypy3.10-7.3.17
index 44cdf64d..038164be 100644
--- a/plugins/python-build/share/python-build/pypy3.10-7.3.17
+++ b/plugins/python-build/share/python-build/pypy3.10-7.3.17
@@ -1,5 +1,6 @@
 VERSION='7.3.17'
 PYVER='3.10'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=53b6e5907df869c49e4eae7aca09fba16d150741097efb245892c1477d2395f2
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy3.10-7.3.18 b/plugins/python-build/share/python-build/pypy3.10-7.3.18
index 81805cbd..934988a8 100644
--- a/plugins/python-build/share/python-build/pypy3.10-7.3.18
+++ b/plugins/python-build/share/python-build/pypy3.10-7.3.18
@@ -1,5 +1,6 @@
 VERSION='7.3.18'
 PYVER='3.10'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=e843aecd48eb06b625af67891b99e3440313cfb64c6851fc37df1e5572c8ef9e
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy3.10-7.3.19 b/plugins/python-build/share/python-build/pypy3.10-7.3.19
index 13df1c38..b11599c4 100644
--- a/plugins/python-build/share/python-build/pypy3.10-7.3.19
+++ b/plugins/python-build/share/python-build/pypy3.10-7.3.19
@@ -1,5 +1,6 @@
 VERSION='7.3.19'
 PYVER='3.10'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=af27a589178f11198e2244ab65ca510630ba97c131d7ccc4021eb5bc58de7f57
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy3.11-7.3.18 b/plugins/python-build/share/python-build/pypy3.11-7.3.18
index cd4daa8c..788adf62 100644
--- a/plugins/python-build/share/python-build/pypy3.11-7.3.18
+++ b/plugins/python-build/share/python-build/pypy3.11-7.3.18
@@ -1,5 +1,6 @@
 VERSION='7.3.18'
 PYVER='3.11'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=95bc3021cb9be2aa766ecb776c215e97ae8c0dda99dd48840b40b5b87d90bc45
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy3.11-7.3.19 b/plugins/python-build/share/python-build/pypy3.11-7.3.19
index 1f737eed..789c29a5 100644
--- a/plugins/python-build/share/python-build/pypy3.11-7.3.19
+++ b/plugins/python-build/share/python-build/pypy3.11-7.3.19
@@ -1,5 +1,6 @@
 VERSION='7.3.19'
 PYVER='3.11'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=13207dbf81ce24e96da760b1b863627b77bb20b1fb4c95191e02a0b72383df74
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy3.11-7.3.20 b/plugins/python-build/share/python-build/pypy3.11-7.3.20
index 63249f1b..2c8c2ea4 100644
--- a/plugins/python-build/share/python-build/pypy3.11-7.3.20
+++ b/plugins/python-build/share/python-build/pypy3.11-7.3.20
@@ -1,5 +1,6 @@
 VERSION='7.3.20'
 PYVER='3.11'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=9347fe691a07fd9df17a1b186554fb9d9e6210178ffef19520a579ce1f9eb741
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy3.11-7.3.21 b/plugins/python-build/share/python-build/pypy3.11-7.3.21
index e8fdf2d1..ac5b016c 100644
--- a/plugins/python-build/share/python-build/pypy3.11-7.3.21
+++ b/plugins/python-build/share/python-build/pypy3.11-7.3.21
@@ -1,5 +1,6 @@
 VERSION='7.3.21'
 PYVER='3.11'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=6141f5c64dd96faf87e0a3f7f362521eadd26d5e3f851f90fc386a72208f8c18
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy3.11-7.3.22 b/plugins/python-build/share/python-build/pypy3.11-7.3.22
index de50d2d0..59536e21 100644
--- a/plugins/python-build/share/python-build/pypy3.11-7.3.22
+++ b/plugins/python-build/share/python-build/pypy3.11-7.3.22
@@ -1,5 +1,6 @@
 VERSION='7.3.22'
 PYVER='3.11'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=c29a8933e2084f52df74c829aa0d8f5652b9d5919f68e9fb89cab3afe35dd884
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy3.11-7.3.23 b/plugins/python-build/share/python-build/pypy3.11-7.3.23
index 5c76e45d..ca1015c3 100644
--- a/plugins/python-build/share/python-build/pypy3.11-7.3.23
+++ b/plugins/python-build/share/python-build/pypy3.11-7.3.23
@@ -1,5 +1,6 @@
 VERSION='7.3.23'
 PYVER='3.11'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=5433ac0ad526aeb35025ef8509bed65cd62ea35cb9e21ac649c69a5eff4eecb6
@@ -51,11 +52,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     * )
diff --git a/plugins/python-build/share/python-build/pypy3.7-7.3.8 b/plugins/python-build/share/python-build/pypy3.7-7.3.8
index c6e964b8..05856ff0 100644
--- a/plugins/python-build/share/python-build/pypy3.7-7.3.8
+++ b/plugins/python-build/share/python-build/pypy3.7-7.3.8
@@ -1,8 +1,9 @@
 VERSION='7.3.8'
 PYVER='3.7'
+MIN_OSX_VERSION='10.14'
 
 # https://www.pypy.org/checksums.html
-aarch64_hash=4fb2f8281f3aaca72e6fe62ecc5fc054fcc79cd061ca3e0eea730f7d82d610d4
+aarch64_hash=639c76f128a856747aee23a34276fa101a7a157ea81e76394fbaf80b97dcf2f2  
 linux32_hash=38429ec6ea1aca391821ee4fbda7358ae86de4600146643f2af2fe2c085af839
 linux64_hash=409085db79a6d90bfcf4f576dca1538498e65937acfbe03bd4909bdc262ff378
 osx64_hash=76b8eef5b059a7e478f525615482d2a6e9feb83375e3f63c16381d80521a693f
@@ -28,7 +29,7 @@ function pypy_pkg_data {
     case "${pkg}" in
     'linux-aarch64' )
       hash="${aarch64_hash}"
-      url="${baseurl}-aarch64.tar.bz2" # diff url
+      url="${baseurl}-aarch64-portable.tar.bz2" # diff url
       ;;
     'linux' )
       hash="${linux32_hash}"
@@ -39,12 +40,12 @@ function pypy_pkg_data {
       hash="${linux64_hash}"
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
       else
         { echo
           colorize 1 "ERROR"
-          echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < 10.13."
+          echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < ${MIN_OSX_VERSION}."
           echo "try '${basesrc}' to build from source."
           echo
         } >&2
diff --git a/plugins/python-build/share/python-build/pypy3.7-7.3.9 b/plugins/python-build/share/python-build/pypy3.7-7.3.9
index d38cff19..e687547d 100644
--- a/plugins/python-build/share/python-build/pypy3.7-7.3.9
+++ b/plugins/python-build/share/python-build/pypy3.7-7.3.9
@@ -1,5 +1,6 @@
 VERSION='7.3.9'
 PYVER='3.7'
+MIN_OSX_VERSION='10.14'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=dfc62f2c453fb851d10a1879c6e75c31ffebbf2a44d181bb06fcac4750d023fc
@@ -48,10 +49,10 @@ function pypy_pkg_data {
       hash="${linux64_hash}"
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.8-7.3.10 b/plugins/python-build/share/python-build/pypy3.8-7.3.10
index 6877e301..0c7e2f15 100644
--- a/plugins/python-build/share/python-build/pypy3.8-7.3.10
+++ b/plugins/python-build/share/python-build/pypy3.8-7.3.10
@@ -1,5 +1,6 @@
 VERSION='7.3.10'
 PYVER='3.8'
+MIN_OSX_VERSION='10.14'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=e4caa1a545f22cfee87d5b9aa6f8852347f223643ad7d2562e0b2a2f4663ad98
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.8-7.3.11 b/plugins/python-build/share/python-build/pypy3.8-7.3.11
index 9dc91087..92b54da2 100644
--- a/plugins/python-build/share/python-build/pypy3.8-7.3.11
+++ b/plugins/python-build/share/python-build/pypy3.8-7.3.11
@@ -1,5 +1,6 @@
 VERSION='7.3.11'
 PYVER='3.8'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=9a2fa0b8d92b7830aa31774a9a76129b0ff81afbd22cd5c41fbdd9119e859f55
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.8-7.3.8 b/plugins/python-build/share/python-build/pypy3.8-7.3.8
index 2a4db0ee..1c58c2f8 100644
--- a/plugins/python-build/share/python-build/pypy3.8-7.3.8
+++ b/plugins/python-build/share/python-build/pypy3.8-7.3.8
@@ -1,8 +1,9 @@
 VERSION='7.3.8'
 PYVER='3.8'
+MIN_OSX_VERSION='10.14'
 
 # https://www.pypy.org/checksums.html
-aarch64_hash=fe41df391f87239925e573e195e631a9d03d37f471eb1479790ee13ca47a28af
+aarch64_hash=0210536e9f1841ba283c13b04783394050837bb3e6f4091c9f1bd9c7f2b94b55  
 linux32_hash=bea4b275decd492af6462157d293dd6fcf08a949859f8aec0959537b40afd032
 linux64_hash=089f8e3e357d6130815964ddd3507c13bd53e4976ccf0a89b5c36a9a6775a188
 osx64_hash=de1b283ff112d76395c0162a1cf11528e192bdc230ee3f1b237f7694c7518dee
@@ -28,7 +29,7 @@ function pypy_pkg_data {
     case "${pkg}" in
     'linux-aarch64' )
       hash="${aarch64_hash}"
-      url="${baseurl}-aarch64.tar.bz2" # diff url
+      url="${baseurl}-aarch64-portable.tar.bz2" # diff url
       ;;
     'linux' )
       hash="${linux32_hash}"
@@ -39,12 +40,12 @@ function pypy_pkg_data {
       hash="${linux64_hash}"
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
       else
         { echo
           colorize 1 "ERROR"
-          echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < 10.13."
+          echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < ${MIN_OSX_VERSION}."
           echo "try '${basesrc}' to build from source."
           echo
         } >&2
diff --git a/plugins/python-build/share/python-build/pypy3.8-7.3.9 b/plugins/python-build/share/python-build/pypy3.8-7.3.9
index 168a9536..abd6a5d5 100644
--- a/plugins/python-build/share/python-build/pypy3.8-7.3.9
+++ b/plugins/python-build/share/python-build/pypy3.8-7.3.9
@@ -1,5 +1,6 @@
 VERSION='7.3.9'
 PYVER='3.8'
+MIN_OSX_VERSION='10.14'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=5e124455e207425e80731dff317f0432fa0aba1f025845ffca813770e2447e32
@@ -48,10 +49,10 @@ function pypy_pkg_data {
       hash="${linux64_hash}"
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.9-7.3.10 b/plugins/python-build/share/python-build/pypy3.9-7.3.10
index 9810b2a6..f18b40c1 100644
--- a/plugins/python-build/share/python-build/pypy3.9-7.3.10
+++ b/plugins/python-build/share/python-build/pypy3.9-7.3.10
@@ -1,5 +1,6 @@
 VERSION='7.3.10'
 PYVER='3.9'
+MIN_OSX_VERSION='10.14'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=657a04fd9a5a992a2f116a9e7e9132ea0c578721f59139c9fb2083775f71e514
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.9-7.3.11 b/plugins/python-build/share/python-build/pypy3.9-7.3.11
index 800c0aa3..2fbd3695 100644
--- a/plugins/python-build/share/python-build/pypy3.9-7.3.11
+++ b/plugins/python-build/share/python-build/pypy3.9-7.3.11
@@ -1,5 +1,6 @@
 VERSION='7.3.11'
 PYVER='3.9'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=09175dc652ed895d98e9ad63d216812bf3ee7e398d900a9bf9eb2906ba8302b9
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.9-7.3.12 b/plugins/python-build/share/python-build/pypy3.9-7.3.12
index 0ff0a64d..398cf330 100644
--- a/plugins/python-build/share/python-build/pypy3.9-7.3.12
+++ b/plugins/python-build/share/python-build/pypy3.9-7.3.12
@@ -1,5 +1,6 @@
 VERSION='7.3.12'
 PYVER='3.9'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=e9327fb9edaf2ad91935d5b8563ec5ff24193bddb175c1acaaf772c025af1824
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.9-7.3.13 b/plugins/python-build/share/python-build/pypy3.9-7.3.13
index 5614ebc1..eb0695b0 100644
--- a/plugins/python-build/share/python-build/pypy3.9-7.3.13
+++ b/plugins/python-build/share/python-build/pypy3.9-7.3.13
@@ -1,5 +1,6 @@
 VERSION='7.3.13'
 PYVER='3.9'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=317d7876c5825a086f854253648b967a432b993ce87695d2895d3ad6ed0d2716
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.9-7.3.14 b/plugins/python-build/share/python-build/pypy3.9-7.3.14
index 340bcf5d..3ac356de 100644
--- a/plugins/python-build/share/python-build/pypy3.9-7.3.14
+++ b/plugins/python-build/share/python-build/pypy3.9-7.3.14
@@ -1,5 +1,6 @@
 VERSION='7.3.14'
 PYVER='3.9'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=14b842f32f60ce2d9d130971f9bcbdb6875824a0e78fac36806d267e0982179c
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.9-7.3.15 b/plugins/python-build/share/python-build/pypy3.9-7.3.15
index 2fbadb35..73bff3ff 100644
--- a/plugins/python-build/share/python-build/pypy3.9-7.3.15
+++ b/plugins/python-build/share/python-build/pypy3.9-7.3.15
@@ -1,5 +1,6 @@
 VERSION='7.3.15'
 PYVER='3.9'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=03e35fcba290454bb0ccf7ee57fb42d1e63108d10d593776a382c0a2fe355de0
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.9-7.3.16 b/plugins/python-build/share/python-build/pypy3.9-7.3.16
index afa539fd..8088f82f 100644
--- a/plugins/python-build/share/python-build/pypy3.9-7.3.16
+++ b/plugins/python-build/share/python-build/pypy3.9-7.3.16
@@ -1,5 +1,6 @@
 VERSION='7.3.16'
 PYVER='3.9'
+MIN_OSX_VERSION='10.15'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=de3f2ed3581b30555ac0dd3e4df78a262ec736a36fb2e8f28259f8539b278ef4
@@ -52,11 +53,11 @@ function pypy_pkg_data {
       pkg='macos_arm64'
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
         pkg='macos_x86_64'
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )
diff --git a/plugins/python-build/share/python-build/pypy3.9-7.3.8 b/plugins/python-build/share/python-build/pypy3.9-7.3.8
index 8d8c01ed..8f08be48 100644
--- a/plugins/python-build/share/python-build/pypy3.9-7.3.8
+++ b/plugins/python-build/share/python-build/pypy3.9-7.3.8
@@ -1,8 +1,9 @@
 VERSION='7.3.8'
 PYVER='3.9'
+MIN_OSX_VERSION='10.14'
 
 # https://www.pypy.org/checksums.html
-aarch64_hash=89d7ee12a8c416e83fae80af82482531fc6502321e75e5b7a0cc01d756ee5f0e
+aarch64_hash=b7282bc4484bceae5bc4cc04e05ee4faf51cb624c8fc7a69d92e5fdf0d0c96aa  
 linux32_hash=0894c468e7de758c509a602a28ef0ba4fbf197ccdf946c7853a7283d9bb2a345
 linux64_hash=129a055032bba700cd1d0acacab3659cf6b7180e25b1b2f730e792f06d5b3010
 osx64_hash=95bd88ac8d6372cd5b7b5393de7b7d5c615a0c6e42fdb1eb67f2d2d510965aee
@@ -28,7 +29,7 @@ function pypy_pkg_data {
     case "${pkg}" in
     'linux-aarch64' )
       hash="${aarch64_hash}"
-      url="${baseurl}-aarch64.tar.bz2" # diff url
+      url="${baseurl}-aarch64-portable.tar.bz2" # diff url
       ;;
     'linux' )
       hash="${linux32_hash}"
@@ -39,12 +40,12 @@ function pypy_pkg_data {
       hash="${linux64_hash}"
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
       else
         { echo
           colorize 1 "ERROR"
-          echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < 10.13."
+          echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < ${MIN_OSX_VERSION}."
           echo "try '${basesrc}' to build from source."
           echo
         } >&2
diff --git a/plugins/python-build/share/python-build/pypy3.9-7.3.9 b/plugins/python-build/share/python-build/pypy3.9-7.3.9
index a59ee362..804e24cb 100644
--- a/plugins/python-build/share/python-build/pypy3.9-7.3.9
+++ b/plugins/python-build/share/python-build/pypy3.9-7.3.9
@@ -1,5 +1,6 @@
 VERSION='7.3.9'
 PYVER='3.9'
+MIN_OSX_VERSION='10.14'
 
 # https://www.pypy.org/checksums.html
 aarch64_hash=2e1ae193d98bc51439642a7618d521ea019f45b8fb226940f7e334c548d2b4b9
@@ -48,10 +49,10 @@ function pypy_pkg_data {
       hash="${linux64_hash}"
       ;;
     'osx64' )
-      if require_osx_version "10.13"; then
+      if require_osx_version "${MIN_OSX_VERSION}"; then
         hash="${osx64_hash}"
       else
-        err_no_binary "${ARCH}, OS X < 10.13"
+        err_no_binary "${ARCH}, OS X < ${MIN_OSX_VERSION}"
       fi
       ;;
     's390x' )