From 85bd4c15016ee7162ae9e0bf26a93aad425499ef Mon Sep 17 00:00:00 2001
From: dbeley <6568955+dbeley@users.noreply.github.com>
Date: Thu, 12 Feb 2026 21:27:34 +0100
Subject: [PATCH 1/3] geekbench: move to by-name

(cherry picked from commit 27a8ad8da0d098f4325ca9a45926c51670ff37ac)
---
 pkgs/{tools/misc => by-name/ge}/geekbench/4.nix            | 0
 pkgs/{tools/misc => by-name/ge}/geekbench/5.nix            | 0
 .../geekbench/6.nix => by-name/ge/geekbench/package.nix}   | 0
 pkgs/top-level/all-packages.nix                            | 7 +++----
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename pkgs/{tools/misc => by-name/ge}/geekbench/4.nix (100%)
 rename pkgs/{tools/misc => by-name/ge}/geekbench/5.nix (100%)
 rename pkgs/{tools/misc/geekbench/6.nix => by-name/ge/geekbench/package.nix} (100%)

diff --git a/pkgs/tools/misc/geekbench/4.nix b/pkgs/by-name/ge/geekbench/4.nix
similarity index 100%
rename from pkgs/tools/misc/geekbench/4.nix
rename to pkgs/by-name/ge/geekbench/4.nix
diff --git a/pkgs/tools/misc/geekbench/5.nix b/pkgs/by-name/ge/geekbench/5.nix
similarity index 100%
rename from pkgs/tools/misc/geekbench/5.nix
rename to pkgs/by-name/ge/geekbench/5.nix
diff --git a/pkgs/tools/misc/geekbench/6.nix b/pkgs/by-name/ge/geekbench/package.nix
similarity index 100%
rename from pkgs/tools/misc/geekbench/6.nix
rename to pkgs/by-name/ge/geekbench/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99a323485426..74f2935b8f05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1725,10 +1725,9 @@ with pkgs;
 
   inherit (go-containerregistry) crane gcrane;
 
-  geekbench_4 = callPackage ../tools/misc/geekbench/4.nix { };
-  geekbench_5 = callPackage ../tools/misc/geekbench/5.nix { };
-  geekbench_6 = callPackage ../tools/misc/geekbench/6.nix { };
-  geekbench = geekbench_6;
+  geekbench_4 = callPackage ../by-name/ge/geekbench/4.nix { };
+  geekbench_5 = callPackage ../by-name/ge/geekbench/5.nix { };
+  geekbench_6 = geekbench;
 
   ghidra = callPackage ../tools/security/ghidra/build.nix {
     protobuf = protobuf_21;

From 007b3957bde89186f0ef90911be15dc135e20182 Mon Sep 17 00:00:00 2001
From: Cryolitia PukNgae <Cryolitia@gmail.com>
Date: Sun, 24 May 2026 15:59:42 +0800
Subject: [PATCH 2/3] geekbench_6: 6.4.0->6.7.1

(cherry picked from commit ca6262ad599f996ab2ff376162f89ecb3629ae6e)
---
 pkgs/by-name/ge/geekbench/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ge/geekbench/package.nix b/pkgs/by-name/ge/geekbench/package.nix
index 41ff65ced4e0..becd43e94d3c 100644
--- a/pkgs/by-name/ge/geekbench/package.nix
+++ b/pkgs/by-name/ge/geekbench/package.nix
@@ -11,15 +11,15 @@
 
 let
   inherit (stdenv.hostPlatform.uname) processor;
-  version = "6.4.0";
+  version = "6.7.1";
   sources = {
     "x86_64-linux" = {
       url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz";
-      hash = "sha256-Q4MwU3dIFheKKSMxzCBZI8XoForaN41BuRGVMhJaUKw=";
+      hash = "sha256-Ddypd9622dtL2GZIX5QI5y4oadDeoHN7GNS/5HKFis4=";
     };
     "aarch64-linux" = {
       url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxARMPreview.tar.gz";
-      hash = "sha256-PZ95w2X4sqTLZGZ5wygt7WjSK4Gfgtdh/UCPo+8Ysc8=";
+      hash = "sha256-blmsuD5t6jZx4uKVNl/DfED90oDNvd1QrPJIkQ4UoOM=";
     };
   };
   geekbench_avx2 = lib.optionalString stdenv.hostPlatform.isx86_64 "geekbench_avx2";

From e502d5242dc94aeef8117d721032189b79fdfe1c Mon Sep 17 00:00:00 2001
From: Cryolitia PukNgae <Cryolitia@gmail.com>
Date: Mon, 8 Jun 2026 20:56:17 +0800
Subject: [PATCH 3/3] geekbench6: add riscv64-linux

(cherry picked from commit fd3875b5e44f022185bc7f7edc96e7813dc003d4)
---
 pkgs/by-name/ge/geekbench/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ge/geekbench/package.nix b/pkgs/by-name/ge/geekbench/package.nix
index becd43e94d3c..e351e85219e2 100644
--- a/pkgs/by-name/ge/geekbench/package.nix
+++ b/pkgs/by-name/ge/geekbench/package.nix
@@ -21,6 +21,10 @@ let
       url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxARMPreview.tar.gz";
       hash = "sha256-blmsuD5t6jZx4uKVNl/DfED90oDNvd1QrPJIkQ4UoOM=";
     };
+    "riscv64-linux" = {
+      url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxRISCVPreview.tar.gz";
+      hash = "sha256-TByNeLqqHrnrLcX/meXNy6Evvebf0/xWnUohd/TwiAk=";
+    };
   };
   geekbench_avx2 = lib.optionalString stdenv.hostPlatform.isx86_64 "geekbench_avx2";
 in