marukuru/deployer: add jq somewhere more sensible

This commit is contained in:
Luke Granger-Brown 2021-03-20 12:17:41 +00:00
parent d8086e7042
commit 7737f962a9

View file

@ -166,9 +166,6 @@ in {
../lib/low-space.nix ../lib/low-space.nix
]; ];
networking.hosts = depot.ops.nixos.tailscaleIPs; networking.hosts = depot.ops.nixos.tailscaleIPs;
environment.systemPackages = with pkgs; [
jq
];
nix = { nix = {
binaryCaches = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ]; binaryCaches = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ];
trustedBinaryCaches = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ]; trustedBinaryCaches = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ];
@ -215,7 +212,7 @@ in {
chmod -R u=rwX,go= /srv/gitlab-runner/.ssh chmod -R u=rwX,go= /srv/gitlab-runner/.ssh
''; '';
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vim rxvt_unicode.terminfo rsync vim rxvt_unicode.terminfo rsync jq
depot.nix.pkgs.heptapod-runner-mercurial depot.nix.pkgs.heptapod-runner-mercurial
]; ];
}; };