From c61ecb71adb6a61a5ff969fb3b43c6ddb5b7473a Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:06 +0100 Subject: [PATCH 01/19] biome: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/bi/biome/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index 892bce100900..6b38d82151a6 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -33,8 +33,9 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "-p=biome_cli" ]; cargoTestFlags = finalAttrs.cargoBuildFlags ++ [ + "--" # fails due to cargo insta - "-- --skip=commands::check::print_json" + "--skip=commands::check::print_json" "--skip=commands::check::print_json_pretty" "--skip=commands::explain::explain_logs" "--skip=commands::format::print_json" From cf109991029409b33a7994fabd7e7ebf596e5b41 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:10 +0100 Subject: [PATCH 02/19] cargo-tauri: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/ca/cargo-tauri/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 467fdacd64cf..1cc5733a05c2 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -39,7 +39,10 @@ rustPlatform.buildRustPackage (finalAttrs: { zstd ]; - cargoBuildFlags = [ "--package tauri-cli" ]; + cargoBuildFlags = [ + "--package" + "tauri-cli" + ]; cargoTestFlags = finalAttrs.cargoBuildFlags; env = lib.optionalAttrs stdenv.hostPlatform.isLinux { From 5109cc31614a31e3a2c45d31c21fd3ee9ce07bbf Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:10 +0100 Subject: [PATCH 03/19] eludris: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/el/eludris/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/el/eludris/package.nix b/pkgs/by-name/el/eludris/package.nix index 2e0fa1791360..69479ea0d458 100644 --- a/pkgs/by-name/el/eludris/package.nix +++ b/pkgs/by-name/el/eludris/package.nix @@ -19,8 +19,14 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-JpXjnkZHz12YxgTSqTcWdQTkrMugP7ZGw48145BeBZk="; - cargoBuildFlags = [ "-p eludris" ]; - cargoTestFlags = [ "-p eludris" ]; + cargoBuildFlags = [ + "--package" + "eludris" + ]; + cargoTestFlags = [ + "--package" + "eludris" + ]; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; From f4a3f71f21477125a5bdc22f6c7d5eab8444f956 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:10 +0100 Subject: [PATCH 04/19] firecracker: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/fi/firecracker/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix index 8b97199f1230..8da0e0b3c0c8 100644 --- a/pkgs/by-name/fi/firecracker/package.nix +++ b/pkgs/by-name/fi/firecracker/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-HG0HZes01shEtuVK7QCYmy/zsU0snbwsqCtev7u3/WI="; # For aws-lc-sys@0.22.0: use external bindgen. - AWS_LC_SYS_EXTERNAL_BINDGEN = "true"; + env.AWS_LC_SYS_EXTERNAL_BINDGEN = "true"; # For aws-lc-sys@0.22.0: fix gcc error: # In function 'memcpy', From 176cc729eb5a71a7ee01b34389e0f44cfc53f92e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:11 +0100 Subject: [PATCH 05/19] flutter_rust_bridge_codegen: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- .../by-name/fl/flutter_rust_bridge_codegen/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix index f20968b3c15d..39c2c05689fd 100644 --- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix +++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix @@ -18,8 +18,14 @@ rustPlatform.buildRustPackage rec { }; cargoHash = "sha256-pxEwcLiRB95UBfXb+JgS8duEXiZUApH/C8Exus5TkfU="; - cargoBuildFlags = "--package flutter_rust_bridge_codegen"; - cargoTestFlags = "--package flutter_rust_bridge_codegen"; + cargoBuildFlags = [ + "--package" + "flutter_rust_bridge_codegen" + ]; + cargoTestFlags = [ + "--package" + "flutter_rust_bridge_codegen" + ]; # needed to get tests running nativeBuildInputs = [ cargo-expand ]; From dded9091bc129c0a423939a0aa84622552b6f8d1 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:11 +0100 Subject: [PATCH 06/19] jarl: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/ja/jarl/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ja/jarl/package.nix b/pkgs/by-name/ja/jarl/package.nix index 755b5758c6f1..742c082e073a 100644 --- a/pkgs/by-name/ja/jarl/package.nix +++ b/pkgs/by-name/ja/jarl/package.nix @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoTestFlags = [ "--lib" "--bins" - "--test integration" + "--test" + "integration" # "--test integration_tests" ]; From fea8babd692c05fd1ec52997b0065c49f42968ae Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:11 +0100 Subject: [PATCH 07/19] lighthouse: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/li/lighthouse/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/li/lighthouse/package.nix b/pkgs/by-name/li/lighthouse/package.nix index fa09eb2b4509..3a2acc3ca68d 100644 --- a/pkgs/by-name/li/lighthouse/package.nix +++ b/pkgs/by-name/li/lighthouse/package.nix @@ -78,7 +78,8 @@ rustPlatform.buildRustPackage rec { }; cargoBuildFlags = [ - "--package lighthouse" + "--package" + "lighthouse" ]; __darwinAllowLocalNetworking = true; @@ -88,15 +89,15 @@ rustPlatform.buildRustPackage rec { # All of these tests require network access and/or docker cargoTestFlags = [ "--workspace" - "--exclude beacon_chain" - "--exclude beacon_node" - "--exclude http_api" - "--exclude lighthouse" - "--exclude lighthouse_network" - "--exclude network" - "--exclude slashing_protection" - "--exclude watch" - "--exclude web3signer_tests" + "--exclude=beacon_chain" + "--exclude=beacon_node" + "--exclude=http_api" + "--exclude=lighthouse" + "--exclude=lighthouse_network" + "--exclude=network" + "--exclude=slashing_protection" + "--exclude=watch" + "--exclude=web3signer_tests" ]; # All of these tests require network access From 360954303189ec801c357a442c8a156632a6eaad Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:11 +0100 Subject: [PATCH 08/19] lux-cli: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/lu/lux-cli/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index d2558db26135..60e68cea02a4 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -59,7 +59,9 @@ rustPlatform.buildRustPackage (finalAttrs: { LUX_SKIP_IMPURE_TESTS = 1; # Disable impure unit tests }; - cargoTestFlags = "--lib"; # Disable impure integration tests + cargoTestFlags = [ + "--lib" # Disable impure integration tests + ]; nativeCheckInputs = [ lua5_4 From 9d581f3e55101bbf88bdbbc23bc96f97c24a62f1 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:11 +0100 Subject: [PATCH 09/19] nickel: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/ni/nickel/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 6d50a02eb1e2..081dafa00ab5 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -26,8 +26,10 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-uCy/Qo92yZ4pjjgW64nWYH21EbdMMwGXP5522tl8MAE="; cargoBuildFlags = [ - "-p nickel-lang-cli" - "-p nickel-lang-lsp" + "--package" + "nickel-lang-cli" + "--package" + "nickel-lang-lsp" ]; nativeBuildInputs = [ From 7ae692a500553ef68183dd4f0da2e9f3ccb7c077 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:12 +0100 Subject: [PATCH 10/19] rerun: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/re/rerun/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 3ff22223e4d5..b41153041177 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -58,10 +58,15 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-FrOo4+5S8JAlQSmDvH0omhOsG9PjZMvRejk9VHEucVY="; cargoBuildFlags = [ - "--package rerun-cli" - "--package rerun_c" + "--package" + "rerun-cli" + "--package" + "rerun_c" + ]; + cargoTestFlags = [ + "--package" + "rerun-cli" ]; - cargoTestFlags = [ "--package rerun-cli" ]; buildNoDefaultFeatures = true; buildFeatures = [ "native_viewer" From 37b3c09cb002e435b4c7a9bf7edacd0ecfa5c914 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:12 +0100 Subject: [PATCH 11/19] router: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/ro/router/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/router/package.nix b/pkgs/by-name/ro/router/package.nix index 34820633cdc7..bbdfe1339043 100644 --- a/pkgs/by-name/ro/router/package.nix +++ b/pkgs/by-name/ro/router/package.nix @@ -37,10 +37,11 @@ rustPlatform.buildRustPackage rec { # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE - RUSTY_V8_ARCHIVE = callPackage ./librusty_v8.nix { }; + env.RUSTY_V8_ARCHIVE = callPackage ./librusty_v8.nix { }; cargoTestFlags = [ - "-- --skip=query_planner::tests::missing_typename_and_fragments_in_requires" + "--" + "--skip=query_planner::tests::missing_typename_and_fragments_in_requires" ]; passthru = { From b3c8319044cbcca0f10ba43038d3069f20890132 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:12 +0100 Subject: [PATCH 12/19] rover: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/ro/rover/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ro/rover/package.nix b/pkgs/by-name/ro/rover/package.nix index b46cbb6860e0..69119bb27054 100644 --- a/pkgs/by-name/ro/rover/package.nix +++ b/pkgs/by-name/ro/rover/package.nix @@ -38,7 +38,8 @@ rustPlatform.buildRustPackage (finalAttrs: { # valid by making a network call to the repo that houses their binaries; but, the # build env can't make network calls (impurity) cargoTestFlags = [ - "-- --skip=latest_plugins_are_valid_versions" + "--" + "--skip=latest_plugins_are_valid_versions" ]; # Some tests try to write configuration data to a location in the user's home From a6183f3cd30c6bf0f5ae0c4f384a6394b2d1e317 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:12 +0100 Subject: [PATCH 13/19] rumdl: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/ru/rumdl/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index 1449a2fc2e5f..ea8c176ef06f 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoTestFlags = [ # Prefer the "smoke" profile over "ci" to exclude flaky tests: https://github.com/rvben/rumdl/pull/341 - "--profile smoke" + "--profile" + "smoke" ]; doInstallCheck = true; From d0050263c5ba086e3f54e322b60183bd3815bf06 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:13 +0100 Subject: [PATCH 14/19] tpnote: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/tp/tpnote/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index f2bf86154ba1..23854aad503f 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -48,11 +48,14 @@ rustPlatform.buildRustPackage (finalAttrs: { installManPage docs/build/man/man1/tpnote.1 ''; - RUSTONIG_SYSTEM_LIBONIG = true; + env.RUSTONIG_SYSTEM_LIBONIG = true; # The `tpnote` crate has no unit tests. All tests are in `tpnote-lib`. checkType = "debug"; - cargoTestFlags = "--package tpnote-lib"; + cargoTestFlags = [ + "--package" + "tpnote-lib" + ]; doCheck = true; nativeInstallCheckInputs = [ From bcfd3ba079c6963d3c3c9c6412d9d297badbb16d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:13 +0100 Subject: [PATCH 15/19] ukmm: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/uk/ukmm/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/uk/ukmm/package.nix b/pkgs/by-name/uk/ukmm/package.nix index 82c41d1b884f..0c6361ede8e3 100644 --- a/pkgs/by-name/uk/ukmm/package.nix +++ b/pkgs/by-name/uk/ukmm/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # Force linking to libEGL, which is always dlopen()ed, and to # libwayland-client & libxkbcommon, which is dlopen()ed based on the # winit backend. - NIX_LDFLAGS = [ + env.NIX_LDFLAGS = [ "--push-state" "--no-as-needed" "-lEGL" From c2408bd27fce41977376a42fee75a4519fcc175f Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:13 +0100 Subject: [PATCH 16/19] vhost-device-sound: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/vh/vhost-device-sound/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vh/vhost-device-sound/package.nix b/pkgs/by-name/vh/vhost-device-sound/package.nix index 6fc0353a715d..3d1f78dcca43 100644 --- a/pkgs/by-name/vh/vhost-device-sound/package.nix +++ b/pkgs/by-name/vh/vhost-device-sound/package.nix @@ -29,8 +29,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pipewire ]; - cargoBuildFlags = "-p vhost-device-sound"; - cargoTestFlags = "-p vhost-device-sound"; + cargoBuildFlags = [ + "--package" + "vhost-device-sound" + ]; + cargoTestFlags = [ + "--package" + "vhost-device-sound" + ]; # Runs dbus-daemon, which tries to load config from /etc. doCheck = false; From fc5ef75e4df8baea2f9780397074d2eced1b5a11 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:13 +0100 Subject: [PATCH 17/19] viceroy: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/vi/viceroy/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/vi/viceroy/package.nix b/pkgs/by-name/vi/viceroy/package.nix index adf88f4a2027..732e0721f2ca 100644 --- a/pkgs/by-name/vi/viceroy/package.nix +++ b/pkgs/by-name/vi/viceroy/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-PoexldRTp2cPu7iF7te//kO4Ph1P6A/jNZdMkYKERqM="; cargoTestFlags = [ - "--package viceroy-lib" + "--package" + "viceroy-lib" ]; meta = { From a9bfaf1ca8c86e025e11145dcf19783d37b8a05a Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:14 +0100 Subject: [PATCH 18/19] xdvdfs-cli: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/by-name/xd/xdvdfs-cli/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xd/xdvdfs-cli/package.nix b/pkgs/by-name/xd/xdvdfs-cli/package.nix index 6a3f7769a99c..14a6892784fc 100644 --- a/pkgs/by-name/xd/xdvdfs-cli/package.nix +++ b/pkgs/by-name/xd/xdvdfs-cli/package.nix @@ -19,8 +19,14 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-vNCqfXsPjb3mph28YuYKpWTs9VHbIcXs6GVn4XgQKtQ="; - cargoBuildFlags = [ "--package xdvdfs-cli" ]; - cargoTestFlags = [ "--package xdvdfs-cli" ]; + cargoBuildFlags = [ + "--package" + "xdvdfs-cli" + ]; + cargoTestFlags = [ + "--package" + "xdvdfs-cli" + ]; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/xdvdfs"; From 58bcc7a4d7fe123eb0f09d132fab9d6ece7e21f5 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 28 Jan 2026 12:16:53 +0100 Subject: [PATCH 19/19] luaPackages.lux-lua: fix cargoTestFlags/cargoBuildFlags for structuredAttrs --- pkgs/development/lua-modules/lux-lua.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/lua-modules/lux-lua.nix b/pkgs/development/lua-modules/lux-lua.nix index 2f9d5ba9e04d..316cdc021e31 100644 --- a/pkgs/development/lua-modules/lux-lua.nix +++ b/pkgs/development/lua-modules/lux-lua.nix @@ -80,7 +80,9 @@ toLuaModule ( runHook postInstall ''; - cargoTestFlags = "--lib"; # Disable impure integration tests + cargoTestFlags = [ + "--lib" # Disable impure integration tests + ]; meta = { description = "Lua API for the Lux package manager";