Removal of genesis-file and genesis-hash arguments from Nix derivations

IntersectMBO · Mar 17, 2020 · 05e1a08 · 05e1a08
1 parent cb10690
commit 05e1a08
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/nix/nixos/cardano-node-service.nix b/nix/nixos/cardano-node-service.nix
@@ -82,6 +82,14 @@ in {
         '';
       };
 
+     genesisFile = mkOption {
+        type = types.path;
+        default = envConfig.genesisFile;
+        description = ''
+          Genesis json file
+        '';
+      };
+
       genesisHash = mkOption {
         type = types.nullOr types.str;
         default = envConfig.genesisHash;

diff --git a/nix/nixos/chairman-as-a-service.nix b/nix/nixos/chairman-as-a-service.nix
@@ -95,6 +95,13 @@ in {
         default = 2160;
         description = ''Should come from genesis instead.'';
       };
+      genesisHash = mkOption {
+        type = types.str;
+        default = envConfig.genesisHash;
+        description = ''
+          Hash of the genesis file
+        '';
+      };
       slot-length = mkOption {
         type = int;
         default = 20;

diff --git a/nix/svclib.nix b/nix/svclib.nix
@@ -12,8 +12,7 @@ let
     (optionalAttrs (cfg.protover-major or null != null) { LastKnownBlockVersion-Major = cfg.protover-major; }) //
     (optionalAttrs (cfg.protover-minor or null != null) { LastKnownBlockVersion-Minor = cfg.protover-minor; }) //
     (optionalAttrs (cfg.protover-alt   or null != null) { LastKnownBlockVersion-Alt   = cfg.protover-alt;   }) //
-    (optionalAttrs (cfg.genesisFile != null) { GenesisFile = cfg.genesisFile;   }) //
-    (optionalAttrs (cfg.genesisHash != null) { GenesisHash = cfg.genesisHash; });
+    (optionalAttrs (cfg.genesisFile != null) { GenesisFile = cfg.genesisFile;   });
 
   ## mkFullyConnectedLocalClusterTopology
   ##   :: String Address -> String Port -> Int PortNo -> Int Valency