From 3f2761c053cfd0a4cb9aa06d1d3897114448cd2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Sep 2025 10:10:24 +0000
Subject: [PATCH 1/2] mailpit: 1.26.0 -> 1.27.7

---
 pkgs/servers/mail/mailpit/default.nix | 2 +-
 pkgs/servers/mail/mailpit/source.nix  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/mail/mailpit/default.nix b/pkgs/servers/mail/mailpit/default.nix
index 473df8ed243a..f0a4123977a6 100644
--- a/pkgs/servers/mail/mailpit/default.nix
+++ b/pkgs/servers/mail/mailpit/default.nix
@@ -78,7 +78,7 @@ buildGoModule {
     inherit (nixosTests) mailpit;
     version = testers.testVersion {
       package = mailpit;
-      command = "mailpit version";
+      command = "mailpit version --no-release-check";
     };
   };
 
diff --git a/pkgs/servers/mail/mailpit/source.nix b/pkgs/servers/mail/mailpit/source.nix
index e5093231e455..ead74889f8a1 100644
--- a/pkgs/servers/mail/mailpit/source.nix
+++ b/pkgs/servers/mail/mailpit/source.nix
@@ -1,6 +1,6 @@
 {
-  version = "1.26.0";
-  hash = "sha256-nhtPK4QuifX/1cwGcrOrTLy8KQCa6+qPSyYsjIUCafs=";
-  npmDepsHash = "sha256-B3vBbEnAIQXDHxZpTROkH7ojBaf6+2kKFQm7d9g5liQ=";
-  vendorHash = "sha256-EuAfLKIk96gtqCwKqeoGpnzR6OgxrWVMda9VQFM5DRg=";
+  version = "1.27.7";
+  hash = "sha256-VMfts0tfvW2IeEwSXSjlYLe9vQbZdZ9MrLIa9QUJYr4=";
+  npmDepsHash = "sha256-XRg3dnB3M0KwXV4qP//z11434WsLAxSGjqAb92bHawk=";
+  vendorHash = "sha256-tMxhHxc3SmxKo358W3Fr15RPaE3iJ1ETQRWpN0AVmE4=";
 }

From a1fffa47ebad2e7a0c46366fb6097c4b6170d709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phan=20Kochen?= <git@stephank.nl>
Date: Mon, 1 Sep 2025 16:24:07 +0200
Subject: [PATCH 2/2] mailpit: move to pkgs/by-name

---
 .../mailpit/default.nix => by-name/ma/mailpit/package.nix}   | 5 ++++-
 pkgs/{servers/mail => by-name/ma}/mailpit/source.nix         | 0
 pkgs/{servers/mail => by-name/ma}/mailpit/update.sh          | 0
 pkgs/top-level/all-packages.nix                              | 3 ---
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/{servers/mail/mailpit/default.nix => by-name/ma/mailpit/package.nix} (94%)
 rename pkgs/{servers/mail => by-name/ma}/mailpit/source.nix (100%)
 rename pkgs/{servers/mail => by-name/ma}/mailpit/update.sh (100%)

diff --git a/pkgs/servers/mail/mailpit/default.nix b/pkgs/by-name/ma/mailpit/package.nix
similarity index 94%
rename from pkgs/servers/mail/mailpit/default.nix
rename to pkgs/by-name/ma/mailpit/package.nix
index f0a4123977a6..90559dfa6957 100644
--- a/pkgs/servers/mail/mailpit/default.nix
+++ b/pkgs/by-name/ma/mailpit/package.nix
@@ -5,6 +5,7 @@
   nodejs,
   python3,
   libtool,
+  cctools,
   npmHooks,
   fetchFromGitHub,
   fetchNpmDeps,
@@ -28,6 +29,8 @@ let
     hash = source.hash;
   };
 
+  libtool' = if stdenv.hostPlatform.isDarwin then cctools else libtool;
+
   # Separate derivation, because if we mix this in buildGoModule, the separate
   # go-modules build inherits specific attributes and fails. Getting that to
   # work is hackier than just splitting the build.
@@ -43,7 +46,7 @@ let
     nativeBuildInputs = [
       nodejs
       python3
-      libtool
+      libtool'
       npmHooks.npmConfigHook
     ];
 
diff --git a/pkgs/servers/mail/mailpit/source.nix b/pkgs/by-name/ma/mailpit/source.nix
similarity index 100%
rename from pkgs/servers/mail/mailpit/source.nix
rename to pkgs/by-name/ma/mailpit/source.nix
diff --git a/pkgs/servers/mail/mailpit/update.sh b/pkgs/by-name/ma/mailpit/update.sh
similarity index 100%
rename from pkgs/servers/mail/mailpit/update.sh
rename to pkgs/by-name/ma/mailpit/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14b2e04db764..71847f21ff66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3580,9 +3580,6 @@ with pkgs;
     };
   };
   mailnagWithPlugins = mailnag.withPlugins (builtins.attrValues mailnag.availablePlugins);
-  mailpit = callPackage ../servers/mail/mailpit {
-    libtool = if stdenv.hostPlatform.isDarwin then cctools else libtool;
-  };
 
   man = man-db;