Merge pull request #1414 from dsalaza4/main

feat(cross): #1223 use jobs approach
fluidattacks · Dec 19, 2024 · 1c9c199 · 1c9c199
2 parents f23013d + 8d5f70c
commit 1c9c199
Show file tree

Hide file tree

Showing 23 changed files with 214 additions and 384 deletions.
diff --git a/default.nix b/default.nix
@@ -3,9 +3,11 @@ let
   agnostic = import ./src/args/agnostic.nix { inherit system; };
 
   args = agnostic // {
-    outputs."/cli/env/runtime" = import ./makes/cli/env/runtime/main.nix args;
+    outputs."/cli/env/runtime" =
+      (import ./makes/cli/env/runtime/makes.nix args).jobs."/cli/env/runtime";
     outputs."/cli/env/runtime/pypi" =
-      import ./makes/cli/env/runtime/pypi/main.nix args;
+      (import ./makes/cli/env/runtime/pypi/makes.nix
+        args).jobs."/cli/env/runtime/pypi";
     projectPath = import ./src/args/project-path args;
     projectSrc = ./.;
   };

diff --git a/makes/cli/env/runtime/main.nix b/makes/cli/env/runtime/main.nix
diff --git a/makes/cli/env/runtime/makes.nix b/makes/cli/env/runtime/makes.nix
@@ -0,0 +1,14 @@
+{ __nixpkgs__, makeSearchPaths, outputs, ... }: {
+  jobs."/cli/env/runtime" = makeSearchPaths {
+    bin = [
+      __nixpkgs__.cachix
+      __nixpkgs__.findutils
+      __nixpkgs__.git
+      __nixpkgs__.gnutar
+      __nixpkgs__.gzip
+      __nixpkgs__.nixVersions.nix_2_15
+      __nixpkgs__.openssh
+    ];
+    source = [ outputs."/cli/env/runtime/pypi" ];
+  };
+}
diff --git a/makes/cli/env/runtime/pypi/main.nix b/makes/cli/env/runtime/pypi/main.nix
diff --git a/makes/cli/env/runtime/pypi/makes.nix b/makes/cli/env/runtime/pypi/makes.nix
@@ -0,0 +1,6 @@
+{ makePythonEnvironment, ... }: {
+  jobs."/cli/env/runtime/pypi" = makePythonEnvironment {
+    pythonProjectDir = ./.;
+    pythonVersion = "3.11";
+  };
+}
diff --git a/makes/cli/env/runtime/pypi/poetry.lock b/makes/cli/env/runtime/pypi/poetry.lock
diff --git a/makes/cli/env/runtime/pypi/pyproject.toml b/makes/cli/env/runtime/pypi/pyproject.toml
@@ -10,7 +10,6 @@ python = "^3.11"
 rich = "12.6.0"
 textual = "0.1.18"
 
-
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
diff --git a/makes/cli/env/test/main.nix b/makes/cli/env/test/main.nix
diff --git a/makes/cli/env/test/poetry.lock b/makes/cli/env/test/poetry.lock
diff --git a/makes/cli/env/test/pyproject.toml b/makes/cli/env/test/pyproject.toml