From cc4f98be0d44e6cf78ab74b5f5dcf4198decb4db Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 21:21:33 +0100 Subject: [PATCH 1/2] cargo-nextest: 0.9.72 -> 0.9.77 --- .../tools/rust/cargo-nextest/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 00515c2252af..00533106971f 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -1,31 +1,21 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.72"; + version = "0.9.77"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-FQM1SVzGgmu6HHijP9kKEJPhhzSLs/jo36b4qnx0lb4="; + hash = "sha256-4wqWCa3HHctKSaSYiiLBa9PM6cWyr0H7blI9BWGLTuI="; }; - cargoHash = "sha256-2ttG9lPIkLRzDPcDNZjROOIIDhcEHfBvs/DTniZtQUY="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + cargoHash = "sha256-9XOkXK5sH+Qo8omS8V8FMgnh+oqLZL4paqoL9UOPevA="; cargoBuildFlags = [ "-p" "cargo-nextest" ]; cargoTestFlags = [ "-p" "cargo-nextest" ]; - # TODO: investigate some more why these tests fail in nix - checkFlags = [ - "--skip=tests_integration::test_list" - "--skip=tests_integration::test_relocated_run" - "--skip=tests_integration::test_run" - ]; meta = with lib; { description = "Next-generation test runner for Rust projects"; From c3304ee49dc1866d3f887e7df37aafcb4a3f6be0 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 21:21:33 +0100 Subject: [PATCH 2/2] cargo-nextest: add update script --- pkgs/development/tools/rust/cargo-nextest/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 00533106971f..ef49f94e1066 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 }: +{ lib, rustPlatform, fetchFromGitHub, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; @@ -16,6 +16,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" "cargo-nextest" ]; cargoTestFlags = [ "-p" "cargo-nextest" ]; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Next-generation test runner for Rust projects";