From f0bb89ab0ce2c4e8e69e0ebf69085a316bdee0ef Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Wed, 29 Jul 2026 15:38:45 -0700
Subject: [PATCH] Prefer non-root providers before apt

---
 .github/configs/ci-tooling.json | 28 ++++++++++++++--------------
 bin/build_docs.sh               |  2 +-
 bin/export_browser_history.sh   |  2 +-
 bin/setup.sh                    |  2 +-
 docs/nginx-binary.json          |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/configs/ci-tooling.json b/.github/configs/ci-tooling.json
index 0dab0dd1..671699b4 100644
--- a/.github/configs/ci-tooling.json
+++ b/.github/configs/ci-tooling.json
@@ -88,7 +88,7 @@
   "ci_binaries": [
     {
       "name": "{BASH_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     },
     {
       "name": "{PYTHON_BINARY}",
@@ -96,7 +96,7 @@
     },
     {
       "name": "{JQ_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     },
     {
       "name": "{UV_BINARY}",
@@ -122,7 +122,7 @@
     },
     {
       "name": "{GIT_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     },
     {
       "name": "{PYTHON_BINARY}",
@@ -136,7 +136,7 @@
   "deploy_binaries": [
     {
       "name": "{GIT_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     },
     {
       "name": "{PYTHON_BINARY}",
@@ -154,15 +154,15 @@
     },
     {
       "name": "{PV_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     },
     {
       "name": "{TAR_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     },
     {
       "name": "{TREE_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     }
   ],
   "docker_validation_binaries": [
@@ -278,7 +278,7 @@
   "docs_binaries": [
     {
       "name": "{CURL_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     },
     {
       "name": "{SUDO_BINARY}",
@@ -288,13 +288,13 @@
   "git_binaries": [
     {
       "name": "{GIT_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     }
   ],
   "github_binaries": [
     {
       "name": "{GH_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     }
   ],
   "node_binaries": [
@@ -323,19 +323,19 @@
     },
     {
       "name": "{GH_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     },
     {
       "name": "{GIT_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     },
     {
       "name": "{JQ_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     },
     {
       "name": "{CURL_BINARY}",
-      "binproviders": "env,apt,brew"
+      "binproviders": "env,brew,apt"
     }
   ]
 }
diff --git a/bin/build_docs.sh b/bin/build_docs.sh
index dd1f1ba2..f442ddc4 100755
--- a/bin/build_docs.sh
+++ b/bin/build_docs.sh
@@ -19,7 +19,7 @@ resolve_docs_binary() {
     uv run --no-cache --project "$REPO_DIR" --no-sync --no-sources abxpkg env \
         --install \
         --lib="$ABXPKG_LIB_DIR" \
-        --binproviders=env,apt,brew \
+        --binproviders=env,brew,apt \
         "$binary_name" >/dev/null
     test -L "$ABXPKG_LIB_DIR/env/bin/$binary_name"
     test -x "$ABXPKG_LIB_DIR/env/bin/$binary_name"
diff --git a/bin/export_browser_history.sh b/bin/export_browser_history.sh
index 6f56fe56..6da8e007 100755
--- a/bin/export_browser_history.sh
+++ b/bin/export_browser_history.sh
@@ -32,7 +32,7 @@ OUTPUT_DIR="$(pwd)"
 : "${ABXPKG_LIB_DIR:?Set ABXPKG_LIB_DIR to the ArchiveBox package library directory}"
 
 for binary in python sqlite3 jq; do
-    abxpkg install "$binary" --lib "$ABXPKG_LIB_DIR" --binproviders env,apt,brew
+    abxpkg install "$binary" --lib "$ABXPKG_LIB_DIR" --binproviders env,brew,apt
 done
 
 PYTHON_BINARY="$ABXPKG_LIB_DIR/env/bin/python"
diff --git a/bin/setup.sh b/bin/setup.sh
index fcce0c05..897f8fa8 100755
--- a/bin/setup.sh
+++ b/bin/setup.sh
@@ -175,7 +175,7 @@ prepare_abxpkg_environment() {
 }
 
 resolve_setup_curl() {
-    resolve_setup_binary curl env,apt,brew true
+    resolve_setup_binary curl env,brew,apt true
     CURL_BINARY="$ABXPKG_LIB_DIR/env/bin/curl"
 }
 
diff --git a/docs/nginx-binary.json b/docs/nginx-binary.json
index 1780d96d..7f34da04 100644
--- a/docs/nginx-binary.json
+++ b/docs/nginx-binary.json
@@ -2,7 +2,7 @@
   "required_binaries": [
     {
       "name": "nginx",
-      "binproviders": "env,apt,brew",
+      "binproviders": "env,brew,apt",
       "min_version": null
     }
   ]