From b5f04b8059dae2f3329fd9801e5a8393285bca4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Oct 2023 07:19:15 +0000 Subject: [PATCH 1/2] cargo-nextest: 0.9.59 -> 0.9.61 --- pkgs/development/tools/rust/cargo-nextest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 0dc2a708afe3..e722370ae89e 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.59"; + version = "0.9.61"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-32n1z5e40qkhHBAbwGhXa7L5NfkkN72AIKF796y82+g="; + hash = "sha256-kVADlW5XqKAuQ2n0lmEin67CXGkhTVWgJaPMKpvS5Gs="; }; - cargoHash = "sha256-sme7VE5JnjIWONaFYIOnv72UjUC/S+VezNSmRunmDv0="; + cargoHash = "sha256-IU2oW00VzEV8p3BpqIJZwXvdcaeweAF9nGHwtX+98vY="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 3c8a8010e1257958267b81d2bd4638bdc8d2c13b Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 23 Oct 2023 11:40:32 -0400 Subject: [PATCH 2/2] cargo-nextest: fix build on darwin --- pkgs/development/tools/rust/cargo-nextest/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index e722370ae89e..f911f5ee5873 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; @@ -13,7 +13,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-IU2oW00VzEV8p3BpqIJZwXvdcaeweAF9nGHwtX+98vY="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; cargoBuildFlags = [ "-p" "cargo-nextest" ]; cargoTestFlags = [ "-p" "cargo-nextest" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65292b677128..e4b02a821408 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17144,9 +17144,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreGraphics Foundation; }; - cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; cargo-profiler = callPackage ../development/tools/rust/cargo-profiler { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze {