From cb3ebcf24e6d5c1cb2703aa4283db81abfaacdfa Mon Sep 17 00:00:00 2001
From: Jade Ellis <jade@ellis.link>
Date: Tue, 19 May 2026 20:22:21 +0100
Subject: [PATCH] chore: Upgrade rust

This also upbrades the debian version to trixie, because the new LLVM
version doesn't seem to have a build
---
 .forgejo/actions/setup-llvm-with-apt/action.yml | 2 +-
 changelog.d/+f7afb79b.misc.md                   | 1 +
 docker/Dockerfile                               | 6 +++---
 rust-toolchain.toml                             | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/+f7afb79b.misc.md

diff --git a/.forgejo/actions/setup-llvm-with-apt/action.yml b/.forgejo/actions/setup-llvm-with-apt/action.yml
index f188e1280..b087589e5 100644
--- a/.forgejo/actions/setup-llvm-with-apt/action.yml
+++ b/.forgejo/actions/setup-llvm-with-apt/action.yml
@@ -17,7 +17,7 @@ inputs:
   llvm-version:
     description: 'LLVM version to install'
     required: false
-    default: '20'
+    default: '21'
 
 outputs:
   llvm-version:
diff --git a/changelog.d/+f7afb79b.misc.md b/changelog.d/+f7afb79b.misc.md
new file mode 100644
index 000000000..d8813dadc
--- /dev/null
+++ b/changelog.d/+f7afb79b.misc.md
@@ -0,0 +1 @@
+The version of Debian that the Docker-based build process uses has been upgraded from Bookworm to Trixie, meaning that standalone binaries now have a minimum glibc of 2.41, and can no longer be used on distro versions from before 2025-01-30
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ad107b363..05bc9712f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 ARG RUST_VERSION=1
-ARG DEBIAN_VERSION=bookworm
+ARG DEBIAN_VERSION=trixie
 
 FROM --platform=$BUILDPLATFORM docker.io/tonistiigi/xx AS xx
 FROM --platform=$BUILDPLATFORM rust:${RUST_VERSION}-slim-${DEBIAN_VERSION} AS base
@@ -10,7 +10,7 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean
 
 # Match Rustc version as close as possible
 # rustc -vV
-ARG LLVM_VERSION=21
+ARG LLVM_VERSION=22
 # ENV RUSTUP_TOOLCHAIN=${RUST_VERSION}
 
 # Install repo tools
@@ -22,7 +22,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
     apt-get update && apt-get install -y \
     pkg-config make jq \
-    wget curl git software-properties-common \
+    wget curl git lsb-release gpg \
     file
     # golang cmake
 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index e38456e3c..ed2fd154d 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -10,7 +10,7 @@
 
 [toolchain]
 profile = "minimal"
-channel = "1.92.0"
+channel = "1.95.0"
 components = [
     # For rust-analyzer
     "rust-src",