fix: openMCT Service, updated openMCT 3.1.1

nixOS/Systems/Base/nix.nix

@@ -33,7 +33,7 @@
     package = pkgs.nixVersions.unstable;
     #registry.nixpkgs.flake = inputs.nixpkgs;
     extraOptions = ''
-      experimental-features = nix-command flakes
+      experimental-features = nix-command flakes repl-flake
       keep-outputs          = true
       keep-derivations      = true
     '';

nixOS/Systems/Base/sky360mct.nix

@@ -1,9 +1,10 @@
-{ ... }: {
+{ pkgs, sky360, ... }: {
+    imports = [
+        # ../../dream2nix/packages/openmct        
+        ../../dream2nix/packages/openmct/sky360mct_service.nix
+    ];
 
-  # imports = [
-  #   ./services/openmct.nix # TODO: move to the flake.nix of sky360
-  # ];
-  services.sky360.openmct = {
+    services.sky360.openmct = {
     enable = true;
     openFirewall = true;
     # TODO: need to test

nixOS/Systems/cyclop/networking.nix

@@ -1,5 +1,5 @@
 { config, pkgs, ... }:
 {
-  networking.firewall.allowedTCPPorts = [ 8080 ]; # 45563 - obs-teleport
+  # networking.firewall.allowedTCPPorts = [ 8080 ]; # 45563 - obs-teleport
 
 }

nixOS/dream2nix/flake.nix

@@ -0,0 +1,27 @@
+{
+  description = "My flake with dream2nix packages";
+
+  inputs = {
+    dream2nix.url = "github:nix-community/dream2nix";
+    nixpkgs.follows = "dream2nix/nixpkgs";
+    # flake-parts.url = "github:hercules-ci/flake-parts";
+  };
+
+  outputs =
+    inputs @ { self
+    , dream2nix
+    , nixpkgs
+    # , flake-parts
+    , ...
+    }:
+  let
+      system = "aarch64-linux"; # TODO: support multi-systems using flake-utils or flake-parts
+  in { 
+    packages.${system}.packages = dream2nix.lib.importPackages {
+      packageSets.nixpkgs = nixpkgs.legacyPackages.${system};
+      projectRoot = ./.;
+      projectRootFile = "flake.nix";
+      packagesDir = ./packages;
+    };
+  };
+}

nixOS/dream2nix/packages/openmct/default.nix

@@ -5,8 +5,8 @@
     dream2nix.modules.dream2nix.nodejs-granular-v3
   ];
 
-  name = "sky360_openmct";
-  version = "0.0.1";
+  name = "openmct";
+  version = "0.1.0";
 
   mkDerivation = {
     src = ./.;

nixOS/dream2nix/packages/openmct/lock.json

@@ -16,7 +16,7 @@
           "ws": "^6.1.2"
         },
         "bin": {
-          "sky360_openmct": "src/server.js"
+          "openmct": "src/server.js"
         }
       },
       "node_modules/accepts": {
@@ -477,9 +477,9 @@
         }
       },
       "node_modules/openmct": {
-        "version": "3.0.2",
-        "resolved": "https://registry.npmjs.org/openmct/-/openmct-3.0.2.tgz",
-        "integrity": "sha512-gKCV0aLXGSyF4bJGPmQnR9I580KpsS6m8DaW3cSvdKGYNyd5d71CgjjXGU7MRe/c7dObXZo/J92WPT4OIerPKw==",
+        "version": "3.1.1",
+        "resolved": "https://registry.npmjs.org/openmct/-/openmct-3.1.1.tgz",
+        "integrity": "sha512-BUc+lNPj8ENqbqEBcK48RdF/5QGz9m/qj12kea8LMHPaUOYsOt0IojGE9/nrkyYuEIeX7H3eqmo+X8smSF0p7A==",
         "engines": {
           "node": ">=16.19.1 <20"
         }
@@ -705,5 +705,5 @@
       }
     }
   },
-  "invalidationHash": "6190f66346eff2ca4558d419bf387c149900d17fe51f2dd6be80d9325563529c"
+  "invalidationHash": "0f739b7d77f1743dee2c79f8cb682ebcf65a73f67558d3594e40eaa04e9dc984"
 }

nixOS/dream2nix/packages/openmct/package.json

@@ -8,7 +8,7 @@
     "clean": "rm -rf node_modules package-lock.json"
   },
   "bin": {
-    "sky360_openmct": "src/server.js"
+    "openmct": "src/server.js"
   },
   "repository": {
     "type": "git",

nixOS/dream2nix/packages/openmct/sky360mct_service.nix

@@ -1,23 +1,25 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, sky360, ... }:
 
 with lib;
 
 let
   cfg = config.services.sky360.openmct;
   defaultUser = "openmct";
   defaultGroup = defaultUser;
-  sky360Packages.openmct = "${./flake.nix}.packages.sky360_openmct";
+  # FIXME: remove hardcoded system `aarch64-linux`
+  defaultPackage = sky360.packages.aarch64-linux.packages.openmct;
+  # defaultPackage = sky360.packages.openmct;
 in
 {
   options.services.sky360.openmct = {
     enable = mkEnableOption (mdDoc "Sky360's openMCT service");
 
-    # package = mkOption {
-    #   default = sky360Packages.openmct;
-    #   defaultText = literalExpression "sky360Packages.openmct";
-    #   type = types.package;
-    #   description = lib.mdDoc "openMCT package to use";
-    # };
+    package = mkOption {
+      default = defaultPackage;
+      defaultText = literalExpression "sky360.packages.openmct";
+      type = types.package;
+      description = lib.mdDoc "openMCT package to use";
+    };
 
     openFirewall = mkOption {
       type = types.bool; # NOTE: this is why nix language can not be dynamic and require a proper type system. I just don't get it sometimes...the compliation of the code won't slow down compare to a build....
@@ -70,17 +72,22 @@ in
       allowedTCPPorts = [ cfg.port ];
     };
 
+    environment.systemPackages = with pkgs; [
+      # cfg.package
+    ];
+
     systemd.services.openmct = {
       description = "Sky360 openMCT Service";
       wantedBy = [ "multi-user.target" ];
       after = [ "networking.target" ];
       environment = { HOME = cfg.userDir; };
+      path = [ cfg.package ];
       serviceConfig = mkMerge [{
         User = cfg.security.user;
         Group = cfg.security.group;
         # TODO: support --port and more params
         # ExecStart = "${sky360Packages.openmct}/bin/sky360_openmct --port $toString cfg.port}";
-        ExecStart = "${sky360Packages.openmct}/bin/sky360_openmct";
+        ExecStart = "${cfg.package}/bin/openmct";
         PrivateTmp = true;
         Restart = "always"; # TODO: write options
         WorkingDdddirectory = cfg.userDir;