From ee732eb25c5fd211c37f9311eaaaafe71406d497 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 26 Jul 2024 23:47:27 +0400
Subject: [PATCH 1/2] agate: migrate to by-name

---
 .../gemini/agate/default.nix => by-name/ag/agate/package.nix} | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{servers/gemini/agate/default.nix => by-name/ag/agate/package.nix} (96%)

diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/by-name/ag/agate/package.nix
similarity index 96%
rename from pkgs/servers/gemini/agate/default.nix
rename to pkgs/by-name/ag/agate/package.nix
index 18667580a5fe..a15c7055cae5 100644
--- a/pkgs/servers/gemini/agate/default.nix
+++ b/pkgs/by-name/ag/agate/package.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   rustPlatform,
   libiconv,
-  Security,
+  darwin,
   openssl,
   pkg-config,
   nix-update-script,
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
     [ openssl ]
     ++ lib.optionals stdenv.isDarwin [
       libiconv
-      Security
+      darwin.apple_sdk.frameworks.Security
     ];
 
   doInstallCheck = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a64931c538f..a531e38d4ee1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1598,10 +1598,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  agate = callPackage ../servers/gemini/agate {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   agi = callPackage ../tools/graphics/agi { };
 
   agola = callPackage ../development/tools/continuous-integration/agola { };

From 4a00656438544e0d77a16ff8d9353c45ba4bbcf7 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 26 Jul 2024 23:49:37 +0400
Subject: [PATCH 2/2] =?UTF-8?q?agate:=203.3.7=20=E2=86=92=203.3.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ag/agate/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix
index a15c7055cae5..90e2cf394a50 100644
--- a/pkgs/by-name/ag/agate/package.nix
+++ b/pkgs/by-name/ag/agate/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "agate";
-  version = "3.3.7";
+  version = "3.3.8";
 
   src = fetchFromGitHub {
     owner = "mbrubeck";
     repo = "agate";
     rev = "v${version}";
-    hash = "sha256-pNfTgkl59NTRDH+w23P49MUWzIXh5ElnJitMEYfsBnc=";
+    hash = "sha256-HK4ZTpRe6dEvBnjZLisSGXJmD5gTPEnf6f/gN0AHUsI=";
   };
 
-  cargoHash = "sha256-RuSvweZhPWS2C2lwncxWAW2XLQN6+bAslv3p4IwQ2BA=";
+  cargoHash = "sha256-yRCH4TRZ3m7ZG/NAEi1YDisSoad6FxCyojtXVvwbU9w=";
 
   nativeBuildInputs = [ pkg-config ];