diff --git a/shell.nix b/shell.nix index 8affe78ce984af0fb6539f07edc5e147219b3a66..c7ed13786f4d7d394237bcf99009423c2b22c639 100644 --- a/shell.nix +++ b/shell.nix @@ -7,11 +7,7 @@ let inherit (privatestorage) pkgs mach-nix tahoe-lafs zkapauthorizer; python-env = mach-nix.mkPython { - inherit (zkapauthorizer.meta.mach-nix) python; - providers = zkapauthorizer.meta.mach-nix.providers // { - jedi = "wheel"; - parso = "wheel"; - }; + inherit (zkapauthorizer.meta.mach-nix) python providers; overridesPre = [ ( self: super: { @@ -21,17 +17,10 @@ let ]; requirements = '' - pip - jedi - black - isort - flake8 - ${builtins.readFile ./docs/requirements.txt} ${builtins.readFile ./requirements/test.in} ${zkapauthorizer.requirements} ''; }; - in pkgs.mkShell { # Avoid leaving .pyc all over the source tree when manually triggering tests @@ -39,6 +28,9 @@ pkgs.mkShell { PYTHONDONTWRITEBYTECODE = "1"; buildInputs = [ + # Provide the linting tools for interactive usage. + lint-python + # Supply all of the runtime and testing dependencies. python-env ]; }