Skip to content

Commit c544042

Browse files
committed
Replace nettools with hostname-debian
As far as I understand we include nettools for its hostname executable used by the Sys-Hostname-Long perl package. But if we just need that then the hostname-debian package provides a simpler and better maintained version.
1 parent aa62c7f commit c544042

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

nixos-modules/hydra.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ in
340340
requires = [ "hydra-init.service" ];
341341
wants = [ "network-online.target" ];
342342
after = [ "hydra-init.service" "network.target" "network-online.target" ];
343-
path = [ cfg.package pkgs.nettools pkgs.openssh pkgs.bzip2 config.nix.package ];
343+
path = [ cfg.package pkgs.hostname-debian pkgs.openssh pkgs.bzip2 config.nix.package ];
344344
restartTriggers = [ hydraConf ];
345345
environment = env // {
346346
PGPASSFILE = "${baseDir}/pgpass-queue-runner"; # grrr
@@ -364,7 +364,7 @@ in
364364
requires = [ "hydra-init.service" ];
365365
restartTriggers = [ hydraConf ];
366366
after = [ "hydra-init.service" "network.target" ];
367-
path = with pkgs; [ nettools cfg.package jq ];
367+
path = with pkgs; [ hostname-debian cfg.package jq ];
368368
environment = env // {
369369
HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-evaluator";
370370
};

0 commit comments

Comments
 (0)