From af97a7341f4bada6e3b38e09ca8405a7307c8181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ci=C4=99=C5=BCarkiewicz?= Date: Mon, 23 Feb 2026 18:24:15 -0800 Subject: [PATCH 1/2] fix: `NEXTEST_SHOW_PROGRESS = "none";` to cargoNextest --- lib/crane/enhance.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/crane/enhance.nix b/lib/crane/enhance.nix index c5d9a43..f3cdb3a 100644 --- a/lib/crane/enhance.nix +++ b/lib/crane/enhance.nix @@ -90,7 +90,15 @@ craneLib.overrideScope ( buildTrunkPackage = args: prev.buildTrunkPackage (mergeArgs self.args args); - cargoAudit = args: prev.cargoAudit (mergeArgs self.args args); + cargoNextest = + args: + prev.cargoNextest ( + mergeArgs { + env = { + NEXTEST_SHOW_PROGRESS = "none"; + }; + } args + ); # causes issues vendorCargoDeps = args: prev.vendorCargoDeps (mergeArgs self.args args); From 9a9e59ca13f67a17f77addeebc054e3cdedfd179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ci=C4=99=C5=BCarkiewicz?= Date: Mon, 23 Feb 2026 18:29:55 -0800 Subject: [PATCH 2/2] fix: `mergeArgs` defaults handling --- lib/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 07998a6..eae5db4 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -175,10 +175,10 @@ lib.makeScope pkgs.newScope ( l // r // { - buildInputs = l.buildInputs or [ ] ++ r.buildInputs or [ ]; - nativeBuildInputs = l.nativeBuildInputs or [ ] ++ r.nativeBuildInputs or [ ]; - packages = l.packages or [ ] ++ r.packages or [ ]; - env = l.env or { } // r.env or { }; + buildInputs = (l.buildInputs or [ ]) ++ (r.buildInputs or [ ]); + nativeBuildInputs = (l.nativeBuildInputs or [ ]) ++ (r.nativeBuildInputs or [ ]); + packages = (l.packages or [ ]) ++ (r.packages or [ ]); + env = (l.env or { }) // (r.env or { }); }; } )