remove mostly redondant scripts. add missing exe

IntersectMBO · May 4, 2021 · fa64c83 · fa64c83
1 parent e85d3cc
commit fa64c83
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 60 deletions.
diff --git a/flake.nix b/flake.nix
@@ -59,57 +59,15 @@
           crossSystem = systems.examples.mingwW64;
         }).cardanoNodeProject.flake {};
 
-        configModule = conf:
-          { pkgs, lib, ... }: {
-            services.cardano-node = {
-              stateDir = "/persist";
-              socketPath = "/alloc/node.socket";
-              enable = true;
-              cardanoNodePkgs = lib.mkDefault pkgs;
-              hostAddr = lib.mkDefault "0.0.0.0";
-            } // conf;
-          };
-
-        evaluated = conf:
-          lib.nixosSystem {
-            inherit pkgs system;
-            modules = [ ./nix/nixos/cardano-node-service.nix (configModule conf) ];
-          };
+        scripts = flattenTree pkgs.scripts;
 
-        packages = let
-          deps = with pkgs; [
-            coreutils
-            findutils
-            gnugrep
-            gnused
-            postgresql
-            strace
-            lsof
-            dnsutils
-            bashInteractive
-            iproute
-            curl
-            netcat
-            bat
-            tree
-          ];
-
-          vanilla = eachEnv (environment:
-            nameValuePair "${environment}/node-entrypoint"
-            (pkgs.writeShellScriptBin "cardano-node-entrypoint"
-              (evaluated { inherit environment; }).config.services.cardano-node.script));
-
-          debug = eachEnv (env:
-            let
-              closure = pkgs.symlinkJoin {
-                name = "cardano-node-entrypoint";
-                paths = [ vanilla."cardano-node-${env}" ] ++ deps;
-              };
-            in nameValuePair "${env}/node-entrypoint-debug" closure);
-
-        in debug // vanilla // {
+        packages = {
           inherit (devShell) devops;
-        } // (collectExes flake.packages)
+          inherit (pkgs) cardano-node-profiled cardano-node-eventlogged cardano-node-asserted
+            db-converter cardano-ping
+        }
+        // scripts
+        // (collectExes flake.packages)
         // (prefixNamesWith "static/"
               (mapAttrs pkgs.rewriteStatic (collectExes
                 (if system == "x86_64-darwin" then flake else muslFlake).packages)))
@@ -124,7 +82,7 @@
 
       in recursiveUpdate flake {
 
-        inherit evaluated environments packages;
+        inherit environments packages;
 
         legacyPackages = pkgs;
 
@@ -159,13 +117,6 @@
           '';
           };
         }
-        # nix run .#<env>/node
-        // (mapAttrs (_: drv: (mkApp {inherit drv;})) (flattenTree pkgs.scripts))
-        # nix run .#<env>/node-entrypoint
-        // (eachEnv (env: lib.nameValuePair "${env}/node-entrypoint" (utils.lib.mkApp {
-            drv = packages."${env}/node-entrypoint";
-            exePath = "/bin/cardano-node-entrypoint";
-          })))
         # nix run .#<exe>
         // (collectExes flake.apps);
 

diff --git a/nix/scripts-submit-api.nix b/nix/scripts-submit-api.nix
@@ -11,8 +11,8 @@ let
         ./nixos/cardano-submit-api-service.nix
         {
           services.cardano-submit-api = {
-            network = lib.mkDefault envConfig.name;
-            cardanoNodePkgs = lib.mkDefault pkgs;
+            network = mkDefault envConfig.name;
+            cardanoNodePkgs = mkDefault pkgs;
           };
         }
       ];

diff --git a/nix/scripts.nix b/nix/scripts.nix
@@ -11,6 +11,7 @@ let
         ./nixos/cardano-node-service.nix
         ({config, ...}: {
           services.cardano-node = {
+            hostAddr = mkDefault "0.0.0.0";
             environment = mkDefault envConfig.name;
             cardanoNodePkgs = mkDefault pkgs;
             stateDir = mkDefault "state-node-${config.services.cardano-node.environment}";
@@ -28,6 +29,27 @@ let
     ${service.script} $@
   '';
 
-in forEnvironments (environment: recurseIntoAttrs {
+  debugDeps = with pkgs; [
+    coreutils
+    findutils
+    gnugrep
+    gnused
+    postgresql
+    strace
+    lsof
+    dnsutils
+    bashInteractive
+    iproute
+    curl
+    netcat
+    bat
+    tree
+  ];
+
+in forEnvironments (environment: recurseIntoAttrs rec {
   node = mkScript environment;
+  node-debug = pkgs.symlinkJoin {
+    inherit (node) name;
+    paths = [ node ] ++ debugDeps;
+  };
 })