summary refs log tree commit diff
path: root/nixos/lib/testing
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2022-06-26 13:57:58 +0200
committerRobert Hensing <robert@roberthensing.nl>2022-09-24 17:38:10 +0100
commit52bfa318e8797cffbd4750efbb59cc4d276187a6 (patch)
tree0ef97972c00ab09a6b6c7e3342ef3effe52d007a /nixos/lib/testing
parent9303a3c73bd45f95997ea52597f901bb8759fd2d (diff)
downloadnixpkgs-52bfa318e8797cffbd4750efbb59cc4d276187a6.tar
nixpkgs-52bfa318e8797cffbd4750efbb59cc4d276187a6.tar.gz
nixpkgs-52bfa318e8797cffbd4750efbb59cc4d276187a6.tar.bz2
nixpkgs-52bfa318e8797cffbd4750efbb59cc4d276187a6.tar.lz
nixpkgs-52bfa318e8797cffbd4750efbb59cc4d276187a6.tar.xz
nixpkgs-52bfa318e8797cffbd4750efbb59cc4d276187a6.tar.zst
nixpkgs-52bfa318e8797cffbd4750efbb59cc4d276187a6.zip
nixos/testing: Support mypy through regular mechanisms
Rebase / forward port of 2c8bbf33fd84d2fd9de70d66c1f50ac1b6123dd8
Diffstat (limited to 'nixos/lib/testing')
-rw-r--r--nixos/lib/testing/driver.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix
index 9473d888cbb..b041693686e 100644
--- a/nixos/lib/testing/driver.nix
+++ b/nixos/lib/testing/driver.nix
@@ -52,6 +52,7 @@ let
         nativeBuildInputs = [
           hostPkgs.makeWrapper
         ] ++ lib.optionals (!config.skipTypeCheck) [ hostPkgs.mypy ];
+        buildInputs = [ testDriver ];
         testScript = config.testScriptString;
         preferLocalBuild = true;
         passthru = config.passthru;
@@ -73,13 +74,10 @@ let
 
           cat -n testScriptWithTypes
 
-          # set pythonpath so mypy knows where to find the imports. this requires the py.typed file.
-          export PYTHONPATH='${../test-driver}'
           mypy  --no-implicit-optional \
                 --pretty \
                 --no-color-output \
                 testScriptWithTypes
-          unset PYTHONPATH
         ''}
 
         echo -n "$testScript" >> $out/test-script