From 934b6c6d6e9018eb2dc97f88e964b0a987d8b8f1 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Tue, 14 Mar 2023 18:47:53 +0000 Subject: [PATCH] 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. --- nix/tahoe-lafs.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nix/tahoe-lafs.nix b/nix/tahoe-lafs.nix index c547b75f0..b83278228 100644 --- a/nix/tahoe-lafs.nix +++ b/nix/tahoe-lafs.nix @@ -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 );