Skip to content

Avoid using srcOnly #1563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hamishmack merged 2 commits into from
Jul 29, 2022
Merged

Avoid using srcOnly #1563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e010dd7
Avoid using `srcOnly`
hamishmack Jul 29, 2022
42cf7f9
Remove unwanted arg
hamishmack Jul 29, 2022
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
41 changes: 19 additions & 22 deletions lib/check.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
{ stdenv, lib, haskellLib, srcOnly }:
{ stdenv, lib, haskellLib }:
drv:

let
component = drv.config;

subdir =
if drv?source
then
drv.srcSubDir or ""
else
# srcOnly returns just the subdir, so we're already in it.
"";

# This derivation can be used to execute test component.
# The $out of the derivation is a file containing the resulting
# stdout output.
in stdenv.mkDerivation ({
in stdenv.mkDerivation ((
if drv ? source
then {
src = drv.source;
patchPhase =
# This `cd` is normally done in the `prePatch` of the drv
lib.optionalString (drv.srcSubDir != "") ''
cd ${lib.removePrefix "/" drv.srcSubDir}
'';
}
else
# This makes the derivation work a bit like `srcOnly`,
# using the original derivation, but replacing the `buildPhase`.
(drv.drvAttrs or drv) // {
outputs = [ "out" ];
separateDebugInfo = false;
}) // {
name = (drv.name + "-check");

# Using `srcOnly` (rather than getting the `src` via a `drv.passthru`)
# should correctly apply the patches from `drv` (if any).
src = drv.source or (srcOnly drv);

passthru = {
inherit (drv) identifier config configFiles executableToolDepends cleanSrc env exeName;
};
Expand All @@ -30,19 +34,12 @@ in stdenv.mkDerivation ({

inherit (component) doCheck doCrossCheck;

phases = ["unpackPhase" "buildPhase"];
phases = ["unpackPhase" "patchPhase" "buildPhase"];

# If doCheck or doCrossCheck are false we may still build this
# component and we want it to quietly succeed.
buildPhase = ''
mkdir $out
${
# Change to the source sub directory if there is one.
lib.optionalString (subdir != "") ''
cd ${lib.removePrefix "/" subdir}
''
}

runHook preCheck

${toString component.testWrapper} ${drv}/bin/${drv.exeName} ${lib.concatStringsSep " " component.testFlags} | tee $out/test-stdout
Expand Down
2 changes: 1 addition & 1 deletion lib/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ in {

# Check a test component
check = import ./check.nix {
inherit stdenv lib haskellLib srcOnly;
inherit stdenv lib haskellLib;
};

# Do coverage of a package
Expand Down