Split resulting package to few outputs

Signed-off-by: Alexander V. Nikolaev <[email protected]>
tiiuae · Aug 23, 2024 · 6429a5f · 6429a5f
1 parent e51fa6a
commit 6429a5f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 22 deletions.
diff --git a/flake.nix b/flake.nix
@@ -27,12 +27,7 @@
   };
 
   outputs =
-    inputs@{
-      self,
-      flake-parts,
-      crane,
-      ...
-    }:
+    inputs@{ flake-parts, crane, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
         "x86_64-linux"
@@ -61,31 +56,35 @@
                 ];
               };
             in
-            {
+            rec {
               givc-app = pkgs.callPackage ./nixos/packages/givc-app.nix { inherit src; };
               givc-agent = pkgs.callPackage ./nixos/packages/givc-agent.nix { inherit src; };
               givc-admin = pkgs.callPackage ./nixos/packages/givc-admin.nix { inherit src; };
               givc-admin-rs = pkgs.callPackage ./nixos/packages/givc-admin-rs.nix {
                 inherit crane;
                 src = ./.;
               };
+              givc-cli = givc-admin-rs.cli;
             };
         };
-      flake = {
-        # NixOS Modules
-        nixosModules = {
-          admin-go = import ./nixos/modules/admin-go.nix { inherit self; };
-          admin = import ./nixos/modules/admin.nix { inherit self; };
-          host = import ./nixos/modules/host.nix { inherit self; };
-          sysvm = import ./nixos/modules/sysvm.nix { inherit self; };
-          appvm = import ./nixos/modules/appvm.nix { inherit self; };
-        };
+      flake =
+        { self, ... }:
+        {
+          # NixOS Modules
+          nixosModules = {
+            admin-go = import ./nixos/modules/admin-go.nix { inherit self; };
+            admin = import ./nixos/modules/admin.nix { inherit self; };
+            host = import ./nixos/modules/host.nix { inherit self; };
+            sysvm = import ./nixos/modules/sysvm.nix { inherit self; };
+            appvm = import ./nixos/modules/appvm.nix { inherit self; };
+          };
 
-        # Overlays
-        overlays.default = _final: prev: {
-          src = ./.;
-          givc-app = prev.callPackage ./nixos/packages/givc-app.nix { pkgs = prev; };
+          # Overlays
+          overlays.default = _final: prev: {
+            src = ./.;
+            inherit (self.packages.${prev.stdenv.hostPlatform.system}) givc-app;
+            givc-cli = self.packages.${prev.stdenv.hostPlatform.system}.givc-admin-rs.cli;
+          };
         };
-      };
     };
 }
diff --git a/nixos/packages/givc-admin-rs.nix b/nixos/packages/givc-admin-rs.nix
@@ -30,6 +30,11 @@ let
   givc = craneLib.buildPackage (
     commonArgs
     // {
+      outputs = [
+        "out"
+        "cli"
+        "agent"
+      ];
       cargoArtifacts = craneLib.buildDepsOnly commonArgs;
 
       # Additional environment variables or build phases/hooks can be set
@@ -39,6 +44,11 @@ let
         # Avoid issue with source filtering, put symlink back into source tree
         ln -sf ../api $sourceRoot/common/api
       '';
+      postInstall = ''
+        mkdir -p $cli/bin $agent/bin
+        mv $out/bin/givc-cli $cli/bin/givc-cli
+        mv $out/bin/givc-agent $agent/bin/givc-agent
+      '';
     }
   );
 in

diff --git a/nixos/tests/admin.nix b/nixos/tests/admin.nix
@@ -207,7 +207,7 @@ in
           testScript =
             { nodes, ... }:
             let
-              cli = "${self'.packages.givc-admin-rs}/bin/givc-cli";
+              cli = "${self'.packages.givc-admin-rs.cli}/bin/givc-cli";
               expected = "givc-ghaf-host.service"; # Name which we _expect_ to see registered in admin server's registry
             in
             # FIXME: why it so bizzare? (derived from name in cert)