From 0809ab66023a80d45328f4f3b23f954b13b4887b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 3 Dec 2024 18:30:43 +0100
Subject: [PATCH] materialize: move to by-name

---
 .../sql => by-name/ma}/materialize/Cargo.lock |  0
 .../ma}/materialize/npm_deps.nix              |  0
 .../ma/materialize/package.nix}               | 23 ++++++-------------
 pkgs/top-level/all-packages.nix               |  5 ----
 4 files changed, 7 insertions(+), 21 deletions(-)
 rename pkgs/{servers/sql => by-name/ma}/materialize/Cargo.lock (100%)
 rename pkgs/{servers/sql => by-name/ma}/materialize/npm_deps.nix (100%)
 rename pkgs/{servers/sql/materialize/default.nix => by-name/ma/materialize/package.nix} (94%)

diff --git a/pkgs/servers/sql/materialize/Cargo.lock b/pkgs/by-name/ma/materialize/Cargo.lock
similarity index 100%
rename from pkgs/servers/sql/materialize/Cargo.lock
rename to pkgs/by-name/ma/materialize/Cargo.lock
diff --git a/pkgs/servers/sql/materialize/npm_deps.nix b/pkgs/by-name/ma/materialize/npm_deps.nix
similarity index 100%
rename from pkgs/servers/sql/materialize/npm_deps.nix
rename to pkgs/by-name/ma/materialize/npm_deps.nix
diff --git a/pkgs/servers/sql/materialize/default.nix b/pkgs/by-name/ma/materialize/package.nix
similarity index 94%
rename from pkgs/servers/sql/materialize/default.nix
rename to pkgs/by-name/ma/materialize/package.nix
index 1f7b35927b3b..bc4ad99f79cf 100644
--- a/pkgs/servers/sql/materialize/default.nix
+++ b/pkgs/by-name/ma/materialize/package.nix
@@ -4,14 +4,11 @@
   fetchFromGitHub,
   fetchzip,
   rustPlatform,
-  bootstrap_cmds,
-  DiskArbitration,
-  Foundation,
   cmake,
-  libiconv,
   openssl,
   perl,
   pkg-config,
+  darwin,
   protobuf,
   libclang,
   rdkafka,
@@ -143,22 +140,16 @@ rustPlatform.buildRustPackage rec {
       rustPlatform.bindgenHook
     ]
     # Provides the mig command used by the krb5-src build script
-    ++ lib.optional stdenv.hostPlatform.isDarwin bootstrap_cmds;
+    ++ lib.optional stdenv.hostPlatform.isDarwin darwin.bootstrap_cmds;
 
   # Needed to get openssl-sys to use pkg-config.
   OPENSSL_NO_VENDOR = 1;
 
-  buildInputs =
-    [
-      openssl
-      rdkafka
-      libclang
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-      DiskArbitration
-      Foundation
-    ];
+  buildInputs = [
+    openssl
+    rdkafka
+    libclang
+  ];
 
   # the check phase requires linking with rocksdb which can be a problem since
   # the rust rocksdb crate is not updated very often.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d1b16ac787e..dc9c1e0c5058 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11714,11 +11714,6 @@ with pkgs;
     yarn-berry = yarn-berry.override { nodejs = nodejs-slim_22; };
   };
 
-  materialize = callPackage ../servers/sql/materialize {
-    inherit (buildPackages.darwin) bootstrap_cmds;
-    inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
-  };
-
   micro-full = micro.wrapper.override {
     extraPackages = [
       wl-clipboard