From 2596b70a88e82f72b667ea9b532d50b868a32acc Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 26 Feb 2025 09:47:44 -0800
Subject: [PATCH 1/2] llama-cpp: switch to ggml-org

See https://github.com/ggml-org/llama.cpp/discussions/11801 for the announcement.
---
 pkgs/by-name/ll/llama-cpp/package.nix                        | 4 ++--
 pkgs/by-name/lo/local-ai/package.nix                         | 2 +-
 pkgs/development/python-modules/llama-cpp-python/default.nix | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 3330e6a1733b..068c8ef6f3b6 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -85,7 +85,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   version = "4731";
 
   src = fetchFromGitHub {
-    owner = "ggerganov";
+    owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
     hash = "sha256-XB7TI1/Ui9BGdsD5TVH5MMZalgEGquW9wYcAhxgAcP0=";
@@ -194,7 +194,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
 
   meta = with lib; {
     description = "Inference of Meta's LLaMA model (and others) in pure C/C++";
-    homepage = "https://github.com/ggerganov/llama.cpp/";
+    homepage = "https://github.com/ggml-org/llama.cpp";
     license = licenses.mit;
     mainProgram = "llama";
     maintainers = with maintainers; [
diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix
index d1517bc690f3..4607c27d9c26 100644
--- a/pkgs/by-name/lo/local-ai/package.nix
+++ b/pkgs/by-name/lo/local-ai/package.nix
@@ -149,7 +149,7 @@ let
       final: prev: {
         name = "llama-cpp-grpc";
         src = fetchFromGitHub {
-          owner = "ggerganov";
+          owner = "ggml-org";
           repo = "llama.cpp";
           rev = "ba8a1f9c5b675459c55a83e3f97f10df3a66c788";
           hash = "sha256-YunQh1760AcknBFwHc6uMZJ7V4OzEAKiwB9HBH1n4bc=";
diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix
index 12ee8778bebb..db736284c427 100644
--- a/pkgs/development/python-modules/llama-cpp-python/default.nix
+++ b/pkgs/development/python-modules/llama-cpp-python/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   patches = [
     # fix segfault when running tests due to missing default Metal devices
     (fetchpatch2 {
-      url = "https://github.com/ggerganov/llama.cpp/commit/acd38efee316f3a5ed2e6afcbc5814807c347053.patch?full_index=1";
+      url = "https://github.com/ggml-org/llama.cpp/commit/acd38efee316f3a5ed2e6afcbc5814807c347053.patch?full_index=1";
       stripLen = 1;
       extraPrefix = "vendor/llama.cpp/";
       hash = "sha256-71+Lpg9z5KPlaQTX9D85KS2LXFWLQNJJ18TJyyq3/pU=";

From 172075f664bb2a61482a15e86eeb9ff11b9cd050 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 26 Feb 2025 09:55:46 -0800
Subject: [PATCH 2/2] llama-cpp: 4731 -> 4783

---
 pkgs/by-name/ll/llama-cpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 068c8ef6f3b6..e1b6bf3d1b64 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -82,13 +82,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "4731";
+  version = "4783";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-XB7TI1/Ui9BGdsD5TVH5MMZalgEGquW9wYcAhxgAcP0=";
+    hash = "sha256-C/yDquq6fsrUW50R6CBo7xx5rgOiOxY1Cexmr+XgMo4=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT