From 1338578f17f0b5afa54abea77339d894d877fb53 Mon Sep 17 00:00:00 2001
From: Giovanni Barillari <g@baro.dev>
Date: Mon, 15 Apr 2024 19:25:43 +0200
Subject: [PATCH] Revert python distributions to pyoxidizer bundled ones

---
 .github/workflows/build.yml |  1 +
 pyoxidizer.bzl              | 29 +++++------------------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c876044..0e7274f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,6 +25,7 @@ jobs:
     - name: Build release
       run: |
         make build_linux
+        build/x86_64-unknown-linux-musl/release/install/noir --version
         make pack_linux BUILD_VERSION=${{ steps.build_version.outputs.version }}
     - name: Upload release file
       uses: actions/upload-artifact@v3
diff --git a/pyoxidizer.bzl b/pyoxidizer.bzl
index 366d239..61bb8b0 100644
--- a/pyoxidizer.bzl
+++ b/pyoxidizer.bzl
@@ -1,28 +1,9 @@
 def make_exe():
-    distributions = {
-        "x86_64-unknown-linux-musl": PythonDistribution(
-            sha256="e711f6a063efb665e425f4f071c75f2a8c107f599c99130ecfff2b0532f7b804",
-            url="https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.10.13+20240224-x86_64-unknown-linux-musl-noopt-full.tar.zst",
-        ),
-        "aarch64-unknown-linux-gnu": PythonDistribution(
-            sha256="ab7195f04182d94aa675e738b6cf8affd4e897e7be7f02224cf36865194be344",
-            url="https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.10.13+20240224-aarch64-unknown-linux-gnu-noopt-full.tar.zst"
-        ),
-        "x86_64-apple-darwin": PythonDistribution(
-            sha256="5c6d2b375f3944dc156c55544a13afa3ba0dc4bbc492135a3b7004a71f612cfd",
-            url="https://github.com/indygreg/python-build-standalone/releases/download/20221220/cpython-3.10.9%2B20221220-x86_64-apple-darwin-pgo-full.tar.zst"
-        ),
-        "aarch64-apple-darwin": PythonDistribution(
-            sha256="5f90a26379f423de40c1be6c06fbc68b82f8b09f43e657932a48df30d3f5dba4",
-            url="https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.10.13+20240224-aarch64-apple-darwin-pgo-full.tar.zst"
-        ),
-        "x86_64-pc-windows-msvc": PythonDistribution(
-            sha256="6a2c8f37509556e5d463b1f437cdf7772ebd84cdf183c258d783e64bb3109505",
-            url="https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.10.13+20240224-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst"
-        )
-    }
-
-    dist = distributions[BUILD_TARGET_TRIPLE]
+    if BUILD_TARGET_TRIPLE == "x86_64-unknown-linux-musl":
+        flavor = "standalone_static"
+    else:
+        flavor = "standalone"
+    dist = default_python_distribution(python_version="3.10", flavor=flavor)
 
     policy = dist.make_python_packaging_policy()
     policy.resources_location_fallback = "filesystem-relative:lib"