mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-03-25 21:17:37 +00:00
support 22.11 as well as current unstable
This looks better than what was here before anyway. It would be even nicer if we could stick with propagatedBuildInputs since that's the documented parameter for runtime dependencies. However, when using that, foolscap's `flogtool` is unavailable to the test suite.
This commit is contained in:
parent
1ef65a37ee
commit
934b6c6d6e
@ -73,7 +73,7 @@ buildPythonPackage rec {
|
||||
src = tahoe-lafs-src;
|
||||
|
||||
# Supply all of the build and runtime dependencies.
|
||||
propagatedBuildInputs = pythonPackageDependencies;
|
||||
propagatedNativeBuildInputs = pythonPackageDependencies;
|
||||
|
||||
# The source doesn't include version information - so dump some in
|
||||
# to it here.
|
||||
@ -101,11 +101,10 @@ buildPythonPackage rec {
|
||||
# If either kind of check is enabled, run checks.
|
||||
doCheck = doUnit || doIntegration;
|
||||
|
||||
# Checks run at build time so check inputs are "native" (they run on
|
||||
# the build host). Give all of the build and runtime dependencies
|
||||
# as well as all of the additional test-only dependencies (for
|
||||
# whichever test suites are enabled).
|
||||
nativeCheckInputs = propagatedBuildInputs ++ (
|
||||
# Additionally, give the "check" environment all of the build and
|
||||
# runtime dependencies test-only dependencies (for whichever test
|
||||
# suites are enabled).
|
||||
checkInputs = (
|
||||
lib.optionals (doUnit || doIntegration) unitTestDependencies ++
|
||||
lib.optionals doIntegration integrationTestDependencies
|
||||
);
|
||||
|
Loading…
x
Reference in New Issue
Block a user