From 1c1c517c8d6e9b92179cb6f5b7c6a74e68bb8b79 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Wed, 9 Apr 2025 00:33:46 -0400
Subject: [PATCH 1/2] 
 tests.importCargoLock.gitDependencyRevNonWorkspaceNestedCrate: use system
 zlib

Fixes build on Darwin. (We could just bump libz-sys, but this is the
preferred change anyways.)
---
 .../default.nix                                    | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix
index 5b1dcc1aef61..6dac7a801284 100644
--- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix
+++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix
@@ -2,9 +2,8 @@
   rustPlatform,
   pkg-config,
   openssl,
+  zlib,
   lib,
-  darwin,
-  stdenv,
 }:
 let
   fs = lib.fileset;
@@ -26,13 +25,10 @@ rustPlatform.buildRustPackage {
     pkg-config
   ];
 
-  buildInputs =
-    [
-      openssl
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.Security
-    ];
+  buildInputs = [
+    openssl
+    zlib
+  ];
 
   cargoLock = {
     lockFile = ./Cargo.lock;

From 0d25674d1d48022fafcd1792719c358c4d419de7 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Wed, 9 Apr 2025 00:38:55 -0400
Subject: [PATCH 2/2] tests.importCargoLock.gitDependencyWorkspaceInheritance:
 fix build

Regressed in f80228a8059fd8b2ecf03bc82e910013badb3625.

This shouldn't happen again unless we change the order that keys are
inserted (like we did here), as tomli-w respects the sort order of its
input.
---
 .../git-dependency-workspace-inheritance/want.toml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml
index ec1331455bec..cd1cb594a769 100644
--- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml
+++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml
@@ -12,8 +12,8 @@ keywords = [
 bar = "1.0.0"
 
 [dependencies.foo]
+version = "1.0.0"
 features = [
     "cat",
     "meow",
 ]
-version = "1.0.0"