Skip to content

Commit a1c4fe7

Browse files
committed
ci: fix eval warn errors in hydra due to svc module eval
1 parent f25eb4c commit a1c4fe7

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

nix/nixos/cardano-node-service.nix

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -997,13 +997,11 @@ in {
997997
}
998998
];
999999

1000-
warnings = (
1001-
optional (cfg.useNewTopology != null) ''
1002-
The useNewTopology option is deprecated and will be removed in the future. As of cardano-node 10.6.0, this option should remain null.
1003-
For older node versions, a bool value can be set, but this will only be supported until the Dijkstra hard fork at which point all
1004-
cardano-node versions will be compelled to upgrade and the useNewTopology option will be removed.
1005-
''
1006-
);
1000+
warnings = optional (cfg.useNewTopology != null) ''
1001+
The useNewTopology option is deprecated and will be removed in the future. As of cardano-node 10.6.0, this option should remain null.
1002+
For older node versions, a bool value can be set, but this will only be supported until the Dijkstra hard fork at which point all
1003+
cardano-node versions will be compelled to upgrade and the useNewTopology option will be removed.
1004+
'';
10071005
}
10081006
]);
10091007
}

nix/svclib.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ let
239239
systemdCompat.options = {
240240
systemd.services = mkOption {};
241241
assertions = [];
242+
warnings = [];
242243
users = mkOption {};
243244
environment = mkOption {};
244245
};

nix/workbench/service/generator.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ let
112112
systemd.sockets = mkOption {};
113113
users = mkOption {};
114114
assertions = mkOption {};
115+
warnings = [];
115116
environment = mkOption {};
116117
};
117118
eval =

nix/workbench/service/nodes.nix

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ let
5353
then go {} (__head eras) (__tail eras)
5454
else throw "configHardforksIntoEra: unknown era '${era}'";
5555

56-
liveTablesPath = i:
56+
liveTablesPath = i:
5757
if (profile.node ? "ssd_directory" && profile.node.ssd_directory != null)
5858
then "${profile.node.ssd_directory}/lmdb-node-${toString i}"
5959
else null;
@@ -194,8 +194,16 @@ let
194194
systemd.sockets = mkOption {};
195195
users = mkOption {};
196196
assertions = mkOption {};
197+
warnings = [];
197198
environment = mkOption {};
198199
};
200+
warnCompat.options = {
201+
warnings = mkOption {
202+
type = types.listOf types.str;
203+
default = [];
204+
description = "Avoid errors on warning eval in cardano-node-service";
205+
};
206+
};
199207
eval = let
200208
extra = {
201209
services.cardano-node = {

nix/workbench/service/tracer.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ let
6262
systemd.sockets = mkOption {};
6363
users = mkOption {};
6464
assertions = mkOption {};
65+
warnings = [];
6566
environment = mkOption {};
6667
};
6768
eval = evalModules {

0 commit comments

Comments
 (0)