From 76e877fedb970f0bd2047e1667f65dc0a6253d0c Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Tue, 12 May 2026 12:24:46 +0000
Subject: [PATCH] solana-agave: 2.3.12 -> 3.1.14

---
 .../so/solana-agave/crossbeam-epoch.patch     | 49 -------------------
 pkgs/by-name/so/solana-agave/package.nix      | 13 ++---
 2 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/by-name/so/solana-agave/crossbeam-epoch.patch

diff --git a/pkgs/by-name/so/solana-agave/crossbeam-epoch.patch b/pkgs/by-name/so/solana-agave/crossbeam-epoch.patch
deleted file mode 100644
index b62f655618d9..000000000000
--- a/pkgs/by-name/so/solana-agave/crossbeam-epoch.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 0194c34ed2..0d58655f70 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1419,14 +1419,14 @@ dependencies = [
- 
- [[package]]
- name = "crossbeam-epoch"
--version = "0.9.5"
--source = "git+https://github.com/anza-xyz/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf"
-+version = "0.9.16"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa"
- dependencies = [
-+ "autocfg",
-  "cfg-if 1.0.0",
-  "crossbeam-utils",
-- "lazy_static",
-- "memoffset 0.6.4",
-- "scopeguard",
-+ "memoffset 0.9.0",
- ]
- 
- [[package]]
-@@ -3118,15 +3118,6 @@ dependencies = [
-  "libc",
- ]
- 
--[[package]]
--name = "memoffset"
--version = "0.6.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
--dependencies = [
-- "autocfg",
--]
--
- [[package]]
- name = "memoffset"
- version = "0.7.1"
-diff --git a/Cargo.toml b/Cargo.toml
-index 2ff2094d67..a3ace4459a 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -665,4 +665,4 @@
- [patch.crates-io]
- # for details, see https://github.com/anza-xyz/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf
--crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" }
-+# crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" }
diff --git a/pkgs/by-name/so/solana-agave/package.nix b/pkgs/by-name/so/solana-agave/package.nix
index 7e22eda533c2..d3eb6798699a 100644
--- a/pkgs/by-name/so/solana-agave/package.nix
+++ b/pkgs/by-name/so/solana-agave/package.nix
@@ -22,23 +22,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "solana-agave";
-  version = "2.3.12";
+  version = "3.1.14";
 
   src = fetchFromGitHub {
     owner = "anza-xyz";
     repo = "agave";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-25UgiC5jAnlNE8Z7WrQRIviCuFp4zg57ddYA4h0qJ6U=";
+    hash = "sha256-yi71jUtFJhv6gvWQC9YrEqhe4cB6QU+hokn3hTLww30=";
   };
 
-  cargoHash = "sha256-SVngabz9mrYNn7DlL7Rh7llvO4GmJdt5vpXVcjwqtNg=";
-
-  # For the same reason as discussed in solana-cli derivation (crossbeam softlink), the no_atomic file is missing
-  # and either must somehow be rendered unneeded (using an upstream package) or replaced. A cleaner, non-behavior-changing,
-  # solution would be to commit the file to the repo fork (replacing the softlink).
-  cargoPatches = [
-    ./crossbeam-epoch.patch
-  ];
+  cargoHash = "sha256-klcpQRrPvCVgfbhnK/MsZB3m4u2rg7qIq7YeBL3+ajw=";
 
   nativeBuildInputs = [
     installShellFiles