From dcd575f237a9f12f2c4555652c9a5677f3e677ac Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 3 Feb 2022 15:12:39 -0500
Subject: [PATCH] back out nix environment changes
---
shell.nix | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/shell.nix b/shell.nix
index 8affe78..c7ed137 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
];
}
--
GitLab