Merge pull request #3509 from input-output-hk/devops-1027-generator-non-static

[DEVOPS-1027] make hydra show metrics for derivations

Author: disassembler

default.nix

@@ -57,12 +57,12 @@ let
     cardano-sl-wallet-static = justStaticExecutablesGitRev super.cardano-sl-wallet;
     cardano-sl-client = addRealTimeTestLogs super.cardano-sl-client;
     cardano-sl-generator = addRealTimeTestLogs super.cardano-sl-generator;
-    cardano-sl-auxx = justStaticExecutablesGitRev super.cardano-sl-auxx;
-    cardano-sl-wallet-new = justStaticExecutablesGitRev super.cardano-sl-wallet-new;
+    cardano-sl-auxx-static = justStaticExecutablesGitRev super.cardano-sl-auxx;
+    cardano-sl-wallet-new-static = justStaticExecutablesGitRev super.cardano-sl-wallet-new;
     cardano-sl-node-static = justStaticExecutablesGitRev self.cardano-sl-node;
     cardano-sl-explorer-static = justStaticExecutablesGitRev self.cardano-sl-explorer;
     cardano-report-server-static = justStaticExecutablesGitRev self.cardano-report-server;
-    cardano-sl-tools = justStaticExecutablesGitRev (overrideCabal super.cardano-sl-tools (drv: {
+    cardano-sl-tools-static = justStaticExecutablesGitRev (overrideCabal super.cardano-sl-tools (drv: {
       # waiting on load-command size fix in dyld
       doCheck = ! pkgs.stdenv.isDarwin;
     }));

release.nix

@@ -39,8 +39,10 @@ let
     cardano-sl-wallet-new = supportedSystems;
     all-cardano-sl = supportedSystems;
     cardano-sl-explorer-static = [ "x86_64-linux" ];
+    cardano-sl-explorer = [ "x86_64-linux" ];
     cardano-sl-explorer-frontend = [ "x86_64-linux" ];
     cardano-report-server-static = [ "x86_64-linux" ];
+    cardano-report-server = [ "x86_64-linux" ];
     stack2nix = supportedSystems;
     purescript = supportedSystems;
     daedalus-bridge = supportedSystems;

scripts/launch/connect-to-cluster/default.nix

@@ -34,9 +34,9 @@ let
     then { inherit relays confKey confFile; }
     else environments.${environment};
   executables =  {
-    wallet = if useStackBinaries then "stack exec -- cardano-node" else "${iohkPkgs.cardano-sl-wallet-new}/bin/cardano-node";
+    wallet = if useStackBinaries then "stack exec -- cardano-node" else "${iohkPkgs.cardano-sl-wallet-new-static}/bin/cardano-node";
     explorer = if useStackBinaries then "stack exec -- cardano-explorer" else "${iohkPkgs.cardano-sl-explorer-static}/bin/cardano-explorer";
-    x509gen = if useStackBinaries then "stack exec -- cardano-x509-certificates" else "${iohkPkgs.cardano-sl-tools}/bin/cardano-x509-certificates";
+    x509gen = if useStackBinaries then "stack exec -- cardano-x509-certificates" else "${iohkPkgs.cardano-sl-tools-static}/bin/cardano-x509-certificates";
   };
   ifWallet = localLib.optionalString (executable == "wallet");
   iohkPkgs = import ./../../../default.nix { inherit config system pkgs gitrev; };

scripts/launch/demo-cluster/default.nix

@@ -23,7 +23,7 @@ with localLib;
 
 let
   stackExec = optionalString useStackBinaries "stack exec -- ";
-  cardanoDeps = with iohkPkgs; [ cardano-sl-tools cardano-sl-wallet-new cardano-sl-node-static ];
+  cardanoDeps = with iohkPkgs; [ cardano-sl-tools-static cardano-sl-wallet-new-static cardano-sl-node-static ];
   demoClusterDeps = with pkgs; [ jq coreutils curl gnused openssl ];
   allDeps =  demoClusterDeps ++ (optionals (!useStackBinaries ) cardanoDeps);
   walletConfig = {