Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion lib/crane/enhance.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions lib/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { });
};
}
)
Loading