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