From 8a8d314038ebaea9b47c278f3ba0d19eea2507fb Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Sat, 29 Mar 2025 15:02:21 +1100
Subject: [PATCH] build(rust): use upstream version of `aya-build` (#8545)

The PR we have been waiting on got merged.
---
 rust/Cargo.lock | 24 ++++++++++++------------
 rust/Cargo.toml |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 80cbcf8d7..2aa9d5cfa 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -478,7 +478,7 @@ dependencies = [
 [[package]]
 name = "aya"
 version = "0.13.1"
-source = "git+https://github.com/aya-rs/aya#8724cc1b2d61a006f74bc0aab77a5df6dd6b60f3"
+source = "git+https://github.com/aya-rs/aya#6d36fe13d31fd4d1ed14d2dbe33f9536c5398993"
 dependencies = [
  "assert_matches",
  "aya-obj",
@@ -496,7 +496,7 @@ dependencies = [
 [[package]]
 name = "aya-build"
 version = "0.1.2"
-source = "git+https://github.com/thomaseizinger/aya?branch=fix%2Faya-build-pin-nightly#55ad60e4660a270a50a513f0ff6deb0d6c8d9a62"
+source = "git+https://github.com/aya-rs/aya#6d36fe13d31fd4d1ed14d2dbe33f9536c5398993"
 dependencies = [
  "anyhow",
  "cargo_metadata",
@@ -505,7 +505,7 @@ dependencies = [
 [[package]]
 name = "aya-ebpf"
 version = "0.1.1"
-source = "git+https://github.com/aya-rs/aya#8724cc1b2d61a006f74bc0aab77a5df6dd6b60f3"
+source = "git+https://github.com/aya-rs/aya#6d36fe13d31fd4d1ed14d2dbe33f9536c5398993"
 dependencies = [
  "aya-ebpf-bindings",
  "aya-ebpf-cty",
@@ -516,7 +516,7 @@ dependencies = [
 [[package]]
 name = "aya-ebpf-bindings"
 version = "0.1.1"
-source = "git+https://github.com/aya-rs/aya#8724cc1b2d61a006f74bc0aab77a5df6dd6b60f3"
+source = "git+https://github.com/aya-rs/aya#6d36fe13d31fd4d1ed14d2dbe33f9536c5398993"
 dependencies = [
  "aya-ebpf-cty",
 ]
@@ -524,12 +524,12 @@ dependencies = [
 [[package]]
 name = "aya-ebpf-cty"
 version = "0.2.2"
-source = "git+https://github.com/aya-rs/aya#8724cc1b2d61a006f74bc0aab77a5df6dd6b60f3"
+source = "git+https://github.com/aya-rs/aya#6d36fe13d31fd4d1ed14d2dbe33f9536c5398993"
 
 [[package]]
 name = "aya-ebpf-macros"
 version = "0.1.1"
-source = "git+https://github.com/aya-rs/aya#8724cc1b2d61a006f74bc0aab77a5df6dd6b60f3"
+source = "git+https://github.com/aya-rs/aya#6d36fe13d31fd4d1ed14d2dbe33f9536c5398993"
 dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
@@ -540,7 +540,7 @@ dependencies = [
 [[package]]
 name = "aya-log"
 version = "0.2.1"
-source = "git+https://github.com/aya-rs/aya#8724cc1b2d61a006f74bc0aab77a5df6dd6b60f3"
+source = "git+https://github.com/aya-rs/aya#6d36fe13d31fd4d1ed14d2dbe33f9536c5398993"
 dependencies = [
  "aya",
  "aya-log-common",
@@ -553,7 +553,7 @@ dependencies = [
 [[package]]
 name = "aya-log-common"
 version = "0.1.15"
-source = "git+https://github.com/aya-rs/aya#8724cc1b2d61a006f74bc0aab77a5df6dd6b60f3"
+source = "git+https://github.com/aya-rs/aya#6d36fe13d31fd4d1ed14d2dbe33f9536c5398993"
 dependencies = [
  "num_enum",
 ]
@@ -561,7 +561,7 @@ dependencies = [
 [[package]]
 name = "aya-log-ebpf"
 version = "0.1.1"
-source = "git+https://github.com/aya-rs/aya#8724cc1b2d61a006f74bc0aab77a5df6dd6b60f3"
+source = "git+https://github.com/aya-rs/aya#6d36fe13d31fd4d1ed14d2dbe33f9536c5398993"
 dependencies = [
  "aya-ebpf",
  "aya-log-common",
@@ -571,7 +571,7 @@ dependencies = [
 [[package]]
 name = "aya-log-ebpf-macros"
 version = "0.1.0"
-source = "git+https://github.com/aya-rs/aya#8724cc1b2d61a006f74bc0aab77a5df6dd6b60f3"
+source = "git+https://github.com/aya-rs/aya#6d36fe13d31fd4d1ed14d2dbe33f9536c5398993"
 dependencies = [
  "aya-log-common",
  "aya-log-parser",
@@ -583,7 +583,7 @@ dependencies = [
 [[package]]
 name = "aya-log-parser"
 version = "0.1.13"
-source = "git+https://github.com/aya-rs/aya#8724cc1b2d61a006f74bc0aab77a5df6dd6b60f3"
+source = "git+https://github.com/aya-rs/aya#6d36fe13d31fd4d1ed14d2dbe33f9536c5398993"
 dependencies = [
  "aya-log-common",
 ]
@@ -591,7 +591,7 @@ dependencies = [
 [[package]]
 name = "aya-obj"
 version = "0.2.1"
-source = "git+https://github.com/aya-rs/aya#8724cc1b2d61a006f74bc0aab77a5df6dd6b60f3"
+source = "git+https://github.com/aya-rs/aya#6d36fe13d31fd4d1ed14d2dbe33f9536c5398993"
 dependencies = [
  "bytes",
  "hashbrown 0.15.2",
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 8be346557..a5138b2c4 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -42,7 +42,7 @@ async-trait = { version = "0.1", default-features = false }
 atomicwrites = "0.4.4"
 axum = { version = "0.7.7", default-features = false }
 aya = { git = "https://github.com/aya-rs/aya" }
-aya-build = { git = "https://github.com/thomaseizinger/aya", branch = "fix/aya-build-pin-nightly" }
+aya-build = { git = "https://github.com/aya-rs/aya" }
 aya-ebpf = { git = "https://github.com/aya-rs/aya" }
 aya-log = { git = "https://github.com/aya-rs/aya" }
 aya-log-ebpf = { git = "https://github.com/aya-rs/aya" }