diff options
Diffstat (limited to 'ops/modules')
-rw-r--r-- | ops/modules/clbot.nix | 4 | ||||
-rw-r--r-- | ops/modules/monorepo-gerrit.nix | 2 | ||||
-rw-r--r-- | ops/modules/oauth2_proxy.nix | 2 | ||||
-rw-r--r-- | ops/modules/tvl-buildkite.nix | 2 | ||||
-rw-r--r-- | ops/modules/tvl-users.nix | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/ops/modules/clbot.nix b/ops/modules/clbot.nix index 84575ed07203..bdddff6c810b 100644 --- a/ops/modules/clbot.nix +++ b/ops/modules/clbot.nix @@ -3,7 +3,7 @@ let inherit (builtins) attrValues concatStringsSep mapAttrs readFile; - inherit (pkgs) runCommandNoCC; + inherit (pkgs) runCommand; inherit (lib) listToAttrs @@ -21,7 +21,7 @@ let (attrValues (mapAttrs (key: value: "-${key} \"${toString value}\"") flags)); # Escapes a unit name for use in systemd - systemdEscape = name: removeSuffix "\n" (readFile (runCommandNoCC "unit-name" { } '' + systemdEscape = name: removeSuffix "\n" (readFile (runCommand "unit-name" { } '' ${pkgs.systemd}/bin/systemd-escape '${name}' >> $out '')); diff --git a/ops/modules/monorepo-gerrit.nix b/ops/modules/monorepo-gerrit.nix index d41e02764cc9..059dee57940b 100644 --- a/ops/modules/monorepo-gerrit.nix +++ b/ops/modules/monorepo-gerrit.nix @@ -9,7 +9,7 @@ let exec -a ${name} ${depot.ops.besadii}/bin/besadii "$@" ''; - gerritHooks = pkgs.runCommandNoCC "gerrit-hooks" { } '' + gerritHooks = pkgs.runCommand "gerrit-hooks" { } '' mkdir -p $out ln -s ${besadiiWithConfig "change-merged"} $out/change-merged ln -s ${besadiiWithConfig "patchset-created"} $out/patchset-created diff --git a/ops/modules/oauth2_proxy.nix b/ops/modules/oauth2_proxy.nix index 23afa7bce084..53dec452ec83 100644 --- a/ops/modules/oauth2_proxy.nix +++ b/ops/modules/oauth2_proxy.nix @@ -53,7 +53,7 @@ in RestartSec = "5s"; DynamicUser = true; EnvironmentFile = cfg.secretsFile; - ExecStart = "${pkgs.oauth2_proxy}/bin/oauth2-proxy --config ${configFile}"; + ExecStart = "${pkgs.oauth2-proxy}/bin/oauth2-proxy --config ${configFile}"; }; }; }; diff --git a/ops/modules/tvl-buildkite.nix b/ops/modules/tvl-buildkite.nix index 4341ef01d744..87879565542d 100644 --- a/ops/modules/tvl-buildkite.nix +++ b/ops/modules/tvl-buildkite.nix @@ -13,7 +13,7 @@ let # All Buildkite hooks are actually besadii, but it's being invoked # with different names. - buildkiteHooks = pkgs.runCommandNoCC "buildkite-hooks" { } '' + buildkiteHooks = pkgs.runCommand "buildkite-hooks" { } '' mkdir -p $out/bin ln -s ${besadiiWithConfig "post-command"} $out/bin/post-command ''; diff --git a/ops/modules/tvl-users.nix b/ops/modules/tvl-users.nix index 988b9eed8af6..c01809e0e643 100644 --- a/ops/modules/tvl-users.nix +++ b/ops/modules/tvl-users.nix @@ -86,7 +86,7 @@ environment.systemPackages = with pkgs; [ alacritty.terminfo foot.terminfo - rxvt_unicode.terminfo + rxvt-unicode-unwrapped.terminfo # TODO(sterni): re-enable when the kitty build is fixed upstreams # kitty.terminfo |