From ee0fac603c3d6571ba12b4230d38f049722d8cdb Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 4 Dec 2024 04:08:55 +0000
Subject: [PATCH 1/2] diesel-cli: 2.2.5 -> 2.2.6

Changelog: https://github.com/diesel-rs/diesel/releases/tag/v2.2.6
Diff: https://github.com/diesel-rs/diesel/compare/v2.2.5...v2.2.6
(cherry picked from commit f73975a6e3425905d9e409b2f41a2c3efeb69141)
---
 pkgs/by-name/di/diesel-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index b4f721c5305db..55df1b18be230 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.2.5";
+  version = "2.2.6";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-cMGSBZ2UexIvSWRI2LIXR7thKciM9+HTB4V8FWpP3ZU=";
+    hash = "sha256-jKTQxlmpTlb0eITwNbnYfONknGhHsO/nzdup04ikEB0=";
   };
 
-  cargoHash = "sha256-Qdi9zdBiaAWS0Ao/8Z1jrb07FLE92ETd7RCMd/7J+mI=";
+  cargoHash = "sha256-+QbCPHczxCkDOFo/PDFTK0xReCWoz8AiLNwXA3aG9N0=";
 
   nativeBuildInputs = [
     installShellFiles

From cbfaf563277ff6d3c856ed4f8a952ba51cb01b87 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 4 Dec 2024 00:53:22 -0500
Subject: [PATCH 2/2] diesel-cli: migrate to new darwin SDK pattern

https://github.com/NixOS/nixpkgs/issues/354146
(cherry picked from commit e032f3a2586281b31dd479803bbaa9fe95528370)
---
 pkgs/by-name/di/diesel-cli/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index 55df1b18be230..37b0afc49ebb0 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -1,24 +1,24 @@
 {
   lib,
   stdenv,
+  diesel-cli,
   fetchCrate,
-  rustPlatform,
   installShellFiles,
-  darwin,
   libiconv,
   libmysqlclient,
   nix-update-script,
   openssl,
   pkg-config,
   postgresql,
+  rustPlatform,
   sqlite,
   testers,
   zlib,
-  diesel-cli,
   sqliteSupport ? true,
   postgresqlSupport ? true,
   mysqlSupport ? true,
 }:
+
 assert lib.assertMsg (lib.elem true [
   postgresqlSupport
   mysqlSupport
@@ -44,8 +44,6 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs =
     [ openssl ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security
-    ++ lib.optional (stdenv.hostPlatform.isDarwin && mysqlSupport) libiconv
     ++ lib.optional sqliteSupport sqlite
     ++ lib.optional postgresqlSupport postgresql
     ++ lib.optionals mysqlSupport [