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] 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;