SQUASH

IntersectMBO · Sep 10, 2024 · 37d24fc · 37d24fc
1 parent b0c66d9
commit 37d24fc
Showing 1 changed file with 18 additions and 35 deletions.
diff --git a/nix/workbench/backend/nomad.nix b/nix/workbench/backend/nomad.nix
@@ -146,17 +146,15 @@ let
     ############################################################################
     lib.attrsets.optionalAttrs (subBackendName == "cloud") {
       openssh_hacks = rec {
-        # Not used locally.
         commit = "5d8c5913c70723318acf47496e2abf7d2c99384f"; # OpenSSH version 9.8 (Branch "9.8");
-        # Needed to create the SSH "start.sh" script.
+        # Not used locally. Needed to create the SSH "start.sh" script.
         nix-store-path  = (__getFlake "github:fmaste/openssh-portable-hacks/${commit}").packages.x86_64-linux.openssh_hacks;
         flake-reference = "github:fmaste/openssh-portable-hacks";
         flake-output = "packages.x86_64-linux.openssh_hacks";
         installable = "${flake-reference}/${commit}#${flake-output}";
       };
       rsync = rec {
-        # Not used locally.
-        nix-store-path  = null; # pkgs.rsync;
+        nix-store-path  = pkgs.rsync; # Not used locally.
         flake-reference = "github:intersectmbo/cardano-node";
         flake-output = "legacyPackages.x86_64-linux.rsync";
         # Same commit as the basic packages.
@@ -172,19 +170,16 @@ let
       # this packages could be configured to come from a different commit than
       # the one used to enter the shell ??????????
       cardano-node = rec {
-        # TODO: - cardano-node.passthru.profiled
-        #       - cardano-node.passthru.eventlogged
-        #       - cardano-node.passthru.asserted
-        # profileData.node-services."node-0".serviceConfig.value.eventlog
-        # builtins.trace (builtins.attrNames profileData.node-services."node-0".serviceConfig.value.eventlog) XXXX
-        nix-store-path =
-          # Local reference only needed if not "cloud".
-          if subBackendName == "cloud"
-          then null
-          else with pkgs;
-            if eventlogged
-              then cardanoNodePackages.cardano-node.passthru.eventlogged
-              else cardanoNodePackages.cardano-node
+        # Local reference only used if not "cloud".
+        nix-store-path = with pkgs;
+          # TODO: - cardano-node.passthru.profiled
+          #       - cardano-node.passthru.eventlogged
+          #       - cardano-node.passthru.asserted
+          # profileData.node-services."node-0".serviceConfig.value.eventlog
+          # builtins.trace (builtins.attrNames profileData.node-services."node-0".serviceConfig.value.eventlog) XXXX
+          if eventlogged
+            then cardanoNodePackages.cardano-node.passthru.eventlogged
+            else cardanoNodePackages.cardano-node
         ;
         flake-reference = "github:intersectmbo/cardano-node";
         flake-output =
@@ -195,34 +190,22 @@ let
         installable = "${flake-reference}/${gitrev}#${flake-output}";
       };
       cardano-cli = rec {
-        nix-store-path =
-          # Local reference only needed if not "cloud".
-          if subBackendName == "cloud"
-          then null
-          else pkgs.cardanoNodePackages.cardano-cli
-        ;
+        # Local reference only used if not "cloud".
+        nix-store-path = pkgs.cardanoNodePackages.cardano-cli;
         flake-reference = "github:input-output-hk/cardano-cli";
         flake-output = "cardanoNodePackages.cardano-cli";
         installable = "${flake-reference}/${gitrev}#${flake-output}";
       };
       cardano-tracer = rec {
-        nix-store-path =
-          # Local reference only needed if not "cloud".
-          if subBackendName == "cloud"
-          then null
-          else pkgs.cardanoNodePackages.cardano-tracer
-        ;
+        # Local reference only used if not "cloud".
+        nix-store-path = pkgs.cardanoNodePackages.cardano-tracer;
         flake-reference = "github:intersectmbo/cardano-node";
         flake-output = "cardanoNodePackages.cardano-tracer";
         installable = "${flake-reference}/${gitrev}#${flake-output}";
       };
       tx-generator = rec {
-        nix-store-path =
-          # Local reference only needed if not "cloud".
-          if subBackendName == "cloud"
-          then null
-          else pkgs.cardanoNodePackages.tx-generator
-        ;
+        # Local reference only used if not "cloud".
+        nix-store-path = pkgs.cardanoNodePackages.tx-generator;
         flake-reference = "github:intersectmbo/cardano-node";
         flake-output = "cardanoNodePackages.tx-generator";
         installable = "${flake-reference}/${gitrev}#${flake-output}";