diff --git a/.crow/build-all-versions.yaml b/.crow/build-all-versions.yaml
index ce3bc09..7451988 100644
--- a/.crow/build-all-versions.yaml
+++ b/.crow/build-all-versions.yaml
@@ -153,7 +153,7 @@ steps:
       # not visible here. Install the packages needed to recompute the snapshot
       # and query build metadata in every build job.
       - UVR_R_BIN=/opt/R/$R_VERSION/bin/R local/uvr-install.sh RPostgres s3fs data.table future jsonlite
-      - XVFB=$(command -v xwfb-run 2>/dev/null || command -v xvfb-run); XVFB_ARGS="-a"; if command -v xwfb-run >/dev/null 2>&1; then dnf install -y -q weston 2>/dev/null; XVFB_ARGS="-c weston"; fi
+      - XVFB=$(command -v xwfb-run 2>/dev/null || command -v xvfb-run); XVFB_ARGS=""; if command -v xwfb-run >/dev/null 2>&1; then dnf install -y -q weston 2>/dev/null; XVFB_ARGS="-c weston"; fi
       - $XVFB $XVFB_ARGS -n $SPLIT_INDEX -- /opt/R/$R_VERSION/bin/Rscript local/build-all.R $SPLIT_INTO $SPLIT_INDEX $NCPUS 2>&1
       - |
         PRIMARY_MINOR=$(echo "$R_VERSION" | cut -d. -f1-2)
diff --git a/.crow/process-updates.yaml b/.crow/process-updates.yaml
index 531a47f..a1b9698 100644
--- a/.crow/process-updates.yaml
+++ b/.crow/process-updates.yaml
@@ -192,7 +192,7 @@ steps:
       - UVR_R_BIN=/opt/R/$R_VERSION/bin/R local/uvr-install.sh RPostgres
       - /opt/R/$R_VERSION/bin/R -q -e 'packageVersion("bincraft")'
       # rhel-10 ships xwfb-run (Xwayland) instead of xvfb-run; prefer it and start weston, else fall back to xvfb-run
-      - XVFB=$(command -v xwfb-run 2>/dev/null || command -v xvfb-run); XVFB_ARGS="-a"; if command -v xwfb-run >/dev/null 2>&1; then dnf install -y -q weston 2>/dev/null; XVFB_ARGS="-c weston"; fi
+      - XVFB=$(command -v xwfb-run 2>/dev/null || command -v xvfb-run); XVFB_ARGS=""; if command -v xwfb-run >/dev/null 2>&1; then dnf install -y -q weston 2>/dev/null; XVFB_ARGS="-c weston"; fi
       # options(future.globals.onReference = NULL): for some reason s3fs::file_delete() throws 'Error: Detected a non-exportable reference ('externalptr') in one of the globals ('FUN' of class 'function') used in the future expression' otherwise
       - $XVFB $XVFB_ARGS -- /opt/R/$R_VERSION/bin/R -q -e "options(crayon.enabled = TRUE, Ncpus = 4, future.globals.onReference = 'error', repos = structure(c(getOption('repos'),INLA='https://inla.r-inla-download.org/R/stable'))); progressr::handlers('cli'); progressr::handlers(global = TRUE); options(future.globals.onReference = NULL); bincraft::process_cran_updates(interval = $INTERVAL, platform = '${OS}', process_updated = TRUE, process_new = ${PROCESS_NEW}, process_removed = TRUE, patches = 'local/patches', r_minor_detection = 'classifier',s3_endpoint = 'https://s3.eu-central-003.backblazeb2.com', s3_region = 'eu-central-003', s3_bucket = 'devxy-rpkgs-binaries', s3_access_key_id = Sys.getenv('B2_S3_ACCESS_KEY'), s3_secret_access_key = Sys.getenv('B2_S3_SECRET_KEY'), metadata_db_host = 'r-binaries.devxy.io', metadata_db_name = 'build_metadata', metadata_db_table = 'single_builds', metadata_db_user = 'rpkgs', metadata_db_password = Sys.getenv('PGPASS'), metadata_db_sslmode = 'require', metadata_db_port = 15432, archive = TRUE, upload = TRUE, store_build_metadata = TRUE)"
       - |
diff --git a/.crow/weekly-rebuild-missing.yaml b/.crow/weekly-rebuild-missing.yaml
index a93a7bd..955476e 100644
--- a/.crow/weekly-rebuild-missing.yaml
+++ b/.crow/weekly-rebuild-missing.yaml
@@ -388,7 +388,7 @@ steps:
       - rm -rf /mnt/cache/R-pkgs/00LOCK-*
       - /opt/R/$R_VERSION/bin/Rscript local/install-bincraft.R
       - /opt/R/$R_VERSION/bin/R -q -e 'packageVersion("bincraft")'
-      - XVFB=$(command -v xwfb-run 2>/dev/null || command -v xvfb-run); XVFB_ARGS="-a"; if command -v xwfb-run >/dev/null 2>&1; then dnf install -y -q weston 2>/dev/null; XVFB_ARGS="-c weston"; fi
+      - XVFB=$(command -v xwfb-run 2>/dev/null || command -v xvfb-run); XVFB_ARGS=""; if command -v xwfb-run >/dev/null 2>&1; then dnf install -y -q weston 2>/dev/null; XVFB_ARGS="-c weston"; fi
       - UVR_R_BIN=/opt/R/$R_VERSION/bin/R local/uvr-install.sh httr2
       - /opt/R/$R_VERSION/bin/R -q -e 'source("local/fetch-rebuild-packages-from-issue.R")'
       - $XVFB $XVFB_ARGS -n $SPLIT_INDEX -- /opt/R/$R_VERSION/bin/Rscript local/rebuild-missing.R $SPLIT_INTO $SPLIT_INDEX $REBUILD_BUDGET_HOURS 2>&1
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e0ba9a9..4e28c6d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -24,19 +24,19 @@ repos:
         args:
           - --markdown-linebreak-ext=md
   - repo: https://github.com/DavidAnson/markdownlint-cli2
-    rev: v0.23.3
+    rev: v0.23.2
     hooks:
       - id: markdownlint-cli2
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.9.10
+    rev: v3.9.6
     hooks:
       - id: prettier
   - repo: https://github.com/posit-dev/air-pre-commit
-    rev: 0.12.0
+    rev: 0.11.0
     hooks:
       - id: air-format
   - repo: https://github.com/editorconfig-checker/editorconfig-checker
-    rev: v4.0.2
+    rev: v4.0.1
     hooks:
       - id: editorconfig-checker
         exclude: ^local/patches/.*\.patch$
diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
index 4b118a8..9591b83 100644
--- a/.terraform.lock.hcl
+++ b/.terraform.lock.hcl
@@ -2,79 +2,79 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.opentofu.org/hashicorp/http" {
-  version = "3.6.2"
+  version = "3.6.1"
   hashes = [
-    "h1:7+Ewr07oLewLfoe5K7Fhy4T5JUU4y7I7iRGTG2hrzy4=",
-    "h1:8AvJ6H30J1tgxwEoVKxe0B0Ac9XFn1gwOzidrIc+F5o=",
-    "h1:AllxtaK2m88aY+QitHui6kik/qJmBakrH5o5W7vOKI0=",
-    "h1:OimQGm1/9sIkdDCuUb8D5sxDorhektHeCQ337DHDfGk=",
-    "h1:T5zxkFXQ9To+ZysjCZu6gFqE8G1aTGh58Ol20bCk1Fc=",
-    "h1:TZlCCHsmKXSI3FyzmSgCU+TarKOHgiOft0wiYh85Y+E=",
-    "h1:VgyzPdGw1U/KU8gKhefKlIhy5kQYdpoZkpNcGiTgvVs=",
-    "h1:aF+Ztfy9m0Ll6nFOtC90NxN6WIEKAmfmVFhXAtFF8CI=",
-    "h1:bgViIoXF7kMXA7xgNikFYfv1D15rregO8I8Sq95sLGQ=",
-    "h1:d7tCAc1wr1seWpGMBx7tpRyGKOCicvozaHvn5X8ZFfM=",
-    "h1:dRCrpHH2UrkKs/lCqewyA00L0VfOCETVM14NBhyxHaM=",
-    "h1:eIqaNIixQTlhmr2GU1fAFH+eVYLQIfeGw7Ec+JT/bEo=",
-    "h1:hrK+Jzpgivi4Jo356K3LYDoeWBV1bMqKPBEqrEHwgpA=",
-    "h1:mrpIAC+TK3rQQz2jllAF8o2WLMKM14/WoclLgYKc4WA=",
-    "h1:zwE/uNBapBDpkKa5I24moawVPTanbG+eKumHRm/qINw=",
-    "zh:0cf6173a426f65a85e8baf4f9a7808dc94d0e02a82b34bc903555fda1eb45d7a",
-    "zh:2b5fa2b0487e692014fa86745a2a98d43f34f7aaea044acd3e2cee139627c9f1",
-    "zh:2c9c18893ce0f34e077559632c88237d172ac6646853bf00c84a5a4ec3b6c241",
-    "zh:316c848e892764aa10a890cf2455f52b592c6051a92ac8451955ca1d47ca1d2f",
-    "zh:4300e32ecaa967ca0ed56ca48f8dcd10796e70203bf6b8311e71dc43cd0d2aa1",
-    "zh:4a0a555d85a31bd257399253b502ad03816ccdba7b8fbbbd1e07a313d04d83fb",
-    "zh:6278773c31c1605c6d780fc982eacb83944e2807c8d8afe11534253b225c5aa3",
-    "zh:81b73da8dbcedf54604f131e0acd7ebd36cf673276174b4b4f10af0b0f10de11",
-    "zh:887beaa6ef6521d3f5e2b1193d458575fb91855f36bc66dd26a10988127a39fb",
-    "zh:91b2260424c5f8e5968d9e6d5bdbbdb60d61ccc4ff001aa0d637427629349c54",
-    "zh:a5d9d7032d00a6dd844e8d0d374b5ae89e25f9a6635a90e01c5f65e9dd14a93e",
-    "zh:bcf8b2aca448774e4701f221b74d762847be55dc312022b4aad66da3b389bf5d",
-    "zh:d62a3ad37ee1fb943ad0590978f4e7ee0ac064d19554c1c05ec98e9d2bb658f7",
-    "zh:e517b8b81fe88bf49868923f076515b9157771d1d3a80849cc8a73b9a19039a1",
-    "zh:fa9e0e39ef3e5ed2e6cf5886a0b569415ca3b89b9289fd6d01824ff11e470618",
+    "h1:7fra+jbUXbG5wMaz5L6RKMBv6gIuenJcBiIww87GoXo=",
+    "h1:BzSV3Ie9XMXF7sZHKAS54CzV95v5GBZNhQ4nrprUgfQ=",
+    "h1:CkrbSKS+pNVgvP3bMe2WoYHaFCIWJUkCtlC5vyTAdLI=",
+    "h1:FboJEwgVIRmqUJkjEoSRpfavVCJotUTe1zzT+pBzcV0=",
+    "h1:GlXELDLSZrdV3Svx1jjEBAXiJFkkdF/Hgx1qrmRK5hE=",
+    "h1:VuXFI2IcnZ6t4sDqtvkuIzbPK1CJQa0CkaM0MBuOlSU=",
+    "h1:WmL2nFQbSzRiDsDiwUbZbBp/cxGQrXrZnB7A4LGSvJU=",
+    "h1:Zdj26awWJ+m8kMoAMhItsIDcDFg81PWgKKJrvNi3WOI=",
+    "h1:lHvYYIumeZ+KJgCrmhCLnRGzrvNMjSHBTdV24coyMEc=",
+    "h1:pAOYMwA6Zki3ujAbG20b49u1IYXdBz56pW1JHqKdX5U=",
+    "h1:qi9GUp2+g69C8zY6Z68u4fWPwcZlDTa/CtdhvPgWbMA=",
+    "h1:w5A3xJ2mowj2wgiE3oNfOI0lFJf5X9IgxOJ6SErMczA=",
+    "h1:xAO03iJyuNGSOqolIcXcofH8cocgUb6Cnzq6yivbWcI=",
+    "h1:xXigGPwW8MlrB6Br2ce+Bf35BbdzdPKa97T/q/xrrcA=",
+    "h1:yDYzQ2ncNE9q1288xAgflIPq98bOOYsAb9tq6vkbFzw=",
+    "zh:129d7d5944b31f40916b1ca86b31cef65a6b02fd36008809d13c561894bfedb9",
+    "zh:24631608288b0bcd35c1fc63dc5839572254d881c0589ebba036be52b2fc04d6",
+    "zh:5a0f100d7eb256463fe5a2aa1a7128391147b2c5fc895ff1b1ef54fc5b8f15ab",
+    "zh:6a8a1126ab9ca61be3b62ec184f6b2e7cbf01cde810acc548cee27d71277b09b",
+    "zh:6fffef54fd3aada85c074e34d41386aa09c79a308a4679132da31c7272733c6c",
+    "zh:899c992d2aa290ebe1304da0289c5104a630bca421cc6a88ce55bf0960aab1b4",
+    "zh:960fd6c2847859a843dd9dbfc95a0037a470aa744094d155a38a057175cf1502",
+    "zh:9b032b685a644634158ace5529e260dfc4447a280056f02858d205ea26753f69",
+    "zh:bba5477c97020c28ed12d4f5b36be2c1bf14d946d7e44b3690e5c23cd7ddf5e6",
+    "zh:c2ff6c33efef52441fa3485137972792031626dcabca2b1d8b6527d45f185279",
+    "zh:cd492b3dfd150de6bef8ad505293d3d53c6c907706f36d0e497b4fc027d8edb6",
+    "zh:d1f832bc33c42781454dc020c6937e7d0133155a5a9f64335309d64a34b36bb7",
+    "zh:d42e9cbebc77643556853b1ebbec14cefe70c57ee86cd3b8c71fbe7f523f07df",
+    "zh:d4c0466f578d7f990646bb0847e31ba3797f2100b6380ee1ca736887546c7621",
+    "zh:d9d81ecebfe6edabdd4c527f3f4debde3e052ff87c5ef4c67497ab3d7539e424",
   ]
 }
 
 provider "registry.terraform.io/bunnyway/bunnynet" {
-  version     = "0.19.1"
-  constraints = "~> 0.19"
+  version     = "0.18.2"
+  constraints = "~> 0.18"
   hashes = [
-    "h1:02CmekB5A4NtAeptTR7waaECJl66Gf3ww7Wtyg1cy+g=",
-    "h1:0VWwMHkHQXusR2vdyYWN1pNvfJUPt9OWh6glgZshCck=",
-    "h1:2NGfMzSWPCcyO2P2T9/lDS5MExYnaOfLuDEMiYvFBg4=",
-    "h1:2dXsvcYEGXsIf1IHD2Rq9HzgwrNNEA4+qOzBKpbFEpw=",
-    "h1:8R0H9DumQe0DjXTHRJXNiZUyTBDHT2vjfu/vB+WdRIw=",
-    "h1:9Gi5M2iKY+Oz8wAYoJh7i0u3mySBk5pretuyzcwgJOw=",
-    "h1:BZwoP8Ubi1iDueWXhSWb3Tlt/II4bJI0/p6/tqw4i1M=",
-    "h1:F4yWXkyv55F+97IQi/jYBLhBLyhz4hkokVCyEEQzbM4=",
-    "h1:MGHXEapStuXemfw3SikP2aLQCT+b7Ee/RrCHevSAAWA=",
-    "h1:Q10nENYoX8jIsBMz1kP8OBrkMeSNmFI2CfB6/MsWKAc=",
-    "h1:R9z1oacW8gD9hPTGTO37ngDAhAvlP33/PRhzkgXDStY=",
-    "h1:UYLBa5/V+giaZ2YYjkbPDKMRO9eQRNcWEnpZqU2I/yU=",
-    "h1:Wz/QDxt1Kved07fCwqMh+6jtTtwQ/xKi9mXE2StV7vw=",
-    "h1:Yq0JSIW4Jir3EVO2w7C/iM76yzYKG5eYw51woX6CXJo=",
-    "h1:e/PEmAJszFbjdfsAMJosDbkxtHwHNnByd/3nKJmE3Sg=",
-    "h1:lMVwei5IGLQCrPMqAmcpbXs/BjaG7k6HbjhuWtr0kIA=",
-    "h1:m8dyuq1sXJ9sxjZkU3ZUsjC77BWY87GiraNvxHluSYs=",
-    "zh:15e84e2fca2bbaec9c9f4d14d1a037d02f4d8cc1d1bdff04709d51085f950774",
-    "zh:1b9d0cbb7f08e7a554afb8c1e733942a77aa0c8112e8b2b7092c040794f0b113",
-    "zh:28768988a8ec70e5392ca93375717b83a9aa2eeaa21be2f53c28550273b97065",
-    "zh:2f357c1d2c013627e4e785c350fc72ccc0bfbebaa6062e536ec7eb9cfecfc913",
-    "zh:4a41bab7fba5415b8c422f5c03d6fb054ae210e1eb180fab4081d4fa976080b5",
-    "zh:6c10fad0bd03bbf053b97ad51f0a24e9a0c43a7fc10727033a39eec90ed0a51e",
-    "zh:795980ac64b0f9bda521f829187eb7b296baa682b7e8d409126f85e6a6f9bcc0",
-    "zh:841a7e234852ecd516e2dc52c7d31025a704242aeafee15eb36bf392e62f918f",
+    "h1:3rZl+Co3WMpwj8SciPaCNXoGA31aSoqp6iweLarr5m4=",
+    "h1:6d9cKLhz8QOZ4R5yVX1G0TsWL+K1Abtfbm3xngndxto=",
+    "h1:EBjjkfp5Gx7nXP1DVO+tLhsow6fEUvaIjsCEFRT2fY8=",
+    "h1:Nu2DoHGOv2YN7ag4kFGpfnPeRDh6bzWqY5anW+ETGpM=",
+    "h1:OnvZxg28m4/UJeEhHVLU4kM2MZ704sxRzYfLWlLxnhA=",
+    "h1:PiCse2/UcB7nkPxosveHsJN/jKdBC8AH6tKTxcHSYKw=",
+    "h1:QAahdtlDBUon7eMwNN0D2V6CxgasOXIi+9/UExik6Sg=",
+    "h1:Su5z0A7/UaSm/E7FJnFjpDVQaa1Ju5+fZ8Mirf8E+k8=",
+    "h1:UA3a78FJAPAGqCCvlIg9ekPltpVsrmEhwFLalWCFnew=",
+    "h1:XAlCTNHRtgUkNjdUItkiak6ajjT7wFJzJN8frXKD5Ms=",
+    "h1:ZgLBOPebYxH059z1cGHmjYO8CTf+tbWPb3VbO97S2YM=",
+    "h1:anR91C2F6NDJoQQQIy6KHChodnTaSKnApSWSGM4jSX0=",
+    "h1:gVmaNmIu4gEiITM+CAb66e+zncAqzNBYkniTZfvxZ5Y=",
+    "h1:pODlGrkPqHV4yhXiO7LLLu11HtcuxOAB2zUx3B8w1vI=",
+    "h1:qEYeHEKVRcc78q5xiRGJSY8DGQpLj40KafEXUxFfaQc=",
+    "h1:qdVz+O0lLHhyf5YX3ujmoVvAGlKqvi+YOPUzVTqpKzY=",
+    "h1:yTrPkdc9eQkxfPLBYydFf0fpcjarP5w0sdLPzekD9RQ=",
+    "zh:0fe3987c927d81196c97504470ce4d26c3ad0014f8ee3d0c1be422d08cfcf49c",
+    "zh:15c36dc69e058876921ac887213e1716217d159b7ee7f0f233e21fb35be85178",
+    "zh:29d58d7b76dcb142a06d4edd15b8500fe6c1afb7f7c056ada17e2d42bb999fbd",
+    "zh:33d313836c0e985186b3456c0946e062b27cacfcb08611d0a394f36db9ee1aef",
+    "zh:47e085e52e9b24ad85fa2988dbb8604256a970a6f53f7fa6aab04d8ae756a738",
+    "zh:4ba4f87571ca72fbc6c24ab71f2f7b5a086938262e2d8e5c0b39701ed52f8bbc",
+    "zh:4c6bae97b543c5b328e1ecbcf7c976351b4b381654e9d3e569270dcab3ba816c",
     "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:8c876a0a26b249151f0918ee836e24660513c2345c23a06e0f54a28c7c6966b7",
-    "zh:906a791496cf11dcfdfe43a4167414cb473e548f0bd86d4b8a6a95450b523133",
-    "zh:9431757bf5b7d055ecc1d3c8465216d5e7a648b75e0e35b136ac8fc25382e97d",
-    "zh:967fd248df86fc246536727e996a7334711f4c6fe9e3d01ec9f03abe621a9783",
-    "zh:a6710fbd30f8a4844eb025d616057e78bbb255a7d05cc73876dae55a5d6b0d06",
-    "zh:b5f260899555430c109da35d2c483999d61b127beda6c2a7b39eb67f27d754c8",
-    "zh:d24882eb63c6452ed27666e896224b1d866ad00645d6ecc53de84d1687d27fc4",
-    "zh:e573eb0c99ea7195ec1ed3da728caddacc68a126d82679fb490438c781382f4d",
-    "zh:fcf0a66c0c0b62af505c5f0f8fe59bca77d6085a0b07763be33420101183702e",
+    "zh:9ba7ab56537963db2449d217528a751469c9dc4e413dec3e3d63fd7daf3db4ef",
+    "zh:a3c48eda7e11b03b831f2a639797524bb335f155f0dff0e999cf3496994da8b3",
+    "zh:aab8f4814d55ef8c6c285d2496ae412437017d0fd1be70106f7b3a4a6e764feb",
+    "zh:b92b9beacf71ae894717c2036ceb68db52c9c43af4a01b8209eceae9f91a2c8e",
+    "zh:da389285938e22e1249e6a00cebf12a9f67334743f0b3f66399e6881028bda11",
+    "zh:dadcc33d06e6f64a17d1965478af5e8bbdc971e92ec9b14e384c5d43861d63f7",
+    "zh:e090c916e6da685125194af4f0a1fd772494a0c63f3f16ab3741782e17f4a8f9",
+    "zh:e5881e00fa970c08e66e8079b47d69b76def6e7ff3bdc35b68d7811e5ece55d1",
+    "zh:eeebb25a066a6287d545c91c0fc264acee5b28174d0979faeebdac3bd14f0fff",
+    "zh:f368195116c9ce0181aa7527c51ae5e7ab23d42fb966acf4eddca344621ae339",
   ]
 }
