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); 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 { }); }; } )