bump: capkgs for faucet-ng @ 8.10, mithril-ng @ 2418-1, minor mods

input-output-hk · May 8, 2024 · 8b18a67 · 8b18a67
1 parent 16676f5
commit 8b18a67
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake/nixosModules/profile-cardano-parts.nix b/flake/nixosModules/profile-cardano-parts.nix
@@ -33,6 +33,7 @@
 #   config.cardano-parts.perNode.pkgs.cardano-node-pkgs
 #   config.cardano-parts.perNode.pkgs.cardano-smash
 #   config.cardano-parts.perNode.pkgs.cardano-submit-api
+#   config.cardano-parts.perNode.pkgs.cardano-tracer
 #   config.cardano-parts.perNode.pkgs.mithril-client-cli
 #   config.cardano-parts.perNode.pkgs.mithril-signer
 #   config.cardano-parts.perNode.roles.isCardanoDensePool
@@ -263,6 +264,7 @@ flake @ {moduleWithSystem, ...}: {
         (mkPkgOpt "cardano-node" (cfg.group.pkgs.cardano-node system))
         (mkPkgOpt "cardano-smash" (cfg.group.pkgs.cardano-smash system))
         (mkPkgOpt "cardano-submit-api" (cfg.group.pkgs.cardano-submit-api system))
+        (mkPkgOpt "cardano-tracer" (cfg.group.pkgs.cardano-tracer system))
         (mkPkgOpt "mithril-client-cli" (cfg.group.pkgs.mithril-client-cli system))
         (mkPkgOpt "mithril-signer" (cfg.group.pkgs.mithril-signer system))
         (mkSpecialOpt "cardano-db-sync-pkgs" lib.types.attrs (cfg.group.pkgs.cardano-db-sync-pkgs system))

diff --git a/flake/nixosModules/service-cardano-faucet.nix b/flake/nixosModules/service-cardano-faucet.nix
@@ -22,11 +22,7 @@
 # Tips:
 #   * This service-cardano-faucet nixos module provides a basic cardano-faucet service
 {moduleWithSystem, ...}: {
-  flake.nixosModules.service-cardano-faucet = moduleWithSystem ({
-    config,
-    system,
-    ...
-  }: nixos @ {
+  flake.nixosModules.service-cardano-faucet = moduleWithSystem ({config, ...}: nixos @ {
     pkgs,
     lib,
     name,
@@ -35,10 +31,10 @@
     with builtins;
     with lib; let
       inherit (types) bool listOf package port str;
-      inherit (groupCfg) groupFlake;
       inherit (groupCfg.meta) domain;
 
       groupCfg = nixos.config.cardano-parts.cluster.group;
+      perNodeCfg = nixos.config.cardano-parts.perNode;
 
       cfg = nixos.config.services.cardano-faucet;
     in {
@@ -100,7 +96,7 @@
 
           package = mkOption {
             type = package;
-            default = groupFlake.withSystem system ({config, ...}: config.cardano-parts.pkgs.cardano-faucet);
+            default = perNodeCfg.pkgs.cardano-faucet;
             description = "The cardano-faucet package that should be used.";
           };
 
@@ -172,6 +168,10 @@
             Restart = "always";
             RestartSec = "30s";
             SupplementaryGroups = concatStringsSep " " cfg.supplementaryGroups;
+
+            # To avoid extended ledger replays timing out and failing the service on preStart
+            # while waiting for a socket.
+            TimeoutStartSec = 3600;
           };
         };
 

diff --git a/flakeModules/pkgs.nix b/flakeModules/pkgs.nix
@@ -407,7 +407,7 @@ in
             (mkPkg "cardano-db-tool" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-input-output-hk-cardano-db-sync-13-2-0-2-1f26396")
             (mkPkg "cardano-db-tool-ng" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-input-output-hk-cardano-db-sync-sancho-4-2-0-3ac426d")
             (mkPkg "cardano-faucet" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-8-3-ba2a8d9")
-            (mkPkg "cardano-faucet-ng" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-8-3-ba2a8d9")
+            (mkPkg "cardano-faucet-ng" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-8-10-f1b83b4")
             (mkPkg "cardano-node" (caPkgs."cardano-node-input-output-hk-cardano-node-8-9-2-424983f" // {version = "8.9.2";}))
             (mkPkg "cardano-node-ng" (caPkgs."cardano-node-input-output-hk-cardano-node-8-10-1-pre-1ffe4a5" // {version = "8.10.1-pre";}))
             (mkPkg "cardano-smash" caPkgs.cardano-smash-server-no-basic-auth-input-output-hk-cardano-db-sync-13-2-0-2-1f26396)
@@ -433,9 +433,9 @@ in
             (mkPkg "metadata-validator-github" caPkgs.metadata-validator-github-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d)
             (mkPkg "metadata-webhook" caPkgs.metadata-webhook-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d)
             (mkPkg "mithril-client-cli" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-2412-0-pre-2e462c0 {meta.mainProgram = "mithril-client";}))
-            (mkPkg "mithril-client-cli-ng" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-unstable-b914203 {meta.mainProgram = "mithril-client";}))
+            (mkPkg "mithril-client-cli-ng" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-2418-1-pre-512fe8d {meta.mainProgram = "mithril-client";}))
             (mkPkg "mithril-signer" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-2412-0-pre-2e462c0 {meta.mainProgram = "mithril-signer";}))
-            (mkPkg "mithril-signer-ng" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-unstable-b914203 {meta.mainProgram = "mithril-signer";}))
+            (mkPkg "mithril-signer-ng" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-2418-1-pre-512fe8d {meta.mainProgram = "mithril-signer";}))
             (mkPkg "token-metadata-creator" (recursiveUpdate caPkgs.token-metadata-creator-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d {meta.mainProgram = "token-metadata-creator";}))
           ];
         };