From 7dd53c5e66979d1ca16333c8f987c5b3c19e094b Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 20:08:55 -0400
Subject: [PATCH] maturin: migrate to by-name

---
 .../maturin/default.nix => by-name/ma/maturin/package.nix}    | 4 ++--
 .../tools/rust => by-name/ma}/maturin/pyo3-test/Cargo.lock    | 0
 .../tools/rust => by-name/ma}/maturin/pyo3-test/default.nix   | 0
 .../tools/rust => by-name/ma}/maturin/pyo3-test/generic.nix   | 0
 pkgs/top-level/all-packages.nix                               | 3 ---
 5 files changed, 2 insertions(+), 5 deletions(-)
 rename pkgs/{development/tools/rust/maturin/default.nix => by-name/ma/maturin/package.nix} (91%)
 rename pkgs/{development/tools/rust => by-name/ma}/maturin/pyo3-test/Cargo.lock (100%)
 rename pkgs/{development/tools/rust => by-name/ma}/maturin/pyo3-test/default.nix (100%)
 rename pkgs/{development/tools/rust => by-name/ma}/maturin/pyo3-test/generic.nix (100%)

diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/by-name/ma/maturin/package.nix
similarity index 91%
rename from pkgs/development/tools/rust/maturin/default.nix
rename to pkgs/by-name/ma/maturin/package.nix
index 266cd54fdfd2..ae91734bdeb9 100644
--- a/pkgs/development/tools/rust/maturin/default.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -3,8 +3,8 @@
 , stdenv
 , fetchFromGitHub
 , rustPlatform
+, darwin
 , libiconv
-, Security
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-EuMPcJAGz564cC9UWrlihBxRUJCtqw4jvP/SQgx2L/0=";
 
-  buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
+  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ];
 
   # Requires network access, fails in sandbox.
   doCheck = false;
diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock b/pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/rust/maturin/pyo3-test/Cargo.lock
rename to pkgs/by-name/ma/maturin/pyo3-test/Cargo.lock
diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/default.nix b/pkgs/by-name/ma/maturin/pyo3-test/default.nix
similarity index 100%
rename from pkgs/development/tools/rust/maturin/pyo3-test/default.nix
rename to pkgs/by-name/ma/maturin/pyo3-test/default.nix
diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix b/pkgs/by-name/ma/maturin/pyo3-test/generic.nix
similarity index 100%
rename from pkgs/development/tools/rust/maturin/pyo3-test/generic.nix
rename to pkgs/by-name/ma/maturin/pyo3-test/generic.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 046a6cb88624..d9117eaa8c12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16560,9 +16560,6 @@ with pkgs;
 
   leptosfmt = callPackage ../development/tools/rust/leptosfmt { };
 
-  maturin = callPackage ../development/tools/rust/maturin {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
   panamax = callPackage ../development/tools/rust/panamax { };
 
   ograc = callPackage ../development/tools/rust/ograc { };