From 69f78272d0d80b13d24d777d702de72cc93ac448 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 25 Jan 2022 10:22:10 -0500
Subject: [PATCH] get all of the elpy requirements into the environment
---
shell.nix | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/shell.nix b/shell.nix
index be375c6..8affe78 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
];
}
--
GitLab