maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(sterni/machines): adjust deploy script for nq >= 1.0

Browse source 
fq was renamed to nqtail, otherwise nothing changes for us.

Change-Id: I3c40d0d0702e50b3421e320b5adf58a450303693
Reviewed-on: https://cl.tvl.fyi/c/depot/+/13052
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Autosubmit: sterni <sternenseemann@systemli.org>
This commit is contained in:
sterni 2025-01-24 20:54:10 +01:00 • committed by clbot
parent 27f21489ac
commit decc0e4576
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
users/sterni/machines/default.nix
View file

@ -1,7 +1,7 @@
{ depot, lib, pkgs, ... }: { depot, lib, pkgs, ... }:
let let
bins = depot.nix.getBins pkgs.nq [ "fq" "nq" ]; bins = depot.nix.getBins pkgs.nq [ "nqtail" "nq" ];
machines = lib.mapAttrs machines = lib.mapAttrs
(name: _: (name: _:
@ -35,7 +35,7 @@ let
readonly DEPLOY_DRV="${ readonly DEPLOY_DRV="${
builtins.unsafeDiscardOutputDependency ( builtins.unsafeDiscardOutputDependency (
# Wrapper script around localDeployScriptFor that merely starts the # Wrapper script around localDeployScriptFor that merely starts the
# local deploy script using and nq and then waits using fq. This means # local deploy script using and nq and then waits using nqtail. This means
# we can't Ctrl-C the deploy and it won't be terminated by a lost # we can't Ctrl-C the deploy and it won't be terminated by a lost
# connection. # connection.
pkgs.writeShellScript "queue-deploy-${system.name}" '' pkgs.writeShellScript "queue-deploy-${system.name}" ''
@ -45,7 +45,7 @@ let
export NQDIR="$STATE_DIR" export NQDIR="$STATE_DIR"
"${bins.nq}" "${localDeployScriptFor machine}" "${bins.nq}" "${localDeployScriptFor machine}"
"${bins.fq}" "${bins.nqtail}"
'' ''
).drvPath ).drvPath
}" }"