From e95d301e3d8b89b2bf73b7fd44af93510b22d3d0 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:42:57 +0100 Subject: [PATCH 01/27] blightmud: prepare for structuredAttrs --- pkgs/by-name/bl/blightmud/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blightmud/package.nix b/pkgs/by-name/bl/blightmud/package.nix index aa9341e472c3..a07ceb831dc5 100644 --- a/pkgs/by-name/bl/blightmud/package.nix +++ b/pkgs/by-name/bl/blightmud/package.nix @@ -55,9 +55,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "test_tls_init_no_verify" "test_tls_init_verify" ]; - skipFlag = test: "--skip " + test; in - builtins.concatStringsSep " " (map skipFlag skipList); + builtins.map (x: "--skip=" + x) skipList; meta = { description = "Terminal MUD client written in Rust"; From cf64f006e2d588ce00a8868635315461c51f3c92 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:04 +0100 Subject: [PATCH 02/27] cargo-bisect-rustc: prepare for structuredAttrs --- pkgs/by-name/ca/cargo-bisect-rustc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix index 6138db509936..6e90d5dda528 100644 --- a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix +++ b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-SigRm2ZC7jH1iCEGRpka1G/e9kBEieFVU0YDBl2LfTM="; checkFlags = [ - "--skip test_github" # requires internet + "--skip=test_github" # requires internet ]; meta = { From ad32373cb260d7890db17a1cf1054d41ca7c82cc Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:04 +0100 Subject: [PATCH 03/27] cargo-deadlinks: prepare for structuredAttrs --- pkgs/by-name/ca/cargo-deadlinks/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix index 3e55dea4f82e..6ffb9137fab9 100644 --- a/pkgs/by-name/ca/cargo-deadlinks/package.nix +++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix @@ -20,15 +20,16 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # uses internet - "--skip non_existent_http_link --skip working_http_check" + "--skip=non_existent_http_link" + "--skip=working_http_check" # makes assumption about HTML paths that changed in rust 1.82.0 - "--skip simple_project::it_checks_okay_project_correctly" - "--skip cli_args::it_passes_arguments_through_to_cargo" + "--skip=simple_project::it_checks_okay_project_correctly" + "--skip=cli_args::it_passes_arguments_through_to_cargo" ] - ++ - lib.optional (stdenv.hostPlatform.system != "x86_64-linux") - # assumes the target is x86_64-unknown-linux-gnu - "--skip simple_project::it_checks_okay_project_correctly"; + ++ lib.optionals (stdenv.hostPlatform.system != "x86_64-linux") [ + # assumes the target is x86_64-unknown-linux-gnu + "--skip=simple_project::it_checks_okay_project_correctly" + ]; meta = { description = "Cargo subcommand to check rust documentation for broken links"; From 6d3faa58d5f41f1d51226aaec2e84b2da6a96ca9 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:04 +0100 Subject: [PATCH 04/27] cargo-geiger: prepare for structuredAttrs --- pkgs/by-name/ca/cargo-geiger/package.nix | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index adb07a71445a..62b5a3b23da4 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -53,21 +53,21 @@ rustPlatform.buildRustPackage (finalAttrs: { # skip tests with networking or other failures checkFlags = [ # panics - "--skip serialize_test2_quick_report" - "--skip serialize_test3_quick_report" - "--skip serialize_test6_quick_report" - "--skip serialize_test2_report" - "--skip serialize_test3_report" - "--skip serialize_test6_report" + "--skip=serialize_test2_quick_report" + "--skip=serialize_test3_quick_report" + "--skip=serialize_test6_quick_report" + "--skip=serialize_test2_report" + "--skip=serialize_test3_report" + "--skip=serialize_test6_report" # requires networking - "--skip test_package::case_2" - "--skip test_package::case_3" - "--skip test_package::case_6" - "--skip test_package::case_9" + "--skip=test_package::case_2" + "--skip=test_package::case_3" + "--skip=test_package::case_6" + "--skip=test_package::case_9" # panics, snapshot assertions fails - "--skip test_package_update_readme::case_2" - "--skip test_package_update_readme::case_3" - "--skip test_package_update_readme::case_5" + "--skip=test_package_update_readme::case_2" + "--skip=test_package_update_readme::case_3" + "--skip=test_package_update_readme::case_5" ]; passthru.tests.version = testers.testVersion { From a716df62647847c8f86b3607eec9294ab00ca8ff Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:04 +0100 Subject: [PATCH 05/27] cargo-sweep: prepare for structuredAttrs --- pkgs/by-name/ca/cargo-sweep/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cargo-sweep/package.nix b/pkgs/by-name/ca/cargo-sweep/package.nix index 03ae04c8b331..2ef3124650aa 100644 --- a/pkgs/by-name/ca/cargo-sweep/package.nix +++ b/pkgs/by-name/ca/cargo-sweep/package.nix @@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # Requires a rustup toolchain to be installed. - "--skip check_toolchain_listing_on_multiple_projects" + "--skip=check_toolchain_listing_on_multiple_projects" # Does not work with a `--target` build in the environment - "--skip empty_project_output" + "--skip=empty_project_output" ]; meta = { From 04ccd2813705cbd3ae18919d2dac5f8b12952139 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:05 +0100 Subject: [PATCH 06/27] cargo-valgrind: prepare for structuredAttrs --- pkgs/by-name/ca/cargo-valgrind/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-valgrind/package.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix index 7d99d1afc462..a9d021379ac8 100644 --- a/pkgs/by-name/ca/cargo-valgrind/package.nix +++ b/pkgs/by-name/ca/cargo-valgrind/package.nix @@ -33,9 +33,9 @@ rustPlatform.buildRustPackage rec { ''; checkFlags = [ - "--skip tests_are_runnable" - "--skip default_cargo_project_reports_no_violations" - "--skip empty_tests_not_leak_in_release_mode" + "--skip=tests_are_runnable" + "--skip=default_cargo_project_reports_no_violations" + "--skip=empty_tests_not_leak_in_release_mode" ]; meta = { From ea3ab84206d9f111b1f0db2d959c4c9faf76fbec Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:05 +0100 Subject: [PATCH 07/27] ego: prepare for structuredAttrs --- pkgs/by-name/eg/ego/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/eg/ego/package.nix b/pkgs/by-name/eg/ego/package.nix index bffa1ea6ec8f..1c1ee7fdf561 100644 --- a/pkgs/by-name/eg/ego/package.nix +++ b/pkgs/by-name/eg/ego/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { # requires access to /root checkFlags = [ - "--skip tests::test_check_user_homedir" + "--skip=tests::test_check_user_homedir" ]; postInstall = '' From 78fc7f7a67a2318b9c7bb8f9c385595d6428b936 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:05 +0100 Subject: [PATCH 08/27] flip-link: prepare for structuredAttrs --- pkgs/by-name/fl/flip-link/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix index 20781ad67400..20cf4ba03f71 100644 --- a/pkgs/by-name/fl/flip-link/package.nix +++ b/pkgs/by-name/fl/flip-link/package.nix @@ -23,9 +23,9 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # requires embedded toolchains - "--skip should_link_example_firmware::case_1_normal" - "--skip should_link_example_firmware::case_2_custom_linkerscript" - "--skip should_verify_memory_layout" + "--skip=should_link_example_firmware::case_1_normal" + "--skip=should_link_example_firmware::case_2_custom_linkerscript" + "--skip=should_verify_memory_layout" ]; meta = { From 5b52f8245199c01aa4884d608bc7f576671de964 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:05 +0100 Subject: [PATCH 09/27] gitlab-clippy: prepare for structuredAttrs --- pkgs/by-name/gi/gitlab-clippy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-clippy/package.nix b/pkgs/by-name/gi/gitlab-clippy/package.nix index 8ab667701379..afc3a0dfcbaf 100644 --- a/pkgs/by-name/gi/gitlab-clippy/package.nix +++ b/pkgs/by-name/gi/gitlab-clippy/package.nix @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-O3Pey0XwZITePTiVHrG5EVZpIp96sRWjUf1vzZ/JnCw="; - # TODO re-add theses tests once they get fixed in upstream + # TODO re-add these tests once they get fixed in upstream checkFlags = [ - "--skip cli::converts_error_from_pipe" - "--skip cli::converts_warnings_from_pipe" + "--skip=cli::converts_error_from_pipe" + "--skip=cli::converts_warnings_from_pipe" ]; meta = { From 876443bf9adcf98497cb692999b7ce4970268a95 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:06 +0100 Subject: [PATCH 10/27] grcov: prepare for structuredAttrs --- pkgs/by-name/gr/grcov/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/grcov/package.nix b/pkgs/by-name/gr/grcov/package.nix index 2197d4fafd72..1444dea0bf22 100644 --- a/pkgs/by-name/gr/grcov/package.nix +++ b/pkgs/by-name/gr/grcov/package.nix @@ -30,9 +30,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "test_integration_zip_dir" "test_integration_zip_zip" ]; - skipFlag = test: "--skip " + test; in - builtins.concatStringsSep " " (map skipFlag skipList); + builtins.map (x: "--skip=" + x) skipList; meta = { description = "Rust tool to collect and aggregate code coverage data for multiple source files"; From b0853568396a086d5eef5f86906d677544cb4fe6 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:06 +0100 Subject: [PATCH 11/27] hullcaster: prepare for structuredAttrs --- pkgs/by-name/hu/hullcaster/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/hu/hullcaster/package.nix b/pkgs/by-name/hu/hullcaster/package.nix index 7919a88a2630..c8e2775ada0d 100644 --- a/pkgs/by-name/hu/hullcaster/package.nix +++ b/pkgs/by-name/hu/hullcaster/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { # work around error: Could not create filepath: /homeless-shelter/.local/share checkFlags = [ - "--skip gpodder::tests::gpodder" + "--skip=gpodder::tests::gpodder" ]; meta = { From f08f08b1bae2ab695198cd0ab1f25e8f38eced2e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:06 +0100 Subject: [PATCH 12/27] karlender: prepare for structuredAttrs --- pkgs/by-name/ka/karlender/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ka/karlender/package.nix b/pkgs/by-name/ka/karlender/package.nix index 09a183858dd2..072a5d8fa82b 100644 --- a/pkgs/by-name/ka/karlender/package.nix +++ b/pkgs/by-name/ka/karlender/package.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { ]; checkFlags = [ - "--skip domain::time::tests::test_get_correct_offset_for_dst" # Need time + "--skip=domain::time::tests::test_get_correct_offset_for_dst" # Need time ]; preBuild = '' From 680b8aa23707d77c287a08842046e1093e8dc35f Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:06 +0100 Subject: [PATCH 13/27] lighthouse: prepare for structuredAttrs --- pkgs/by-name/li/lighthouse/package.nix | 456 +++++++++++++------------ 1 file changed, 229 insertions(+), 227 deletions(-) diff --git a/pkgs/by-name/li/lighthouse/package.nix b/pkgs/by-name/li/lighthouse/package.nix index b308db4f483c..fa09eb2b4509 100644 --- a/pkgs/by-name/li/lighthouse/package.nix +++ b/pkgs/by-name/li/lighthouse/package.nix @@ -67,10 +67,15 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aeTeHRT3QtxBRSNMCITIWmx89vGtox2OzSff8vZ+RYY="; }; - LIGHTHOUSE_DEPOSIT_CONTRACT_SPEC_URL = "file://${depositContractSpec}"; - LIGHTHOUSE_DEPOSIT_CONTRACT_TESTNET_URL = "file://${testnetDepositContractSpec}"; + env = { + LIGHTHOUSE_DEPOSIT_CONTRACT_SPEC_URL = "file://${depositContractSpec}"; + LIGHTHOUSE_DEPOSIT_CONTRACT_TESTNET_URL = "file://${testnetDepositContractSpec}"; - OPENSSL_NO_VENDOR = true; + OPENSSL_NO_VENDOR = true; + + # This is needed by the unit tests. + FORK_NAME = "capella"; + }; cargoBuildFlags = [ "--package lighthouse" @@ -96,229 +101,229 @@ rustPlatform.buildRustPackage rec { # All of these tests require network access checkFlags = [ - "--skip tests::broadcast_should_send_to_all_bns" - "--skip tests::check_candidate_order" - "--skip tests::first_success_should_try_nodes_in_order" - "--skip tests::update_all_candidates_should_update_sync_status" - "--skip engine_api::http::test::forkchoice_updated_v1_request" - "--skip engine_api::http::test::forkchoice_updated_v1_with_payload_attributes_request" - "--skip engine_api::http::test::get_block_by_hash_request" - "--skip engine_api::http::test::get_block_by_number_request" - "--skip engine_api::http::test::get_payload_v1_request" - "--skip engine_api::http::test::geth_test_vectors" - "--skip engine_api::http::test::new_payload_v1_request" - "--skip test::finds_valid_terminal_block_hash" - "--skip test::produce_three_valid_pos_execution_blocks" - "--skip test::rejects_invalid_terminal_block_hash" - "--skip test::rejects_terminal_block_with_equal_timestamp" - "--skip test::rejects_unknown_terminal_block_hash" - "--skip test::test_forked_terminal_block" - "--skip test::verifies_valid_terminal_block_hash" - "--skip deposit_tree::cache_consistency" - "--skip deposit_tree::double_update" - "--skip deposit_tree::updating" - "--skip eth1_cache::big_skip" - "--skip eth1_cache::double_update" - "--skip eth1_cache::pruning" - "--skip eth1_cache::simple_scenario" - "--skip fast::deposit_cache_query" - "--skip http::incrementing_deposits" - "--skip persist::test_persist_caches" - "--skip can_read_finalized_block" - "--skip invalid_attestation_delayed_slot" - "--skip invalid_attestation_empty_bitfield" - "--skip invalid_attestation_future_block" - "--skip invalid_attestation_future_epoch" - "--skip invalid_attestation_inconsistent_ffg_vote" - "--skip invalid_attestation_past_epoch" - "--skip invalid_attestation_target_epoch" - "--skip invalid_attestation_unknown_beacon_block_root" - "--skip invalid_attestation_unknown_target_root" - "--skip invalid_block_finalized_descendant" - "--skip invalid_block_finalized_slot" - "--skip invalid_block_future_slot" - "--skip invalid_block_unknown_parent" - "--skip justified_and_finalized_blocks" - "--skip justified_balances" - "--skip justified_checkpoint_updates_with_descendent" - "--skip justified_checkpoint_updates_with_descendent_first_justification" - "--skip justified_checkpoint_updates_with_non_descendent" - "--skip progressive_balances_cache_attester_slashing" - "--skip progressive_balances_cache_proposer_slashing" - "--skip valid_attestation" - "--skip valid_attestation_skip_across_epoch" - "--skip weak_subjectivity_check_epoch_boundary_is_skip_slot" - "--skip weak_subjectivity_check_epoch_boundary_is_skip_slot_failure" - "--skip weak_subjectivity_check_fails_early_epoch" - "--skip weak_subjectivity_check_fails_incorrect_root" - "--skip weak_subjectivity_check_fails_late_epoch" - "--skip weak_subjectivity_check_passes" - "--skip weak_subjectivity_pass_on_startup" - "--skip basic" - "--skip returns_200_ok" - "--skip release_tests::attestation_aggregation_insert_get_prune" - "--skip release_tests::attestation_duplicate" - "--skip release_tests::attestation_get_max" - "--skip release_tests::attestation_pairwise_overlapping" - "--skip release_tests::attestation_rewards" - "--skip release_tests::cross_fork_attester_slashings" - "--skip release_tests::cross_fork_exits" - "--skip release_tests::cross_fork_proposer_slashings" - "--skip release_tests::duplicate_proposer_slashing" - "--skip release_tests::max_coverage_attester_proposer_slashings" - "--skip release_tests::max_coverage_different_indices_set" - "--skip release_tests::max_coverage_effective_balances" - "--skip release_tests::overlapping_max_cover_attester_slashing" - "--skip release_tests::prune_attester_slashing_noop" - "--skip release_tests::prune_proposer_slashing_noop" - "--skip release_tests::simple_max_cover_attester_slashing" - "--skip release_tests::sync_contribution_aggregation_insert_get_prune" - "--skip release_tests::sync_contribution_duplicate" - "--skip release_tests::sync_contribution_with_fewer_bits" - "--skip release_tests::sync_contribution_with_more_bits" - "--skip release_tests::test_earliest_attestation" - "--skip per_block_processing::tests::block_replayer_peeking_state_roots" - "--skip per_block_processing::tests::fork_spanning_exit" - "--skip per_block_processing::tests::invalid_attester_slashing_1_invalid" - "--skip per_block_processing::tests::invalid_attester_slashing_2_invalid" - "--skip per_block_processing::tests::invalid_attester_slashing_not_slashable" - "--skip per_block_processing::tests::invalid_bad_proposal_1_signature" - "--skip per_block_processing::tests::invalid_bad_proposal_2_signature" - "--skip per_block_processing::tests::invalid_block_header_state_slot" - "--skip per_block_processing::tests::invalid_block_signature" - "--skip per_block_processing::tests::invalid_deposit_bad_merkle_proof" - "--skip per_block_processing::tests::invalid_deposit_count_too_small" - "--skip per_block_processing::tests::invalid_deposit_deposit_count_too_big" - "--skip per_block_processing::tests::invalid_deposit_invalid_pub_key" - "--skip per_block_processing::tests::invalid_deposit_wrong_sig" - "--skip per_block_processing::tests::invalid_parent_block_root" - "--skip per_block_processing::tests::invalid_proposer_slashing_duplicate_slashing" - "--skip per_block_processing::tests::invalid_proposer_slashing_proposal_epoch_mismatch" - "--skip per_block_processing::tests::invalid_proposer_slashing_proposals_identical" - "--skip per_block_processing::tests::invalid_proposer_slashing_proposer_unknown" - "--skip per_block_processing::tests::invalid_randao_reveal_signature" - "--skip per_block_processing::tests::valid_4_deposits" - "--skip per_block_processing::tests::valid_block_ok" - "--skip per_block_processing::tests::valid_insert_attester_slashing" - "--skip per_block_processing::tests::valid_insert_proposer_slashing" - "--skip per_epoch_processing::tests::release_tests::altair_state_on_base_fork" - "--skip per_epoch_processing::tests::release_tests::base_state_on_altair_fork" - "--skip per_epoch_processing::tests::runs_without_error" - "--skip exit::custom_tests::valid" - "--skip exit::custom_tests::valid_three" - "--skip exit::tests::invalid_bad_signature" - "--skip exit::tests::invalid_duplicate" - "--skip exit::tests::invalid_exit_already_initiated" - "--skip exit::tests::invalid_future_exit_epoch" - "--skip exit::tests::invalid_not_active_after_exit_epoch" - "--skip exit::tests::invalid_not_active_before_activation_epoch" - "--skip exit::tests::invalid_too_young_by_a_lot" - "--skip exit::tests::invalid_too_young_by_one_epoch" - "--skip exit::tests::invalid_validator_unknown" - "--skip exit::tests::valid_genesis_epoch" - "--skip exit::tests::valid_previous_epoch" - "--skip exit::tests::valid_single_exit" - "--skip exit::tests::valid_three_exits" - "--skip iter::test::block_root_iter" - "--skip iter::test::state_root_iter" - "--skip beacon_state::committee_cache::tests::initializes_with_the_right_epoch" - "--skip beacon_state::committee_cache::tests::min_randao_epoch_correct" - "--skip beacon_state::committee_cache::tests::shuffles_for_the_right_epoch" - "--skip beacon_state::tests::beacon_proposer_index" - "--skip beacon_state::tests::cache_initialization" - "--skip beacon_state::tests::committees::current_epoch_committee_consistency" - "--skip beacon_state::tests::committees::next_epoch_committee_consistency" - "--skip beacon_state::tests::committees::previous_epoch_committee_consistency" - "--skip tests::hd_validator_creation" - "--skip tests::invalid_pubkey" - "--skip tests::keystore_validator_creation" - "--skip tests::keystores::check_get_set_fee_recipient" - "--skip tests::keystores::check_get_set_gas_limit" - "--skip tests::keystores::delete_concurrent_with_signing" - "--skip tests::keystores::delete_keystores_twice" - "--skip tests::keystores::delete_nonexistent_keystores" - "--skip tests::keystores::delete_nonexistent_remotekey" - "--skip tests::keystores::delete_remotekey_then_reimport_different_url" - "--skip tests::keystores::delete_remotekeys_twice" - "--skip tests::keystores::delete_then_reimport" - "--skip tests::keystores::delete_then_reimport_remotekeys" - "--skip tests::keystores::get_auth_no_token" - "--skip tests::keystores::get_empty_keystores" - "--skip tests::keystores::get_empty_remotekeys" - "--skip tests::keystores::get_web3_signer_keystores" - "--skip tests::keystores::import_and_delete_conflicting_web3_signer_keystores" - "--skip tests::keystores::import_invalid_slashing_protection" - "--skip tests::keystores::import_keystores_wrong_password" - "--skip tests::keystores::import_new_keystores" - "--skip tests::keystores::import_new_remotekeys" - "--skip tests::keystores::import_only_duplicate_keystores" - "--skip tests::keystores::import_only_duplicate_remotekeys" - "--skip tests::keystores::import_remote_and_local_keys" - "--skip tests::keystores::import_remotekey_web3signer" - "--skip tests::keystores::import_remotekey_web3signer_disabled" - "--skip tests::keystores::import_remotekey_web3signer_enabled" - "--skip tests::keystores::import_same_local_and_remote_keys" - "--skip tests::keystores::import_same_remote_and_local_keys" - "--skip tests::keystores::import_same_remotekey_different_url" - "--skip tests::keystores::import_some_duplicate_keystores" - "--skip tests::keystores::import_some_duplicate_remotekeys" - "--skip tests::keystores::import_wrong_number_of_passwords" - "--skip tests::keystores::migrate_all_with_slashing_protection" - "--skip tests::keystores::migrate_some_extra_slashing_protection" - "--skip tests::keystores::migrate_some_missing_slashing_protection" - "--skip tests::keystores::migrate_some_with_slashing_protection" - "--skip tests::prefer_builder_proposals_validator" - "--skip tests::routes_with_invalid_auth" - "--skip tests::simple_getters" - "--skip tests::validator_builder_boost_factor" - "--skip tests::validator_builder_boost_factor_global_builder_proposals_false" - "--skip tests::validator_builder_boost_factor_global_builder_proposals_true" - "--skip tests::validator_builder_boost_factor_global_prefer_builder_proposals_true" - "--skip tests::validator_builder_boost_factor_global_prefer_builder_proposals_true_override" - "--skip tests::validator_builder_proposals" - "--skip tests::validator_derived_builder_boost_factor_with_process_defaults" - "--skip tests::validator_enabling" - "--skip tests::validator_exit" - "--skip tests::validator_gas_limit" - "--skip tests::validator_graffiti" - "--skip tests::validator_graffiti_api" - "--skip tests::web3signer_validator_creation" - "--skip create_validators::tests::bogus_bn_url" - "--skip delete_validators::test::delete_multiple_validators" - "--skip import_validators::tests::create_one_validator" - "--skip import_validators::tests::create_one_validator_keystore_format" - "--skip import_validators::tests::create_one_validator_with_offset" - "--skip import_validators::tests::create_one_validator_with_offset_keystore_format" - "--skip import_validators::tests::create_three_validators" - "--skip import_validators::tests::create_three_validators_with_offset" - "--skip import_validators::tests::import_duplicates_when_allowed" - "--skip import_validators::tests::import_duplicates_when_allowed_keystore_format" - "--skip import_validators::tests::import_duplicates_when_disallowed" - "--skip import_validators::tests::import_duplicates_when_disallowed_keystore_format" - "--skip list_validators::test::list_all_validators" - "--skip move_validators::test::no_validators" - "--skip move_validators::test::one_validator_move_all" - "--skip move_validators::test::one_validator_move_all_with_password_files" - "--skip move_validators::test::one_validator_move_one" - "--skip move_validators::test::one_validator_to_non_empty_dest" - "--skip move_validators::test::one_validators_move_two_by_count" - "--skip move_validators::test::three_validators_move_all" - "--skip move_validators::test::three_validators_move_one" - "--skip move_validators::test::three_validators_move_one_by_count" - "--skip move_validators::test::three_validators_move_three" - "--skip move_validators::test::three_validators_move_two" - "--skip move_validators::test::three_validators_move_two_by_count" - "--skip move_validators::test::two_validator_move_all_and_back_again" - "--skip move_validators::test::two_validator_move_all_passwords_removed" - "--skip move_validators::test::two_validator_move_all_passwords_removed_failed_password_attempt" - "--skip move_validators::test::two_validators_move_all_where_one_is_a_duplicate" - "--skip move_validators::test::two_validators_move_one_where_one_is_a_duplicate" - "--skip move_validators::test::two_validators_move_one_with_identical_password_files" + "--skip=tests::broadcast_should_send_to_all_bns" + "--skip=tests::check_candidate_order" + "--skip=tests::first_success_should_try_nodes_in_order" + "--skip=tests::update_all_candidates_should_update_sync_status" + "--skip=engine_api::http::test::forkchoice_updated_v1_request" + "--skip=engine_api::http::test::forkchoice_updated_v1_with_payload_attributes_request" + "--skip=engine_api::http::test::get_block_by_hash_request" + "--skip=engine_api::http::test::get_block_by_number_request" + "--skip=engine_api::http::test::get_payload_v1_request" + "--skip=engine_api::http::test::geth_test_vectors" + "--skip=engine_api::http::test::new_payload_v1_request" + "--skip=test::finds_valid_terminal_block_hash" + "--skip=test::produce_three_valid_pos_execution_blocks" + "--skip=test::rejects_invalid_terminal_block_hash" + "--skip=test::rejects_terminal_block_with_equal_timestamp" + "--skip=test::rejects_unknown_terminal_block_hash" + "--skip=test::test_forked_terminal_block" + "--skip=test::verifies_valid_terminal_block_hash" + "--skip=deposit_tree::cache_consistency" + "--skip=deposit_tree::double_update" + "--skip=deposit_tree::updating" + "--skip=eth1_cache::big_skip" + "--skip=eth1_cache::double_update" + "--skip=eth1_cache::pruning" + "--skip=eth1_cache::simple_scenario" + "--skip=fast::deposit_cache_query" + "--skip=http::incrementing_deposits" + "--skip=persist::test_persist_caches" + "--skip=can_read_finalized_block" + "--skip=invalid_attestation_delayed_slot" + "--skip=invalid_attestation_empty_bitfield" + "--skip=invalid_attestation_future_block" + "--skip=invalid_attestation_future_epoch" + "--skip=invalid_attestation_inconsistent_ffg_vote" + "--skip=invalid_attestation_past_epoch" + "--skip=invalid_attestation_target_epoch" + "--skip=invalid_attestation_unknown_beacon_block_root" + "--skip=invalid_attestation_unknown_target_root" + "--skip=invalid_block_finalized_descendant" + "--skip=invalid_block_finalized_slot" + "--skip=invalid_block_future_slot" + "--skip=invalid_block_unknown_parent" + "--skip=justified_and_finalized_blocks" + "--skip=justified_balances" + "--skip=justified_checkpoint_updates_with_descendent" + "--skip=justified_checkpoint_updates_with_descendent_first_justification" + "--skip=justified_checkpoint_updates_with_non_descendent" + "--skip=progressive_balances_cache_attester_slashing" + "--skip=progressive_balances_cache_proposer_slashing" + "--skip=valid_attestation" + "--skip=valid_attestation_skip_across_epoch" + "--skip=weak_subjectivity_check_epoch_boundary_is_skip_slot" + "--skip=weak_subjectivity_check_epoch_boundary_is_skip_slot_failure" + "--skip=weak_subjectivity_check_fails_early_epoch" + "--skip=weak_subjectivity_check_fails_incorrect_root" + "--skip=weak_subjectivity_check_fails_late_epoch" + "--skip=weak_subjectivity_check_passes" + "--skip=weak_subjectivity_pass_on_startup" + "--skip=basic" + "--skip=returns_200_ok" + "--skip=release_tests::attestation_aggregation_insert_get_prune" + "--skip=release_tests::attestation_duplicate" + "--skip=release_tests::attestation_get_max" + "--skip=release_tests::attestation_pairwise_overlapping" + "--skip=release_tests::attestation_rewards" + "--skip=release_tests::cross_fork_attester_slashings" + "--skip=release_tests::cross_fork_exits" + "--skip=release_tests::cross_fork_proposer_slashings" + "--skip=release_tests::duplicate_proposer_slashing" + "--skip=release_tests::max_coverage_attester_proposer_slashings" + "--skip=release_tests::max_coverage_different_indices_set" + "--skip=release_tests::max_coverage_effective_balances" + "--skip=release_tests::overlapping_max_cover_attester_slashing" + "--skip=release_tests::prune_attester_slashing_noop" + "--skip=release_tests::prune_proposer_slashing_noop" + "--skip=release_tests::simple_max_cover_attester_slashing" + "--skip=release_tests::sync_contribution_aggregation_insert_get_prune" + "--skip=release_tests::sync_contribution_duplicate" + "--skip=release_tests::sync_contribution_with_fewer_bits" + "--skip=release_tests::sync_contribution_with_more_bits" + "--skip=release_tests::test_earliest_attestation" + "--skip=per_block_processing::tests::block_replayer_peeking_state_roots" + "--skip=per_block_processing::tests::fork_spanning_exit" + "--skip=per_block_processing::tests::invalid_attester_slashing_1_invalid" + "--skip=per_block_processing::tests::invalid_attester_slashing_2_invalid" + "--skip=per_block_processing::tests::invalid_attester_slashing_not_slashable" + "--skip=per_block_processing::tests::invalid_bad_proposal_1_signature" + "--skip=per_block_processing::tests::invalid_bad_proposal_2_signature" + "--skip=per_block_processing::tests::invalid_block_header_state_slot" + "--skip=per_block_processing::tests::invalid_block_signature" + "--skip=per_block_processing::tests::invalid_deposit_bad_merkle_proof" + "--skip=per_block_processing::tests::invalid_deposit_count_too_small" + "--skip=per_block_processing::tests::invalid_deposit_deposit_count_too_big" + "--skip=per_block_processing::tests::invalid_deposit_invalid_pub_key" + "--skip=per_block_processing::tests::invalid_deposit_wrong_sig" + "--skip=per_block_processing::tests::invalid_parent_block_root" + "--skip=per_block_processing::tests::invalid_proposer_slashing_duplicate_slashing" + "--skip=per_block_processing::tests::invalid_proposer_slashing_proposal_epoch_mismatch" + "--skip=per_block_processing::tests::invalid_proposer_slashing_proposals_identical" + "--skip=per_block_processing::tests::invalid_proposer_slashing_proposer_unknown" + "--skip=per_block_processing::tests::invalid_randao_reveal_signature" + "--skip=per_block_processing::tests::valid_4_deposits" + "--skip=per_block_processing::tests::valid_block_ok" + "--skip=per_block_processing::tests::valid_insert_attester_slashing" + "--skip=per_block_processing::tests::valid_insert_proposer_slashing" + "--skip=per_epoch_processing::tests::release_tests::altair_state_on_base_fork" + "--skip=per_epoch_processing::tests::release_tests::base_state_on_altair_fork" + "--skip=per_epoch_processing::tests::runs_without_error" + "--skip=exit::custom_tests::valid" + "--skip=exit::custom_tests::valid_three" + "--skip=exit::tests::invalid_bad_signature" + "--skip=exit::tests::invalid_duplicate" + "--skip=exit::tests::invalid_exit_already_initiated" + "--skip=exit::tests::invalid_future_exit_epoch" + "--skip=exit::tests::invalid_not_active_after_exit_epoch" + "--skip=exit::tests::invalid_not_active_before_activation_epoch" + "--skip=exit::tests::invalid_too_young_by_a_lot" + "--skip=exit::tests::invalid_too_young_by_one_epoch" + "--skip=exit::tests::invalid_validator_unknown" + "--skip=exit::tests::valid_genesis_epoch" + "--skip=exit::tests::valid_previous_epoch" + "--skip=exit::tests::valid_single_exit" + "--skip=exit::tests::valid_three_exits" + "--skip=iter::test::block_root_iter" + "--skip=iter::test::state_root_iter" + "--skip=beacon_state::committee_cache::tests::initializes_with_the_right_epoch" + "--skip=beacon_state::committee_cache::tests::min_randao_epoch_correct" + "--skip=beacon_state::committee_cache::tests::shuffles_for_the_right_epoch" + "--skip=beacon_state::tests::beacon_proposer_index" + "--skip=beacon_state::tests::cache_initialization" + "--skip=beacon_state::tests::committees::current_epoch_committee_consistency" + "--skip=beacon_state::tests::committees::next_epoch_committee_consistency" + "--skip=beacon_state::tests::committees::previous_epoch_committee_consistency" + "--skip=tests::hd_validator_creation" + "--skip=tests::invalid_pubkey" + "--skip=tests::keystore_validator_creation" + "--skip=tests::keystores::check_get_set_fee_recipient" + "--skip=tests::keystores::check_get_set_gas_limit" + "--skip=tests::keystores::delete_concurrent_with_signing" + "--skip=tests::keystores::delete_keystores_twice" + "--skip=tests::keystores::delete_nonexistent_keystores" + "--skip=tests::keystores::delete_nonexistent_remotekey" + "--skip=tests::keystores::delete_remotekey_then_reimport_different_url" + "--skip=tests::keystores::delete_remotekeys_twice" + "--skip=tests::keystores::delete_then_reimport" + "--skip=tests::keystores::delete_then_reimport_remotekeys" + "--skip=tests::keystores::get_auth_no_token" + "--skip=tests::keystores::get_empty_keystores" + "--skip=tests::keystores::get_empty_remotekeys" + "--skip=tests::keystores::get_web3_signer_keystores" + "--skip=tests::keystores::import_and_delete_conflicting_web3_signer_keystores" + "--skip=tests::keystores::import_invalid_slashing_protection" + "--skip=tests::keystores::import_keystores_wrong_password" + "--skip=tests::keystores::import_new_keystores" + "--skip=tests::keystores::import_new_remotekeys" + "--skip=tests::keystores::import_only_duplicate_keystores" + "--skip=tests::keystores::import_only_duplicate_remotekeys" + "--skip=tests::keystores::import_remote_and_local_keys" + "--skip=tests::keystores::import_remotekey_web3signer" + "--skip=tests::keystores::import_remotekey_web3signer_disabled" + "--skip=tests::keystores::import_remotekey_web3signer_enabled" + "--skip=tests::keystores::import_same_local_and_remote_keys" + "--skip=tests::keystores::import_same_remote_and_local_keys" + "--skip=tests::keystores::import_same_remotekey_different_url" + "--skip=tests::keystores::import_some_duplicate_keystores" + "--skip=tests::keystores::import_some_duplicate_remotekeys" + "--skip=tests::keystores::import_wrong_number_of_passwords" + "--skip=tests::keystores::migrate_all_with_slashing_protection" + "--skip=tests::keystores::migrate_some_extra_slashing_protection" + "--skip=tests::keystores::migrate_some_missing_slashing_protection" + "--skip=tests::keystores::migrate_some_with_slashing_protection" + "--skip=tests::prefer_builder_proposals_validator" + "--skip=tests::routes_with_invalid_auth" + "--skip=tests::simple_getters" + "--skip=tests::validator_builder_boost_factor" + "--skip=tests::validator_builder_boost_factor_global_builder_proposals_false" + "--skip=tests::validator_builder_boost_factor_global_builder_proposals_true" + "--skip=tests::validator_builder_boost_factor_global_prefer_builder_proposals_true" + "--skip=tests::validator_builder_boost_factor_global_prefer_builder_proposals_true_override" + "--skip=tests::validator_builder_proposals" + "--skip=tests::validator_derived_builder_boost_factor_with_process_defaults" + "--skip=tests::validator_enabling" + "--skip=tests::validator_exit" + "--skip=tests::validator_gas_limit" + "--skip=tests::validator_graffiti" + "--skip=tests::validator_graffiti_api" + "--skip=tests::web3signer_validator_creation" + "--skip=create_validators::tests::bogus_bn_url" + "--skip=delete_validators::test::delete_multiple_validators" + "--skip=import_validators::tests::create_one_validator" + "--skip=import_validators::tests::create_one_validator_keystore_format" + "--skip=import_validators::tests::create_one_validator_with_offset" + "--skip=import_validators::tests::create_one_validator_with_offset_keystore_format" + "--skip=import_validators::tests::create_three_validators" + "--skip=import_validators::tests::create_three_validators_with_offset" + "--skip=import_validators::tests::import_duplicates_when_allowed" + "--skip=import_validators::tests::import_duplicates_when_allowed_keystore_format" + "--skip=import_validators::tests::import_duplicates_when_disallowed" + "--skip=import_validators::tests::import_duplicates_when_disallowed_keystore_format" + "--skip=list_validators::test::list_all_validators" + "--skip=move_validators::test::no_validators" + "--skip=move_validators::test::one_validator_move_all" + "--skip=move_validators::test::one_validator_move_all_with_password_files" + "--skip=move_validators::test::one_validator_move_one" + "--skip=move_validators::test::one_validator_to_non_empty_dest" + "--skip=move_validators::test::one_validators_move_two_by_count" + "--skip=move_validators::test::three_validators_move_all" + "--skip=move_validators::test::three_validators_move_one" + "--skip=move_validators::test::three_validators_move_one_by_count" + "--skip=move_validators::test::three_validators_move_three" + "--skip=move_validators::test::three_validators_move_two" + "--skip=move_validators::test::three_validators_move_two_by_count" + "--skip=move_validators::test::two_validator_move_all_and_back_again" + "--skip=move_validators::test::two_validator_move_all_passwords_removed" + "--skip=move_validators::test::two_validator_move_all_passwords_removed_failed_password_attempt" + "--skip=move_validators::test::two_validators_move_all_where_one_is_a_duplicate" + "--skip=move_validators::test::two_validators_move_one_where_one_is_a_duplicate" + "--skip=move_validators::test::two_validators_move_one_with_identical_password_files" ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ - "--skip subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart" - "--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch" - "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" + "--skip=subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart" + "--skip=subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch" + "--skip=subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" ]; passthru = { @@ -332,9 +337,6 @@ rustPlatform.buildRustPackage rec { enableParallelBuilding = true; - # This is needed by the unit tests. - FORK_NAME = "capella"; - meta = { description = "Ethereum consensus client in Rust"; homepage = "https://lighthouse.sigmaprime.io/"; From e15ffd255da2b4cd487ee3cd6bb75556f352758e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:07 +0100 Subject: [PATCH 14/27] martin: prepare for structuredAttrs --- pkgs/by-name/ma/martin/package.nix | 54 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/ma/martin/package.nix b/pkgs/by-name/ma/martin/package.nix index 5a6e76ae2ce0..dd2596a01ffe 100644 --- a/pkgs/by-name/ma/martin/package.nix +++ b/pkgs/by-name/ma/martin/package.nix @@ -24,33 +24,33 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; checkFlags = [ - "--skip function_source_schemas" - "--skip function_source_tile" - "--skip function_source_tilejson" - "--skip pg_get_function_tiles" - "--skip pg_get_function_source_ok_rewrite" - "--skip pg_get_function_source_ok" - "--skip pg_get_composite_source_tile_minmax_zoom_ok" - "--skip pg_get_function_source_query_params_ok" - "--skip pg_get_composite_source_tile_ok" - "--skip pg_get_catalog" - "--skip pg_get_composite_source_ok" - "--skip pg_get_health_returns_ok" - "--skip pg_get_table_source_ok" - "--skip pg_get_table_source_rewrite" - "--skip pg_null_functions" - "--skip utils::test_utils::tests::test_bad_os_str" - "--skip utils::test_utils::tests::test_get_env_str" - "--skip pg_get_table_source_multiple_geom_tile_ok" - "--skip pg_get_table_source_tile_minmax_zoom_ok" - "--skip pg_tables_feature_id" - "--skip pg_get_table_source_tile_ok" - "--skip table_source_schemas" - "--skip tables_srid_ok" - "--skip tables_tile_ok" - "--skip table_source" - "--skip tables_tilejson" - "--skip tables_multiple_geom_ok" + "--skip=function_source_schemas" + "--skip=function_source_tile" + "--skip=function_source_tilejson" + "--skip=pg_get_function_tiles" + "--skip=pg_get_function_source_ok_rewrite" + "--skip=pg_get_function_source_ok" + "--skip=pg_get_composite_source_tile_minmax_zoom_ok" + "--skip=pg_get_function_source_query_params_ok" + "--skip=pg_get_composite_source_tile_ok" + "--skip=pg_get_catalog" + "--skip=pg_get_composite_source_ok" + "--skip=pg_get_health_returns_ok" + "--skip=pg_get_table_source_ok" + "--skip=pg_get_table_source_rewrite" + "--skip=pg_null_functions" + "--skip=utils::test_utils::tests::test_bad_os_str" + "--skip=utils::test_utils::tests::test_get_env_str" + "--skip=pg_get_table_source_multiple_geom_tile_ok" + "--skip=pg_get_table_source_tile_minmax_zoom_ok" + "--skip=pg_tables_feature_id" + "--skip=pg_get_table_source_tile_ok" + "--skip=table_source_schemas" + "--skip=tables_srid_ok" + "--skip=tables_tile_ok" + "--skip=table_source" + "--skip=tables_tilejson" + "--skip=tables_multiple_geom_ok" ]; meta = { From e496ebdace6053624ca4aff1146e2cefde871a3b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:07 +0100 Subject: [PATCH 15/27] mdbook-pandoc: prepare for structuredAttrs --- pkgs/by-name/md/mdbook-pandoc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/md/mdbook-pandoc/package.nix b/pkgs/by-name/md/mdbook-pandoc/package.nix index a5776acdf01e..51d25f543b6d 100644 --- a/pkgs/by-name/md/mdbook-pandoc/package.nix +++ b/pkgs/by-name/md/mdbook-pandoc/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optional stdenv.buildPlatform.isDarwin "pandoc::tests::five_item_deep_list"; in - builtins.map (x: "--skip " + x) skippedTests; + builtins.map (x: "--skip=" + x) skippedTests; passthru = { wrapper = callPackage ./wrapper.nix { }; From ffd5ff15a38d8aea8da21fb9182853ff656ac954 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:07 +0100 Subject: [PATCH 16/27] mdserve: prepare for structuredAttrs --- pkgs/by-name/md/mdserve/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/md/mdserve/package.nix b/pkgs/by-name/md/mdserve/package.nix index 3e6ddf1b91c1..087e9ebae6f3 100644 --- a/pkgs/by-name/md/mdserve/package.nix +++ b/pkgs/by-name/md/mdserve/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # times out on darwin during nixpkgs-review - "--skip test_file_modification_updates_via_websocket" + "--skip=test_file_modification_updates_via_websocket" ]; passthru.updateScript = nix-update-script { }; From 607bc9ad37e4bfbdbc444e8442a219b0ed5bc820 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:07 +0100 Subject: [PATCH 17/27] nixseparatedebuginfod2: prepare for structuredAttrs --- pkgs/by-name/ni/nixseparatedebuginfod2/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix index 42f9613df285..d01deb4f7902 100644 --- a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix +++ b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests) nixseparatedebuginfod2; }; # flaky tests - checkFlags = [ "--skip substituter::http" ]; + checkFlags = [ "--skip=substituter::http" ]; meta = { description = "Downloads and provides debug symbols and source code for nix derivations to gdb and other debuginfod-capable debuggers as needed"; From e628e08c41ef5b4a8dcb1f0624266d24c93611c9 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:08 +0100 Subject: [PATCH 18/27] oxker: prepare for structuredAttrs --- pkgs/by-name/ox/oxker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ox/oxker/package.nix b/pkgs/by-name/ox/oxker/package.nix index 07037c28429a..61c330f71359 100644 --- a/pkgs/by-name/ox/oxker/package.nix +++ b/pkgs/by-name/ox/oxker/package.nix @@ -20,9 +20,9 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-X5iNAwp0DcXoT82ZLq37geifztvJ/zZgOgM3SycAazA="; checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - "--skip ui::draw_blocks::help::tests::test_draw_blocks_help_custom_keymap_one_definition" - "--skip ui::draw_blocks::help::tests::test_draw_blocks_help_custom_keymap_two_definitions" - "--skip ui::draw_blocks::help::tests::test_draw_blocks_help_one_and_two_definitions" + "--skip=ui::draw_blocks::help::tests::test_draw_blocks_help_custom_keymap_one_definition" + "--skip=ui::draw_blocks::help::tests::test_draw_blocks_help_custom_keymap_two_definitions" + "--skip=ui::draw_blocks::help::tests::test_draw_blocks_help_one_and_two_definitions" ]; passthru.updateScript = nix-update-script { }; From 999d4028d8536913adbfd766c55e09bc6f3f793d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:08 +0100 Subject: [PATCH 19/27] phira-unwrapped: prepare for structuredAttrs --- pkgs/by-name/ph/phira-unwrapped/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ph/phira-unwrapped/package.nix b/pkgs/by-name/ph/phira-unwrapped/package.nix index 0aaeb78b1638..ee551e73766c 100644 --- a/pkgs/by-name/ph/phira-unwrapped/package.nix +++ b/pkgs/by-name/ph/phira-unwrapped/package.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-6mRb3M56G20fA+px1cZyrGpel0v54qoVAQK2ZgTzkmI="; # The developer put assets necessary for this test in gitignore, so it cannot run. - checkFlags = [ "--skip test_parse_chart" ]; + checkFlags = [ "--skip=test_parse_chart" ]; desktopItems = [ (makeDesktopItem { From d92d1f996305de33c086f4256a07341f2ebb2557 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:08 +0100 Subject: [PATCH 20/27] prmt: prepare for structuredAttrs --- pkgs/by-name/pr/prmt/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/prmt/package.nix b/pkgs/by-name/pr/prmt/package.nix index 390cb945f73f..ed694fd6be6d 100644 --- a/pkgs/by-name/pr/prmt/package.nix +++ b/pkgs/by-name/pr/prmt/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-Vc2uCFD3A3huSFaYbgZHRWgiQnxXkz7BzvmdT7AsnoY="; # Fail to run in sandbox environment - checkFlags = map (t: "--skip ${t}") [ + checkFlags = map (t: "--skip=${t}") [ "modules::path::tests::relative_path_inside_home_renders_tilde" "modules::path::tests::relative_path_with_shared_prefix_is_not_tilde" "test_git_module" From b3f2736aec66bb34fc0d42eff7ab99946188ef02 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:09 +0100 Subject: [PATCH 21/27] roc: prepare for structuredAttrs --- pkgs/by-name/ro/roc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/roc/package.nix b/pkgs/by-name/ro/roc/package.nix index 687a63744e9c..db7bd4492e71 100755 --- a/pkgs/by-name/ro/roc/package.nix +++ b/pkgs/by-name/ro/roc/package.nix @@ -86,12 +86,12 @@ rustPlatform.buildRustPackage { checkPhase = lib.optionalString stdenv.isLinux '' runHook preCheck - NIX_GLIBC_PATH=${glibc.out}/lib NIX_LIBGCC_S_PATH=${stdenv.cc.cc.lib}/lib cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip glue_cli_tests --skip test_snapshots + NIX_GLIBC_PATH=${glibc.out}/lib NIX_LIBGCC_S_PATH=${stdenv.cc.cc.lib}/lib cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip=glue_cli_tests --skip=test_snapshots runHook postCheck '' + lib.optionalString (!stdenv.isLinux) '' runHook preCheck - cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip glue_cli_tests --skip test_snapshots + cargo test --release --workspace --exclude test_mono --exclude uitest -- --skip=glue_cli_tests --skip=test_snapshots runHook postCheck ''; From 6c1f63f260e6abe3c0452320e207e620822f25be Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:09 +0100 Subject: [PATCH 22/27] sheldon: prepare for structuredAttrs --- pkgs/by-name/sh/sheldon/package.nix | 42 ++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/sh/sheldon/package.nix b/pkgs/by-name/sh/sheldon/package.nix index 43af10bad1e3..3bda66ec4afb 100644 --- a/pkgs/by-name/sh/sheldon/package.nix +++ b/pkgs/by-name/sh/sheldon/package.nix @@ -35,27 +35,27 @@ rustPlatform.buildRustPackage rec { # Needs network connection checkFlags = [ - "--skip lock::plugin::tests::external_plugin_lock_git_with_matches" - "--skip lock::plugin::tests::external_plugin_lock_git_with_matches_not_each" - "--skip lock::plugin::tests::external_plugin_lock_git_with_uses" - "--skip lock::plugin::tests::external_plugin_lock_remote" - "--skip lock::source::git::tests::git_checkout_resolve_branch" - "--skip lock::source::git::tests::git_checkout_resolve_rev" - "--skip lock::source::git::tests::git_checkout_resolve_tag" - "--skip lock::source::git::tests::lock_git_and_reinstall" - "--skip lock::source::git::tests::lock_git_https_with_checkout" - "--skip lock::source::local::tests::lock_local" - "--skip lock::source::remote::tests::lock_remote_and_reinstall" - "--skip lock::source::tests::lock_with_git" - "--skip lock::source::tests::lock_with_remote" - "--skip lock::tests::locked_config_clean" - "--skip directories_default" - "--skip directories_old" - "--skip directories_xdg_from_env" - "--skip lock_and_source_github" - "--skip lock_and_source_hooks" - "--skip lock_and_source_inline" - "--skip lock_and_source_profiles" + "--skip=lock::plugin::tests::external_plugin_lock_git_with_matches" + "--skip=lock::plugin::tests::external_plugin_lock_git_with_matches_not_each" + "--skip=lock::plugin::tests::external_plugin_lock_git_with_uses" + "--skip=lock::plugin::tests::external_plugin_lock_remote" + "--skip=lock::source::git::tests::git_checkout_resolve_branch" + "--skip=lock::source::git::tests::git_checkout_resolve_rev" + "--skip=lock::source::git::tests::git_checkout_resolve_tag" + "--skip=lock::source::git::tests::lock_git_and_reinstall" + "--skip=lock::source::git::tests::lock_git_https_with_checkout" + "--skip=lock::source::local::tests::lock_local" + "--skip=lock::source::remote::tests::lock_remote_and_reinstall" + "--skip=lock::source::tests::lock_with_git" + "--skip=lock::source::tests::lock_with_remote" + "--skip=lock::tests::locked_config_clean" + "--skip=directories_default" + "--skip=directories_old" + "--skip=directories_xdg_from_env" + "--skip=lock_and_source_github" + "--skip=lock_and_source_hooks" + "--skip=lock_and_source_inline" + "--skip=lock_and_source_profiles" ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' From 5eab66d92c7aeab04202a5811242377a2eec1d87 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:10 +0100 Subject: [PATCH 23/27] sourcepawn-studio: prepare for structuredAttrs --- pkgs/by-name/so/sourcepawn-studio/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/so/sourcepawn-studio/package.nix b/pkgs/by-name/so/sourcepawn-studio/package.nix index d0ad1266047d..04cb0fc52393 100644 --- a/pkgs/by-name/so/sourcepawn-studio/package.nix +++ b/pkgs/by-name/so/sourcepawn-studio/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = [ # requires rustup and rustfmt - "--skip tests::sourcegen::generate_node_kinds" + "--skip=tests::sourcegen::generate_node_kinds" ]; passthru.updateScript = nix-update-script { }; From f51883e6dfda4f48aeaaabce50d91b0ee5d5ee7b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:10 +0100 Subject: [PATCH 24/27] tattoy: prepare for structuredAttrs --- pkgs/by-name/ta/tattoy/package.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ta/tattoy/package.nix b/pkgs/by-name/ta/tattoy/package.nix index 1738d66ced11..c22678cb8163 100644 --- a/pkgs/by-name/ta/tattoy/package.nix +++ b/pkgs/by-name/ta/tattoy/package.nix @@ -40,16 +40,22 @@ rustPlatform.buildRustPackage (attrs: { watch ]; - checkFlags = [ - # e2e tests currently fail - # see https://github.com/tattoy-org/tattoy/pull/104/files for discussion - # re-enable after PR merged - "--skip e2e" - "--skip gpu" - ]; - useNextest = true; + checkFlags = + lib.concatMap + (t: [ + "--skip" + "${t}" + ]) + [ + # e2e tests currently fail + # see https://github.com/tattoy-org/tattoy/pull/104/files for discussion + # re-enable after PR merged + "e2e" + "gpu" + ]; + meta = { description = "Text-based compositor for modern terminals"; homepage = "https://github.com/tattoy-org/tattoy"; From ef4141827fbeff555c0288a3f5c1ff9f9a9b6139 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:10 +0100 Subject: [PATCH 25/27] xwin: prepare for structuredAttrs --- pkgs/by-name/xw/xwin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xw/xwin/package.nix b/pkgs/by-name/xw/xwin/package.nix index 210f71b342f3..d1cf0bcb63ad 100644 --- a/pkgs/by-name/xw/xwin/package.nix +++ b/pkgs/by-name/xw/xwin/package.nix @@ -36,8 +36,8 @@ rustPlatform.buildRustPackage (finalAttrs: { doCheck = true; # Requires network access checkFlags = [ - "--skip verify_compiles" - "--skip verify_deterministic" + "--skip=verify_compiles" + "--skip=verify_deterministic" ]; doInstallCheck = true; From 94bdf7ab1d2657fc8769f4c2b23c5664653b29b6 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 16:43:27 +0100 Subject: [PATCH 26/27] mdcat: prepare for structuredAttrs --- pkgs/tools/text/mdcat/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 90211ef1b393..613abfc30bde 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -41,14 +41,14 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. checkFlags = [ - "--skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length" - "--skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length" - "--skip magic::tests::detect_mimetype_of_png_image" - "--skip magic::tests::detect_mimetype_of_svg_image" - "--skip resources::tests::read_url_with_http_url_fails_when_size_limit_is_exceeded" - "--skip resources::tests::read_url_with_http_url_fails_when_status_404" - "--skip resources::tests::read_url_with_http_url_returns_content_when_status_200" - "--skip iterm2_tests_render_md_samples_images_md" + "--skip=magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length" + "--skip=magic::tests::detect_mimetype_of_magic_param_bytes_max_length" + "--skip=magic::tests::detect_mimetype_of_png_image" + "--skip=magic::tests::detect_mimetype_of_svg_image" + "--skip=resources::tests::read_url_with_http_url_fails_when_size_limit_is_exceeded" + "--skip=resources::tests::read_url_with_http_url_fails_when_status_404" + "--skip=resources::tests::read_url_with_http_url_returns_content_when_status_200" + "--skip=iterm2_tests_render_md_samples_images_md" ]; postInstall = '' From b537014e029857f4872c8fc5b7d90d9a051c6bbf Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 23 Jan 2026 12:57:18 +0100 Subject: [PATCH 27/27] prek: prepare for structuredAttrs --- pkgs/by-name/pr/prek/package.nix | 244 ++++++++++++++++--------------- 1 file changed, 125 insertions(+), 119 deletions(-) diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix index c4b42b2ce913..b3dd6ced7c50 100644 --- a/pkgs/by-name/pr/prek/package.nix +++ b/pkgs/by-name/pr/prek/package.nix @@ -54,125 +54,131 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoTestFlags = [ "--no-fail-fast" ]; - checkFlags = map (t: "--skip ${t}") [ - # these tests require internet access - "check_added_large_files_hook" - "check_json_hook" - "end_of_file_fixer_hook" - "mixed_line_ending_hook" - "install_hooks_only" - "install_with_hooks" - "golang" - "node" - "script" - "check_useless_excludes_remote" - "run_worktree" - "try_repo_relative_path" - "languages::tests::test_native_tls" - "rust::additional_dependencies_cli" - "rust::rustup_installer" - "rust::remote_hooks" - "rust::remote_hooks_with_lib_deps" - "unsupported::unsupported_language" - "remote_hook_non_workspace" - # "meta_hooks" - "reuse_env" - "docker::docker" - "docker::workspace_docker" - "docker_image::docker_image" - "pygrep::basic_case_sensitive" - "pygrep::case_insensitive" - "pygrep::case_insensitive_multiline" - "pygrep::complex_regex_patterns" - "pygrep::invalid_args" - "pygrep::invalid_regex" - "pygrep::multiline_mode" - "pygrep::negate_mode" - "pygrep::negate_multiline_mode" - "pygrep::pattern_not_found" - "pygrep::python_regex_quirks" - "python::additional_dependencies" - "python::can_not_download" - "python::hook_stderr" - "python::language_version" - "ruby::additional_gem_dependencies" - "ruby::environment_isolation" - "ruby::gemspec_workflow" - "ruby::language_version_default" - "ruby::local_hook_with_gemspec" - "ruby::native_gem_dependency" - "ruby::native_gem_dependency" - "ruby::process_files" - "ruby::specific_ruby_available" - "ruby::specific_ruby_unavailable" - "ruby::system_ruby" - # can't checkout pre-commit-hooks - "cjk_hook_name" - "fail_fast" - "file_types" - "files_and_exclude" - "git_commit_a" - "log_file" - "merge_conflicts" - "pass_env_vars" - "restore_on_interrupt" - "run_basic" - "run_last_commit" - "same_repo" - "skips" - "staged_files_only" - "subdirectory" - "check_yaml_hook" - "check_yaml_multiple_document" - "builtin_hooks_workspace_mode" - "fix_byte_order_marker_hook" - "fix_byte_order_marker" - "check_merge_conflict_hook" - "check_merge_conflict_without_assume_flag" - "check_symlinks_hook_unix" - "check_xml_hook" - "check_xml_with_features" - "detect_private_key_hook" - "no_commit_to_branch_hook" - "no_commit_to_branch_hook_with_custom_branches" - "no_commit_to_branch_hook_with_patterns" - "check_executables_have_shebangs_various_cases" - "check_executables_have_shebangs_hook" - # does not properly use TMP - "hook_impl" - # problems with environment - "try_repo_specific_hook" - "try_repo_specific_rev" - # lua path is hardcoded - "lua::additional_dependencies" - "lua::health_check" - "lua::hook_stderr" - "lua::lua_environment" - "lua::remote_hook" - # error message differs - "run_in_non_git_repo" - # depends on locale - "init_nonexistent_repo" - # https://github.com/astral-sh/uv/issues/8635 - "alternate_config_file" - "basic_discovery" - "color" - "cookiecutter_template_directories_are_skipped" - "empty_entry" - "git_dir_respected" - "git_env_vars_not_leaked_to_pip_install" - "gitignore_respected" - "invalid_entry" - "local_python_hook" - "orphan_projects" - "run_with_selectors" - "run_with_stdin_closed" - "show_diff_on_failure" - "submodule_discovery" - "workspace_install_hooks" - # We don't have git info; we run versionCheckHook instead - "version_info" - ]; + checkFlags = + lib.concatMap + (t: [ + "--skip" + "${t}" + ]) + [ + # these tests require internet access + "check_added_large_files_hook" + "check_json_hook" + "end_of_file_fixer_hook" + "mixed_line_ending_hook" + "install_hooks_only" + "install_with_hooks" + "golang" + "node" + "script" + "check_useless_excludes_remote" + "run_worktree" + "try_repo_relative_path" + "languages::tests::test_native_tls" + "rust::additional_dependencies_cli" + "rust::rustup_installer" + "rust::remote_hooks" + "rust::remote_hooks_with_lib_deps" + "unsupported::unsupported_language" + "remote_hook_non_workspace" + # "meta_hooks" + "reuse_env" + "docker::docker" + "docker::workspace_docker" + "docker_image::docker_image" + "pygrep::basic_case_sensitive" + "pygrep::case_insensitive" + "pygrep::case_insensitive_multiline" + "pygrep::complex_regex_patterns" + "pygrep::invalid_args" + "pygrep::invalid_regex" + "pygrep::multiline_mode" + "pygrep::negate_mode" + "pygrep::negate_multiline_mode" + "pygrep::pattern_not_found" + "pygrep::python_regex_quirks" + "python::additional_dependencies" + "python::can_not_download" + "python::hook_stderr" + "python::language_version" + "ruby::additional_gem_dependencies" + "ruby::environment_isolation" + "ruby::gemspec_workflow" + "ruby::language_version_default" + "ruby::local_hook_with_gemspec" + "ruby::native_gem_dependency" + "ruby::native_gem_dependency" + "ruby::process_files" + "ruby::specific_ruby_available" + "ruby::specific_ruby_unavailable" + "ruby::system_ruby" + # can't checkout pre-commit-hooks + "cjk_hook_name" + "fail_fast" + "file_types" + "files_and_exclude" + "git_commit_a" + "log_file" + "merge_conflicts" + "pass_env_vars" + "restore_on_interrupt" + "run_basic" + "run_last_commit" + "same_repo" + "skips" + "staged_files_only" + "subdirectory" + "check_yaml_hook" + "check_yaml_multiple_document" + "builtin_hooks_workspace_mode" + "fix_byte_order_marker_hook" + "fix_byte_order_marker" + "check_merge_conflict_hook" + "check_merge_conflict_without_assume_flag" + "check_symlinks_hook_unix" + "check_xml_hook" + "check_xml_with_features" + "detect_private_key_hook" + "no_commit_to_branch_hook" + "no_commit_to_branch_hook_with_custom_branches" + "no_commit_to_branch_hook_with_patterns" + "check_executables_have_shebangs_various_cases" + "check_executables_have_shebangs_hook" + # does not properly use TMP + "hook_impl" + # problems with environment + "try_repo_specific_hook" + "try_repo_specific_rev" + # lua path is hardcoded + "lua::additional_dependencies" + "lua::health_check" + "lua::hook_stderr" + "lua::lua_environment" + "lua::remote_hook" + # error message differs + "run_in_non_git_repo" + # depends on locale + "init_nonexistent_repo" + # https://github.com/astral-sh/uv/issues/8635 + "alternate_config_file" + "basic_discovery" + "color" + "cookiecutter_template_directories_are_skipped" + "empty_entry" + "git_dir_respected" + "git_env_vars_not_leaked_to_pip_install" + "gitignore_respected" + "invalid_entry" + "local_python_hook" + "orphan_projects" + "run_with_selectors" + "run_with_stdin_closed" + "show_diff_on_failure" + "submodule_discovery" + "workspace_install_hooks" + # We don't have git info; we run versionCheckHook instead + "version_info" + ]; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ];