Merge pull request fluidattacks#1241 from dsalaza4/main

feat(back): fluidattacks#1171 use new builtin
dsalaza4 · Jan 9, 2024 · 8078e56 · 8078e56
2 parents 8a8fc21 + 833e5c2
commit 8078e56
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 7 deletions.
diff --git a/src/args/lint-python-imports/default.nix b/src/args/lint-python-imports/default.nix
@@ -1,6 +1,6 @@
 {
   makeDerivation,
-  makePythonPypiEnvironment,
+  makePythonEnvironment,
   makeSearchPaths,
   ...
 }: {
@@ -18,12 +18,17 @@ makeDerivation {
   name = "lint-python-imports-for-${name}";
   searchPaths.source = [
     (makeSearchPaths searchPaths)
-    (makePythonPypiEnvironment {
-      name = "lint-python-imports";
-      sourcesYaml = ./pypi-sources.yaml;
-      withSetuptools_67_7_2 = true;
-      withSetuptoolsScm_7_1_0 = true;
-      withWheel_0_40_0 = true;
+    (makePythonEnvironment {
+      pythonProjectDir = ./.;
+      pythonVersion = "3.11";
+      overrides = self: super: {
+        grimp = super.grimp.overridePythonAttrs (
+          old: {buildInputs = [super.setuptools];}
+        );
+        import-linter = super.import-linter.overridePythonAttrs (
+          old: {buildInputs = [super.setuptools];}
+        );
+      };
     })
   ];
 }
diff --git a/src/args/lint-python-imports/poetry.lock b/src/args/lint-python-imports/poetry.lock
diff --git a/src/args/lint-python-imports/pyproject.toml b/src/args/lint-python-imports/pyproject.toml
@@ -0,0 +1,15 @@
+[tool.poetry]
+name = "lint-python-imports"
+version = "0.1.0"
+description = ""
+authors = ["Your Name <[email protected]>"]
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = "^3.11"
+import-linter = "1.2.4"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"