From d1da3417e4351a093097bda5a297ec63969487b3 Mon Sep 17 00:00:00 2001 From: 2kybe3 Date: Sun, 3 May 2026 21:01:43 +0200 Subject: [PATCH] rust-parallel: 1.21.0 -> 1.22.0, fix tests, use `__structuredAttrs` Diff: https://github.com/aaronriekenberg/rust-parallel/compare/v1.21.0...v1.22.0 Changelog: https://github.com/aaronriekenberg/rust-parallel/releases/tag/v1.22.0 --- pkgs/by-name/ru/rust-parallel/package.nix | 31 ++++++++++------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ru/rust-parallel/package.nix b/pkgs/by-name/ru/rust-parallel/package.nix index 1efa21210414..daed6eaab0fd 100644 --- a/pkgs/by-name/ru/rust-parallel/package.nix +++ b/pkgs/by-name/ru/rust-parallel/package.nix @@ -1,39 +1,36 @@ { - bash, - fetchFromGitHub, lib, rustPlatform, + fetchFromGitHub, versionCheckHook, nix-update-script, + bashNonInteractive, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rust-parallel"; - version = "1.21.0"; + version = "1.22.0"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "aaronriekenberg"; repo = "rust-parallel"; rev = "v${finalAttrs.version}"; - hash = "sha256-86CUFtq6XpTYL7zpDBBfbSXlPYhWofwMjJSK698lclI="; + hash = "sha256-6SDWYIJDoDKANYZvYM2hdFzXTyqbfRA2uKQDFn+6erg="; }; - cargoHash = "sha256-g2R3dEvDv3uzZVXBFvsCoX/M0XuHhoE/mMHni6qEN1g="; + cargoHash = "sha256-uFx0Sli6uwmhHKQoT1aX0S5NwuWLu3M6g5pQYYpAsEI="; - postPatch = '' - substituteInPlace tests/dummy_shell.sh \ - --replace-fail "/bin/bash" "${bash}/bin/bash" + checkInputs = [ bashNonInteractive ]; + + # Some test require the output of tracing which for some reason hides info if RUST_LOG is set to "" which it is by default + logLevel = "info"; + + preCheck = '' + patchShebangs ./tests/dummy_shell.sh ''; - checkFlags = [ - "--skip=runs_echo_commands_dry_run" - "--skip=test_keep_order_with_sleep" - - "--skip=runs_regex_command_with_dollar_signs" - "--skip=runs_regex_from_command_line_args_nomatch_1" - "--skip=runs_regex_from_input_file_badline_j1" - ]; - nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true;