naming

unavi-xyz · Sep 16, 2024 · 7d629bc · 7d629bc
1 parent 4552a73
commit 7d629bc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         package: [unavi-app, unavi-server]
-    name: x86_64-windows.${{ matrix.package }}
+    name: ${{ matrix.package }}.x86_64-windows
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/deploy/config/unavi-server.nix b/deploy/config/unavi-server.nix
@@ -4,7 +4,6 @@
   domainWorld,
   pkgs,
   unavi-server,
-  # unavi-web,
   ...
 }:
 let

diff --git a/deploy/default.nix b/deploy/default.nix
@@ -30,24 +30,24 @@ let
     [
       {
         name = pkgs.lib.concatStrings [
-          "app-"
+          "unavi-app-"
           subdir
         ];
         value = mkAppPackage resource;
       }
       {
         name = pkgs.lib.concatStrings [
-          "web-"
+          "unavi-web-"
           subdir
         ];
         value = mkWebPackage resource;
       }
       {
         name = pkgs.lib.concatStrings [
-          "server-"
+          "unavi-server-"
           subdir
         ];
-        value = self.packages.${localSystem}.server;
+        value = self.packages.${localSystem}.unavi-server;
       }
     ];
 
@@ -68,8 +68,8 @@ let
                 domainDwn = resource.value.domain_dwn;
                 domainWeb = resource.value.domain_web;
                 domainWorld = resource.value.domain_world;
-                unavi-server = self.packages.${system}."server-${subdir}";
-                unavi-web = self.packages.${system}."web-${subdir}";
+                unavi-server = self.packages.${system}."unavi-server-${subdir}";
+                unavi-web = self.packages.${system}."unavi-web-${subdir}";
               };
             };
           in

diff --git a/flake.nix b/flake.nix
@@ -122,9 +122,9 @@
         inherit unavi-app unavi-server;
 
         apps = rec {
-          app = flake-utils.lib.mkApp { drv = unavi-app.native; };
-          server = flake-utils.lib.mkApp { drv = unavi-server.server; };
-          web = flake-utils.lib.mkApp {
+          unavi-app = flake-utils.lib.mkApp { drv = unavi-app.native; };
+          unavi-server = flake-utils.lib.mkApp { drv = unavi-server.server; };
+          unavi-web = flake-utils.lib.mkApp {
             drv = pkgs.writeShellApplication {
               name = "unavi-web";
               runtimeInputs = with pkgs; [ python3Minimal ];
@@ -133,7 +133,7 @@
               '';
             };
           };
-          default = app;
+          default = unavi-app;
         } // deploy.apps;
 
         checks = {
@@ -145,11 +145,11 @@
             ;
         };
 
-        packages = rec {
-          app = unavi-app.native;
-          server = unavi-server.server;
-          web = unavi-app.web;
-          default = app;
+        packages = {
+          default = unavi-app.native;
+          unavi-app = unavi-app.native;
+          unavi-server = unavi-server.server;
+          unavi-web = unavi-app.web;
         } // deploy.packages;
 
         devShells.default = craneLib.devShell {
@@ -188,8 +188,8 @@
                 (nixpkgs.lib.filterAttrs (
                   n: _:
                   !(nixpkgs.lib.mutuallyExclusive [ n ] [
-                    "app"
-                    "server"
+                    "unavi-app"
+                    "unavi-server"
                   ])
                 ) v)
               )