diff --git a/local/patches/RcppParallel/force-bundled-tbb-6.0.0.patch b/local/patches/RcppParallel/force-bundled-tbb-6.0.0.patch
deleted file mode 100644
index a7f91dc..0000000
--- a/local/patches/RcppParallel/force-bundled-tbb-6.0.0.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff --git a/R/aaa.R b/R/aaa.R
-index 568a2aa..2744059 100644
---- a/R/aaa.R
-+++ b/R/aaa.R
-@@ -5,4 +5,21 @@ TBB_LIB  <- ""
- TBB_INC  <- ""
- 
- TBB_NAME <- "tbb"
--TBB_MALLOC_NAME <- "tbbmalloc"
-\ No newline at end of file
-+TBB_MALLOC_NAME <- "tbbmalloc"
-+
-+# bincraft patch: build images (ours did until build-env-images c51ed09) and
-+# plenty of user environments export TBB_ROOT / TBB_LIB / TBB_INC. A binary we
-+# publish always carries its own oneTBB in RcppParallel/lib -- see the
-+# companion changes in tools/config/configure.R and src/install.libs.R -- so
-+# honouring those variables at run time is actively harmful: .onLoad() would
-+# dyn.load() a second, unrelated TBB into the process next to the bundled one
-+# (two copies of the same symbols in the global scope, which segfaults R on
-+# load), and RcppParallelLibs() / CxxFlags() would hand that system TBB to
-+# dependents such as rstan, putting NEEDED libtbb.so.12 back into their
-+# binaries. Read the variables only when explicitly opted back in.
-+bincraftGetenv <- function(name, unset = "") {
-+   if (Sys.getenv("BINCRAFT_ALLOW_SYSTEM_TBB", unset = "FALSE") == "TRUE")
-+      Sys.getenv(name, unset = unset)
-+   else
-+      unset
-+}
-\ No newline at end of file
-diff --git a/R/tbb.R b/R/tbb.R
-index 3d8fbb3..9560165 100644
---- a/R/tbb.R
-+++ b/R/tbb.R
-@@ -17,7 +17,7 @@ tbbLibraryPath <- function(name = NULL) {
-    sysname <- Sys.info()[["sysname"]]
- 
-    # find root for TBB install
--   tbbRoot <- Sys.getenv("TBB_LIB", unset = tbbRoot())
-+   tbbRoot <- bincraftGetenv("TBB_LIB", unset = tbbRoot())
-    if (is.null(name))
-       return(tbbRoot)
- 
-@@ -60,7 +60,7 @@ tbbCxxFlags <- function() {
-    flags <- c("-DRCPP_PARALLEL_USE_TBB=1")
- 
-    # if TBB_INC is set, apply those library paths
--   tbbInc <- Sys.getenv("TBB_INC", unset = TBB_INC)
-+   tbbInc <- bincraftGetenv("TBB_INC", unset = TBB_INC)
-    if (!file.exists(tbbInc)) {
-       tbbInc <- system.file("include", package = "RcppParallel")
-    }
-@@ -100,7 +100,7 @@ tbbLdFlags <- function() {
-    }
-    
-    # shortcut if TBB_LIB defined
--   tbbLib <- Sys.getenv("TBB_LINK_LIB", Sys.getenv("TBB_LIB", unset = TBB_LIB))
-+   tbbLib <- bincraftGetenv("TBB_LINK_LIB", bincraftGetenv("TBB_LIB", unset = TBB_LIB))
-    if (nzchar(tbbLib)) {
-       if (R.version$os == "emscripten") {
-          fmt <- "-L%1$s -l%2$s"
-diff --git a/src/install.libs.R b/src/install.libs.R
-index 4dcbac2..57dbc74 100644
---- a/src/install.libs.R
-+++ b/src/install.libs.R
-@@ -258,6 +258,18 @@ prependFlags <- function(prependFlags, toFlags) {
- tbbLib <- Sys.getenv("TBB_LIB")
- tbbInc <- Sys.getenv("TBB_INC")
- 
-+# bincraft patch: the companion change in tools/config/configure.R stops an
-+# ambient TBB_LIB / TBB_INC from selecting a system TBB, but this script is
-+# also run directly by `R CMD INSTALL` (not only through the `tbb` rule in
-+# src/Makevars, which passes the configured values), so at install time it
-+# still sees the image's environment and would symlink the system libraries
-+# into RcppParallel/lib. Drop them here for the same reason, under the same
-+# opt-out.
-+if (Sys.getenv("BINCRAFT_ALLOW_SYSTEM_TBB", unset = "FALSE") != "TRUE") {
-+   tbbLib <- ""
-+   tbbInc <- ""
-+}
-+
- args <- commandArgs(trailingOnly = TRUE)
- if (identical(args, "build")) {
-    if (nzchar(tbbLib) && nzchar(tbbInc)) {
-diff --git a/tools/config/configure.R b/tools/config/configure.R
-index a001e63..bfe8c8e 100644
---- a/tools/config/configure.R
-+++ b/tools/config/configure.R
-@@ -144,6 +144,24 @@ tbbRoot  <- Sys.getenv("TBB_ROOT", unset = NA)
- tbbLib   <- Sys.getenv("TBB_LIB", unset = NA)
- tbbInc   <- Sys.getenv("TBB_INC", unset = NA)
- 
-+# bincraft patch: ignore an ambient TBB_ROOT / TBB_LIB / TBB_INC. Our build
-+# images exported these until build-env-images c51ed09 (a leftover from
-+# RcppParallel 5.x, whose bundled Intel TBB would not build on musl or with
-+# modern g++), and any of them switches the branches below to a system TBB.
-+# The published binary then records NEEDED libtbb.so.12 (or libtbb.so.2 for
-+# the classic Intel TBB) and gets a RcppParallel/lib full of absolute symlinks
-+# into the image's library dir, so it cannot dyn.load on a consumer machine
-+# without that exact TBB. 6.x bundles oneTBB 2022 and builds it with cmake on
-+# every platform we ship, so the bundled copy is always the right choice here;
-+# forcing it in the package rather than relying on the image environment keeps
-+# the binary correct whichever image version CI happens to pull. Set
-+# BINCRAFT_ALLOW_SYSTEM_TBB=TRUE to restore the upstream behaviour.
-+if (Sys.getenv("BINCRAFT_ALLOW_SYSTEM_TBB", unset = "FALSE") != "TRUE") {
-+   tbbRoot <- NA
-+   tbbLib  <- NA
-+   tbbInc  <- NA
-+}
-+
- tbbName  <- Sys.getenv("TBB_NAME", unset = "tbb")
- tbbMallocName <- Sys.getenv("TBB_MALLOC_NAME", unset = "tbbmalloc")
- 
-@@ -224,10 +242,21 @@ define(
- )
- 
- # set PKG_LIBS
-+#
-+# bincraft patch: the library directories below are passed as plain '-L', not
-+# '-Wl,-L'. gcc expands its own search dirs (/usr/lib64, /usr/lib/<triplet>)
-+# into explicit '-L' options ahead of anything forwarded verbatim with '-Wl,',
-+# so with '-Wl,-L' a system libtbb.so wins over the one named here: on a build
-+# host with a distro TBB installed, '-ltbb' resolves to that library and
-+# RcppParallel.so records its SONAME (libtbb.so.12, or libtbb.so.2 for the
-+# classic Intel TBB) instead of the bundled 'libtbb.so'. The binary then loads
-+# the system TBB rather than the copy shipped in RcppParallel/lib, and fails
-+# outright on a machine that has no system TBB. gcc places a plain '-L' before
-+# its built-in dirs, so the intended library is found first.
- pkgLibs <- if (!is.na(tbbLib)) {
-    
-    c(
--      "-Wl,-L\"$(TBB_LIB)\"",
-+      "-L\"$(TBB_LIB)\"",
-       sprintf("-Wl,-rpath,%s", shQuote(tbbLib)),
-       "-l$(TBB_NAME)",
-       "-l$(TBB_MALLOC_NAME)"
-@@ -240,14 +269,14 @@ pkgLibs <- if (!is.na(tbbLib)) {
- } else if (R.version$os == "emscripten") {
-    
-    c(
--      "-Wl,-Ltbb/build/lib_release",
-+      "-Ltbb/build/lib_release",
-       "-l$(TBB_NAME)"
-    )
-    
- } else {
-    
-    c(
--      "-Wl,-Ltbb/build/lib_release",
-+      "-Ltbb/build/lib_release",
-       "-l$(TBB_NAME)",
-       "-l$(TBB_MALLOC_NAME)"
-    )
diff --git a/local/patches/RcppParallel/force-bundled-tbb-6.1.x.patch b/local/patches/RcppParallel/force-bundled-tbb-6.1.x.patch
deleted file mode 100644
index 948643c..0000000
--- a/local/patches/RcppParallel/force-bundled-tbb-6.1.x.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff --git a/R/aaa.R b/R/aaa.R
-index 568a2aa..2744059 100644
---- a/R/aaa.R
-+++ b/R/aaa.R
-@@ -5,4 +5,21 @@ TBB_LIB  <- ""
- TBB_INC  <- ""
- 
- TBB_NAME <- "tbb"
--TBB_MALLOC_NAME <- "tbbmalloc"
-\ No newline at end of file
-+TBB_MALLOC_NAME <- "tbbmalloc"
-+
-+# bincraft patch: build images (ours did until build-env-images c51ed09) and
-+# plenty of user environments export TBB_ROOT / TBB_LIB / TBB_INC. A binary we
-+# publish always carries its own oneTBB in RcppParallel/lib -- see the
-+# companion changes in tools/config/configure.R and src/install.libs.R -- so
-+# honouring those variables at run time is actively harmful: .onLoad() would
-+# dyn.load() a second, unrelated TBB into the process next to the bundled one
-+# (two copies of the same symbols in the global scope, which segfaults R on
-+# load), and RcppParallelLibs() / CxxFlags() would hand that system TBB to
-+# dependents such as rstan, putting NEEDED libtbb.so.12 back into their
-+# binaries. Read the variables only when explicitly opted back in.
-+bincraftGetenv <- function(name, unset = "") {
-+   if (Sys.getenv("BINCRAFT_ALLOW_SYSTEM_TBB", unset = "FALSE") == "TRUE")
-+      Sys.getenv(name, unset = unset)
-+   else
-+      unset
-+}
-\ No newline at end of file
-diff --git a/R/tbb.R b/R/tbb.R
-index 152fd16..4b06aa5 100644
---- a/R/tbb.R
-+++ b/R/tbb.R
-@@ -17,7 +17,7 @@ tbbLibraryPath <- function(name = NULL) {
-    sysname <- Sys.info()[["sysname"]]
- 
-    # find root for TBB install
--   tbbRoot <- Sys.getenv("TBB_LIB", unset = tbbRoot())
-+   tbbRoot <- bincraftGetenv("TBB_LIB", unset = tbbRoot())
-    if (is.null(name))
-       return(tbbRoot)
- 
-@@ -58,7 +58,7 @@ tbbCxxFlags <- function() {
-    flags <- c("-DRCPP_PARALLEL_USE_TBB=1")
- 
-    # if TBB_INC is set, apply those library paths
--   tbbInc <- Sys.getenv("TBB_INC", unset = TBB_INC)
-+   tbbInc <- bincraftGetenv("TBB_INC", unset = TBB_INC)
-    if (!file.exists(tbbInc)) {
-       tbbInc <- system.file("include", package = "RcppParallel")
-    }
-@@ -96,7 +96,7 @@ tbbLdFlags <- function() {
-    }
-    
-    # shortcut if TBB_LIB defined
--   tbbLib <- Sys.getenv("TBB_LINK_LIB", Sys.getenv("TBB_LIB", unset = TBB_LIB))
-+   tbbLib <- bincraftGetenv("TBB_LINK_LIB", bincraftGetenv("TBB_LIB", unset = TBB_LIB))
-    if (nzchar(tbbLib)) {
-       if (R.version$os == "emscripten") {
-          fmt <- "-L%1$s -l%2$s"
-diff --git a/src/install.libs.R b/src/install.libs.R
-index e770838..1dd2fc7 100644
---- a/src/install.libs.R
-+++ b/src/install.libs.R
-@@ -492,6 +492,18 @@ prependFlags <- function(prependFlags, toFlags) {
- tbbLib <- Sys.getenv("TBB_LIB")
- tbbInc <- Sys.getenv("TBB_INC")
- 
-+# bincraft patch: the companion change in tools/config/configure.R stops an
-+# ambient TBB_LIB / TBB_INC from selecting a system TBB, but this script is
-+# also run directly by `R CMD INSTALL` (not only through the `tbb` rule in
-+# src/Makevars, which passes the configured values), so at install time it
-+# still sees the image's environment and would symlink the system libraries
-+# into RcppParallel/lib. Drop them here for the same reason, under the same
-+# opt-out.
-+if (Sys.getenv("BINCRAFT_ALLOW_SYSTEM_TBB", unset = "FALSE") != "TRUE") {
-+   tbbLib <- ""
-+   tbbInc <- ""
-+}
-+
- args <- commandArgs(trailingOnly = TRUE)
- if (identical(args, "build")) {
-    if (nzchar(tbbLib) && nzchar(tbbInc)) {
-diff --git a/tools/config/configure.R b/tools/config/configure.R
-index c3842f9..adf7876 100644
---- a/tools/config/configure.R
-+++ b/tools/config/configure.R
-@@ -66,6 +66,24 @@ tbbRoot  <- Sys.getenv("TBB_ROOT", unset = NA)
- tbbLib   <- Sys.getenv("TBB_LIB", unset = NA)
- tbbInc   <- Sys.getenv("TBB_INC", unset = NA)
- 
-+# bincraft patch: ignore an ambient TBB_ROOT / TBB_LIB / TBB_INC. Our build
-+# images exported these until build-env-images c51ed09 (a leftover from
-+# RcppParallel 5.x, whose bundled Intel TBB would not build on musl or with
-+# modern g++), and any of them switches the branches below to a system TBB.
-+# The published binary then records NEEDED libtbb.so.12 (or libtbb.so.2 for
-+# the classic Intel TBB) and gets a RcppParallel/lib full of absolute symlinks
-+# into the image's library dir, so it cannot dyn.load on a consumer machine
-+# without that exact TBB. 6.x bundles oneTBB 2022 and builds it with cmake on
-+# every platform we ship, so the bundled copy is always the right choice here;
-+# forcing it in the package rather than relying on the image environment keeps
-+# the binary correct whichever image version CI happens to pull. Set
-+# BINCRAFT_ALLOW_SYSTEM_TBB=TRUE to restore the upstream behaviour.
-+if (Sys.getenv("BINCRAFT_ALLOW_SYSTEM_TBB", unset = "FALSE") != "TRUE") {
-+   tbbRoot <- NA
-+   tbbLib  <- NA
-+   tbbInc  <- NA
-+}
-+
- tbbName  <- Sys.getenv("TBB_NAME", unset = "tbb")
- tbbMallocName <- Sys.getenv("TBB_MALLOC_NAME", unset = "tbbmalloc")
- 
-@@ -146,6 +164,18 @@ define(
- )
- 
- # set PKG_LIBS
-+#
-+# bincraft patch: the non-Windows library directories below are passed as
-+# plain '-L', not '-Wl,-L'. gcc expands its own search dirs (/usr/lib64,
-+# /usr/lib/<triplet>) into explicit '-L' options ahead of anything forwarded
-+# verbatim with '-Wl,', so with '-Wl,-L' a system libtbb.so wins over the one
-+# named here: on a build host with a distro TBB installed, '-ltbb' resolves to
-+# that library and RcppParallel.so records its SONAME (libtbb.so.12, or
-+# libtbb.so.2 for the classic Intel TBB) instead of the bundled 'libtbb.so'.
-+# The binary then loads the system TBB rather than the copy shipped in
-+# RcppParallel/lib, and fails outright on a machine that has no system TBB.
-+# gcc places a plain '-L' before its built-in dirs, so the intended library is
-+# found first.
- pkgLibs <- if (.Platform$OS.type == "windows") {
- 
-    if (!is.na(tbbLib) && file.exists(file.path(tbbInc, "oneapi"))) {
-@@ -183,7 +213,7 @@ pkgLibs <- if (.Platform$OS.type == "windows") {
- } else if (!is.na(tbbLib)) {
- 
-    c(
--      "-Wl,-L\"$(TBB_LIB)\"",
-+      "-L\"$(TBB_LIB)\"",
-       sprintf("-Wl,-rpath,%s", shQuote(tbbLib)),
-       "-l$(TBB_NAME)",
-       "-l$(TBB_MALLOC_NAME)"
-@@ -192,14 +222,14 @@ pkgLibs <- if (.Platform$OS.type == "windows") {
- } else if (R.version$os == "emscripten") {
-    
-    c(
--      "-Wl,-Ltbb/build/lib_release",
-+      "-Ltbb/build/lib_release",
-       "-l$(TBB_NAME)"
-    )
-    
- } else {
-    
-    c(
--      "-Wl,-Ltbb/build/lib_release",
-+      "-Ltbb/build/lib_release",
-       "-l$(TBB_NAME)",
-       "-l$(TBB_MALLOC_NAME)"
-    )
diff --git a/local/patches/RcppParallel/force-bundled-tbb-6.2.x.patch b/local/patches/RcppParallel/force-bundled-tbb.patch
similarity index 67%
rename from local/patches/RcppParallel/force-bundled-tbb-6.2.x.patch
rename to local/patches/RcppParallel/force-bundled-tbb.patch
index d88cfc5..5c37fa6 100644
--- a/local/patches/RcppParallel/force-bundled-tbb-6.2.x.patch
+++ b/local/patches/RcppParallel/force-bundled-tbb.patch
@@ -1,5 +1,5 @@
 diff --git a/R/aaa.R b/R/aaa.R
-index 568a2aa..2744059 100644
+index 568a2aa..bfdab4c 100644
 --- a/R/aaa.R
 +++ b/R/aaa.R
 @@ -5,4 +5,21 @@ TBB_LIB  <- ""
@@ -10,16 +10,16 @@ index 568a2aa..2744059 100644
 \ No newline at end of file
 +TBB_MALLOC_NAME <- "tbbmalloc"
 +
-+# bincraft patch: build images (ours did until build-env-images c51ed09) and
-+# plenty of user environments export TBB_ROOT / TBB_LIB / TBB_INC. A binary we
-+# publish always carries its own oneTBB in RcppParallel/lib -- see the
-+# companion changes in tools/config/configure.R and src/install.libs.R -- so
-+# honouring those variables at run time is actively harmful: .onLoad() would
-+# dyn.load() a second, unrelated TBB into the process next to the bundled one
-+# (two copies of the same symbols in the global scope, which segfaults R on
-+# load), and RcppParallelLibs() / CxxFlags() would hand that system TBB to
-+# dependents such as rstan, putting NEEDED libtbb.so.12 back into their
-+# binaries. Read the variables only when explicitly opted back in.
++# bincraft patch: our build images (and plenty of user environments) export
++# TBB_ROOT / TBB_LIB / TBB_INC. A binary we publish always carries its own
++# oneTBB in RcppParallel/lib -- see the companion changes in
++# tools/config/configure.R and src/install.libs.R -- so honouring those
++# variables at run time is actively harmful: .onLoad() would dyn.load() a
++# second, unrelated TBB into the process next to the bundled one (two copies
++# of the same symbols in the global scope, which segfaults R on load), and
++# RcppParallelLibs() / CxxFlags() would hand that system TBB to dependents
++# such as rstan, putting NEEDED libtbb.so.12 back into their binaries. Read
++# the variables only when explicitly opted back in.
 +bincraftGetenv <- function(name, unset = "") {
 +   if (Sys.getenv("BINCRAFT_ALLOW_SYSTEM_TBB", unset = "FALSE") == "TRUE")
 +      Sys.getenv(name, unset = unset)
@@ -28,24 +28,32 @@ index 568a2aa..2744059 100644
 +}
 \ No newline at end of file
 diff --git a/R/tbb.R b/R/tbb.R
-index b071833..e3bf7a5 100644
+index 6f6a745..e407986 100644
 --- a/R/tbb.R
 +++ b/R/tbb.R
-@@ -19,3 +19,3 @@ tbbLibraryPath <- function(name = NULL) {
+@@ -17,7 +17,7 @@ tbbLibraryPath <- function(name = NULL) {
+    sysname <- Sys.info()[["sysname"]]
+ 
     # find root for TBB install
 -   tbbRoot <- Sys.getenv("TBB_LIB", unset = tbbRoot())
 +   tbbRoot <- bincraftGetenv("TBB_LIB", unset = tbbRoot())
     if (is.null(name))
-@@ -63,3 +63,3 @@ tbbCxxFlags <- function() {
+       return(tbbRoot)
+ 
+@@ -58,3 +58,3 @@ tbbCxxFlags <- function() {
     # if TBB_INC is set, apply those library paths
 -   tbbInc <- Sys.getenv("TBB_INC", unset = TBB_INC)
 +   tbbInc <- bincraftGetenv("TBB_INC", unset = TBB_INC)
     if (!file.exists(tbbInc)) {
-@@ -122,3 +122,3 @@ tbbLdFlags <- function() {
+@@ -117,7 +117,7 @@ tbbLdFlags <- function() {
+    }
+ 
     # shortcut if TBB_LIB defined
 -   tbbLib <- Sys.getenv("TBB_LINK_LIB", Sys.getenv("TBB_LIB", unset = TBB_LIB))
 +   tbbLib <- bincraftGetenv("TBB_LINK_LIB", bincraftGetenv("TBB_LIB", unset = TBB_LIB))
     if (nzchar(tbbLib)) {
+       if (R.version$os == "emscripten") {
+          fmt <- "-L%1$s -l%2$s"
 diff --git a/src/install.libs.R b/src/install.libs.R
 index 3b3cfda..c0e6f3e 100644
 --- a/src/install.libs.R
@@ -70,24 +78,24 @@ index 3b3cfda..c0e6f3e 100644
  if (identical(args, "build")) {
     if (nzchar(tbbLib) && nzchar(tbbInc)) {
 diff --git a/tools/config/configure.R b/tools/config/configure.R
-index c203a1f..0050b5c 100644
+index 6293fe1..eae4aaa 100644
 --- a/tools/config/configure.R
 +++ b/tools/config/configure.R
-@@ -79,6 +79,24 @@ tbbRoot  <- Sys.getenv("TBB_ROOT", unset = NA)
+@@ -40,6 +40,24 @@ tbbRoot  <- Sys.getenv("TBB_ROOT", unset = NA)
  tbbLib   <- Sys.getenv("TBB_LIB", unset = NA)
  tbbInc   <- Sys.getenv("TBB_INC", unset = NA)
  
-+# bincraft patch: ignore an ambient TBB_ROOT / TBB_LIB / TBB_INC. Our build
-+# images exported these until build-env-images c51ed09 (a leftover from
-+# RcppParallel 5.x, whose bundled Intel TBB would not build on musl or with
-+# modern g++), and any of them switches the branches below to a system TBB.
-+# The published binary then records NEEDED libtbb.so.12 (or libtbb.so.2 for
-+# the classic Intel TBB) and gets a RcppParallel/lib full of absolute symlinks
-+# into the image's library dir, so it cannot dyn.load on a consumer machine
-+# without that exact TBB. 6.x bundles oneTBB 2022 and builds it with cmake on
-+# every platform we ship, so the bundled copy is always the right choice here;
-+# forcing it in the package rather than relying on the image environment keeps
-+# the binary correct whichever image version CI happens to pull. Set
++# bincraft patch: ignore an ambient TBB_ROOT / TBB_LIB / TBB_INC. Several of
++# our build images export these (a leftover from RcppParallel 5.x, whose
++# bundled Intel TBB would not build on musl or with modern g++), and any of
++# them switches the branches below to a system TBB. The published binary then
++# records NEEDED libtbb.so.12 (or libtbb.so.2 for the classic Intel TBB) and
++# gets a RcppParallel/lib full of absolute symlinks into the image's library
++# dir, so it cannot dyn.load on a consumer machine without that exact TBB.
++# 6.x bundles oneTBB 2022 and builds it with cmake on every platform we ship,
++# so the bundled copy is always the right choice here; forcing it in the
++# package rather than relying on the image environment keeps the binary
++# correct whichever image version CI happens to pull. Set
 +# BINCRAFT_ALLOW_SYSTEM_TBB=TRUE to restore the upstream behaviour.
 +if (Sys.getenv("BINCRAFT_ALLOW_SYSTEM_TBB", unset = "FALSE") != "TRUE") {
 +   tbbRoot <- NA
@@ -98,7 +106,7 @@ index c203a1f..0050b5c 100644
  tbbName  <- Sys.getenv("TBB_NAME", unset = "tbb")
  tbbMallocName <- Sys.getenv("TBB_MALLOC_NAME", unset = "tbbmalloc")
  
-@@ -225,12 +243,23 @@ define(
+@@ -186,12 +204,23 @@ define(
  )
  
  # set PKG_LIBS
@@ -123,7 +131,7 @@ index c203a1f..0050b5c 100644
        if (.Platform$OS.type != "windows")
           sprintf("-Wl,-rpath,%s", shQuote(tbbLib)),
        "-l$(TBB_NAME)",
-@@ -240,14 +269,14 @@ pkgLibs <- if (!is.na(tbbLib)) {
+@@ -201,14 +230,14 @@ pkgLibs <- if (!is.na(tbbLib)) {
  } else if (R.version$os == "emscripten") {
  
     c(
diff --git a/local/patches/registry.json b/local/patches/registry.json
index 1f341b7..2457304 100644
--- a/local/patches/registry.json
+++ b/local/patches/registry.json
@@ -6,48 +6,8 @@
     "env": {},
     "configure_args": [],
     "makevars": {},
-    "patch": "RcppParallel/force-bundled-tbb-6.2.x.patch",
-    "reason": "RcppParallel 6.x builds its bundled oneTBB 2022 with cmake, but tools/config/configure.R passes the library dir as '-Wl,-L...', and gcc places its own search dirs (/usr/lib64, /usr/lib/<triplet>) ahead of anything forwarded with '-Wl,'. Every build image installs a distro libtbb, so '-ltbb' resolves to it: the binary records NEEDED libtbb.so.12 (libtbb.so.2 on el8/el9) instead of the bundled libtbb.so and cannot load on a machine without that exact system TBB. The patch passes a plain '-L' so the bundled build dir wins. As a safeguard it also makes configure.R, src/install.libs.R and R/tbb.R ignore an ambient TBB_ROOT/TBB_LIB/TBB_INC (opt out with BINCRAFT_ALLOW_SYSTEM_TBB=TRUE): the build images stopped exporting them in build-env-images c51ed09, but a stale image or ~/.Renviron would otherwise switch the build back to the system TBB, and R reads ~/.Renviron after the process environment, so no pipeline env can override it. The read sites move between releases, so each entry pins a patch generated against that version. Upstream still uses '-Wl,-L' in 6.2.1; drop these entries once a release passes a plain '-L'."
-  },
-  {
-    "package": "RcppParallel",
-    "versions": "6.2.0",
-    "platforms": ["*"],
-    "env": {},
-    "configure_args": [],
-    "makevars": {},
-    "patch": "RcppParallel/force-bundled-tbb-6.2.x.patch",
-    "reason": "RcppParallel 6.x builds its bundled oneTBB 2022 with cmake, but tools/config/configure.R passes the library dir as '-Wl,-L...', and gcc places its own search dirs (/usr/lib64, /usr/lib/<triplet>) ahead of anything forwarded with '-Wl,'. Every build image installs a distro libtbb, so '-ltbb' resolves to it: the binary records NEEDED libtbb.so.12 (libtbb.so.2 on el8/el9) instead of the bundled libtbb.so and cannot load on a machine without that exact system TBB. The patch passes a plain '-L' so the bundled build dir wins. As a safeguard it also makes configure.R, src/install.libs.R and R/tbb.R ignore an ambient TBB_ROOT/TBB_LIB/TBB_INC (opt out with BINCRAFT_ALLOW_SYSTEM_TBB=TRUE): the build images stopped exporting them in build-env-images c51ed09, but a stale image or ~/.Renviron would otherwise switch the build back to the system TBB, and R reads ~/.Renviron after the process environment, so no pipeline env can override it. The read sites move between releases, so each entry pins a patch generated against that version. Upstream still uses '-Wl,-L' in 6.2.1; drop these entries once a release passes a plain '-L'."
-  },
-  {
-    "package": "RcppParallel",
-    "versions": "6.1.1",
-    "platforms": ["*"],
-    "env": {},
-    "configure_args": [],
-    "makevars": {},
-    "patch": "RcppParallel/force-bundled-tbb-6.1.x.patch",
-    "reason": "RcppParallel 6.x builds its bundled oneTBB 2022 with cmake, but tools/config/configure.R passes the library dir as '-Wl,-L...', and gcc places its own search dirs (/usr/lib64, /usr/lib/<triplet>) ahead of anything forwarded with '-Wl,'. Every build image installs a distro libtbb, so '-ltbb' resolves to it: the binary records NEEDED libtbb.so.12 (libtbb.so.2 on el8/el9) instead of the bundled libtbb.so and cannot load on a machine without that exact system TBB. The patch passes a plain '-L' so the bundled build dir wins. As a safeguard it also makes configure.R, src/install.libs.R and R/tbb.R ignore an ambient TBB_ROOT/TBB_LIB/TBB_INC (opt out with BINCRAFT_ALLOW_SYSTEM_TBB=TRUE): the build images stopped exporting them in build-env-images c51ed09, but a stale image or ~/.Renviron would otherwise switch the build back to the system TBB, and R reads ~/.Renviron after the process environment, so no pipeline env can override it. The read sites move between releases, so each entry pins a patch generated against that version. Upstream still uses '-Wl,-L' in 6.2.1; drop these entries once a release passes a plain '-L'."
-  },
-  {
-    "package": "RcppParallel",
-    "versions": "6.1.0",
-    "platforms": ["*"],
-    "env": {},
-    "configure_args": [],
-    "makevars": {},
-    "patch": "RcppParallel/force-bundled-tbb-6.1.x.patch",
-    "reason": "RcppParallel 6.x builds its bundled oneTBB 2022 with cmake, but tools/config/configure.R passes the library dir as '-Wl,-L...', and gcc places its own search dirs (/usr/lib64, /usr/lib/<triplet>) ahead of anything forwarded with '-Wl,'. Every build image installs a distro libtbb, so '-ltbb' resolves to it: the binary records NEEDED libtbb.so.12 (libtbb.so.2 on el8/el9) instead of the bundled libtbb.so and cannot load on a machine without that exact system TBB. The patch passes a plain '-L' so the bundled build dir wins. As a safeguard it also makes configure.R, src/install.libs.R and R/tbb.R ignore an ambient TBB_ROOT/TBB_LIB/TBB_INC (opt out with BINCRAFT_ALLOW_SYSTEM_TBB=TRUE): the build images stopped exporting them in build-env-images c51ed09, but a stale image or ~/.Renviron would otherwise switch the build back to the system TBB, and R reads ~/.Renviron after the process environment, so no pipeline env can override it. The read sites move between releases, so each entry pins a patch generated against that version. Upstream still uses '-Wl,-L' in 6.2.1; drop these entries once a release passes a plain '-L'."
-  },
-  {
-    "package": "RcppParallel",
-    "versions": "6.0.0",
-    "platforms": ["*"],
-    "env": {},
-    "configure_args": [],
-    "makevars": {},
-    "patch": "RcppParallel/force-bundled-tbb-6.0.0.patch",
-    "reason": "RcppParallel 6.x builds its bundled oneTBB 2022 with cmake, but tools/config/configure.R passes the library dir as '-Wl,-L...', and gcc places its own search dirs (/usr/lib64, /usr/lib/<triplet>) ahead of anything forwarded with '-Wl,'. Every build image installs a distro libtbb, so '-ltbb' resolves to it: the binary records NEEDED libtbb.so.12 (libtbb.so.2 on el8/el9) instead of the bundled libtbb.so and cannot load on a machine without that exact system TBB. The patch passes a plain '-L' so the bundled build dir wins. As a safeguard it also makes configure.R, src/install.libs.R and R/tbb.R ignore an ambient TBB_ROOT/TBB_LIB/TBB_INC (opt out with BINCRAFT_ALLOW_SYSTEM_TBB=TRUE): the build images stopped exporting them in build-env-images c51ed09, but a stale image or ~/.Renviron would otherwise switch the build back to the system TBB, and R reads ~/.Renviron after the process environment, so no pipeline env can override it. The read sites move between releases, so each entry pins a patch generated against that version. Upstream still uses '-Wl,-L' in 6.2.1; drop these entries once a release passes a plain '-L'."
+    "patch": "RcppParallel/force-bundled-tbb.patch",
+    "reason": "RcppParallel 6.x bundles oneTBB 2022 and builds it with cmake on every platform we ship, so the system-TBB workaround needed for 5.x is gone, but two things still steer the build back to a system TBB. (1) Ambient TBB_ROOT/TBB_LIB/TBB_INC: several build images still export these (build-env-images dropped them, but the images are rebuilt only by cron/manual runs, so a stale image keeps them), and R reads ~/.Renviron *after* the process environment, so no pipeline-side env override can undo it. configure.R then takes the system-TBB branch, install.libs.R symlinks the image's libraries into RcppParallel/lib as absolute paths, and the binary records NEEDED libtbb.so.12 (libtbb.so.2 for the classic Intel TBB on el8/el9) -- it cannot dyn.load on a consumer machine without that exact TBB. Both files are patched to ignore those variables (opt out with BINCRAFT_ALLOW_SYSTEM_TBB=TRUE); install.libs.R needs it separately because R CMD INSTALL runs it outside the src/Makevars rule that passes the configured values. (2) Link order: the bundled branch passes its build dir as '-Wl,-Ltbb/build/lib_release', and gcc expands its own search dirs (/usr/lib64, /usr/lib/<triplet>) into '-L' options ahead of anything forwarded with '-Wl,', so '-ltbb' would still resolve to a distro TBB when one is installed; a plain '-L' puts the bundled dir first. Verified on the current build-env-ubuntu:jammy image (which still exports TBB_INC/TBB_LIB): NEEDED libtbb.so, RUNPATH $ORIGIN/../lib, real libtbb.so.2 in RcppParallel/lib, and the package loads with every system libtbb moved away."
   },
   {
     "package": "fs",
diff --git a/local/uvr-install.sh b/local/uvr-install.sh
index e103e13..3966e85 100755
--- a/local/uvr-install.sh
+++ b/local/uvr-install.sh
@@ -16,8 +16,8 @@
 # precisely because such a target may be shared (`/mnt/cache/R-pkgs` holds
 # bincraft and its dependencies alongside whatever this script installs).
 #
-# System dependencies come from uvr's vendored r-system-requirements rules,
-# with explicit prerequisites below for gaps in Alpine support.
+# System dependencies come from uvr's vendored r-system-requirements rules, so
+# `pak::sysreqs_db_update()` and `PKG_SYSREQS_PLATFORM` are no longer needed.
 #
 # Environment:
 #   UVR_R_BIN        R interpreter to install for; set by install-bincraft.R so
@@ -30,7 +30,7 @@
 set -eu
 
 # renovate: datasource=github-releases depName=nbafrank/uvr
-UVR_PIN="v0.4.7"
+UVR_PIN="v0.4.6"
 
 if [ "$#" -eq 0 ]; then
   echo "usage: $0 <pkg-spec>..." >&2
@@ -117,11 +117,4 @@ if command -v apt-get >/dev/null 2>&1; then
   apt-get update -qq || echo "warning: apt-get update failed; continuing" >&2
 fi
 
-# Alpine's build images lack libintl.h, which data.table needs when R enables
-# NLS. uvr does not resolve this prerequisite on Alpine, so install it before
-# compiling bincraft's dependencies (including when the library cache is cold).
-if command -v apk >/dev/null 2>&1; then
-  apk add --no-cache gettext-dev
-fi
-
 "$uvr_bin" sync --library "$target_lib" --install-system-deps
diff --git a/provider.tf b/provider.tf
index cb5a87d..d4f2564 100644
--- a/provider.tf
+++ b/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     bunnynet = {
       source = "registry.terraform.io/BunnyWay/bunnynet"
-      version = "~> 0.19"
+      version = "~> 0.18"
     }
   }
 }