rename package appEnv- to tesh-

OceanSprint · Oct 28, 2023 · ad1fd9e · ad1fd9e
1 parent 43c5153
commit ad1fd9e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
         run: |
           nix build .#checks.x86_64-linux.pre-commit
           nix build .#devShells.x86_64-linux.$(echo $PYTHON)
-          nix build .#packages.x86_64-linux.appEnv-$(echo $PYTHON)
+          nix build .#packages.x86_64-linux.tesh-$(echo $PYTHON)
           nix build .#packages.x86_64-linux.testEnv-$(echo $PYTHON)
           nix build .#checks.x86_64-linux.tests-$(echo $PYTHON)
 
@@ -76,7 +76,7 @@ jobs:
         run: |
           nix build .#checks.x86_64-darwin.pre-commit
           nix build .#devShells.x86_64-darwin.$(echo $PYTHON)
-          nix build .#packages.x86_64-darwin.appEnv-$(echo $PYTHON)
+          nix build .#packages.x86_64-darwin.tesh-$(echo $PYTHON)
           nix build .#packages.x86_64-darwin.testEnv-$(echo $PYTHON)
           nix build .#checks.x86_64-darwin.tests-$(echo $PYTHON)
 

diff --git a/flake.nix b/flake.nix
@@ -36,11 +36,11 @@
           supportedPythons = [ "python39" "python310" "python311" ];
           forAllPythons = name: f:
             let
-              attrNames = (map (py: if name == "" then "${py}" else "${name}-${py}") supportedPythons);
+              attrNames = (map (py: "${name}${py}") supportedPythons);
               outputs = lib.genAttrs supportedPythons
                 (python: f python);
             in
-            lib.mapAttrs' (py: value: { name = (if name == "" then "${py}" else "${name}-${py}"); inherit value; }) outputs;
+            lib.mapAttrs' (py: value: { name = "${name}${py}"; inherit value; }) outputs;
 
           poetryArgs = python: {
             projectDir = ./.;
@@ -100,18 +100,18 @@
           };
 
           packages =
-            (forAllPythons "appEnv" (python:
+            (forAllPythons "tesh-" (python:
               inputs.poetry2nix.legacyPackages.${system}.mkPoetryApplication (poetryArgs python)))
 
             //
 
-            (forAllPythons "testEnv" (python:
+            (forAllPythons "testEnv-" (python:
               inputs.poetry2nix.legacyPackages.${system}.mkPoetryEnv (poetryArgs python)));
 
           # `make unit` is not needed as it's already run in pre-commit
           # check, registered by flake-parts
           checks =
-            (forAllPythons "tests" (python:
+            (forAllPythons "tests-" (python:
               pkgs.runCommand "tests"
                 {
                   buildInputs = self'.devShells."${python}".buildInputs;