Skip to content

Commit b686bc3

Browse files
committed
nixosNodeSvc: rm eventlogged pkg as ghc >= 9.4 includes RTS support
1 parent 0983ac2 commit b686bc3

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
inherit (ouroboros-consensus-cardano.components.exes) db-analyser db-synthesizer db-truncater snapshot-converter;
134134
# Add cardano-node and cardano-cli with their git revision stamp.
135135
# Keep available an alternative without the git revision, like the other
136-
# passthru (profiled, asserted and eventlogged in nix/haskell.nix) that
136+
# passthru (profiled and asserted in nix/haskell.nix) that
137137
# have no git revision but for the same compilation alternative.
138138
cardano-node =
139139
let node = project.exes.cardano-node;

nix/haskell.nix

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -415,16 +415,6 @@ project.appendOverlays (with haskellLib.projectOverlays; [
415415
(name: { flags.asserts = true; });
416416
}];
417417
};
418-
eventlogged = final.appendModule
419-
{
420-
# From 9.2+
421-
# on the commandline: error: [-Wdeprecated-flags, Werror=deprecated-flags]
422-
# -eventlog is deprecated: the eventlog is now enabled in all runtime system ways
423-
modules = [({ lib, pkgs, config, ... }: lib.mkIf (builtins.compareVersions config.compiler.version "9.2" < 0) {
424-
packages = final.pkgs.lib.genAttrs [ "cardano-node" ]
425-
(name: { configureFlags = [ "--ghc-option=-eventlog" ]; });
426-
})];
427-
};
428418
# add passthru to hsPkgs:
429419
hsPkgs = lib.mapAttrsRecursiveCond (v: !(lib.isDerivation v))
430420
(path: value:
@@ -436,7 +426,6 @@ project.appendOverlays (with haskellLib.projectOverlays; [
436426
passthru = {
437427
profiled = lib.getAttrFromPath path final.profiled.hsPkgs;
438428
asserted = lib.getAttrFromPath path final.asserted.hsPkgs;
439-
eventlogged = lib.getAttrFromPath path final.eventlogged.hsPkgs;
440429
};
441430
}
442431
else value)

nix/nixos/cardano-node-service.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ in {
226226
type = types.package;
227227
default = if (cfg.profiling != "none")
228228
then cfg.cardanoNodePackages.cardano-node.passthru.profiled
229-
else if cfg.eventlog then cfg.cardanoNodePackages.cardano-node.passthru.eventlogged
230229
else if cfg.asserts then cfg.cardanoNodePackages.cardano-node.passthru.asserted
231230
else cfg.cardanoNodePackages.cardano-node;
232231
defaultText = "cardano-node";

0 commit comments

Comments
 (0)