Run nix fmt
Martin Weinelt committed
Jan 6, 2025 at 03:44 UTC
06973a5de080fa3065a272ed5a4cc8fe05c1f1d1
4 files changed
+30
-15
build/datadog/hydra.nix
+2
-1
@@ -1,6 +1,7 @@
1
{ pkgs, ... }:
2
{
3
- systemd.services.dd-agent.environment.PYTHONPATH = "${pkgs.pythonPackages.requests}/lib/python2.7/site-packages";
3
+ systemd.services.dd-agent.environment.PYTHONPATH =
4
+ "${pkgs.pythonPackages.requests}/lib/python2.7/site-packages";
5
environment.etc =
6
let
7
hydra-config = pkgs.writeText "hydra.yaml" ''
build/hydra.nix
+24
-12
@@ -149,10 +149,13 @@ in
149
# These IPs and SSH public keys are specifically provisioned for Hydra
150
services.openssh.knownHosts = {
151
# x86_64-linux at Hetzner
152
- "elated-minsky.builder.nixos.org".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIvrJpd3aynfPVGGG/s7MtRFz/S6M4dtqvqKI3Da7O7+";
153
- "sleepy-brown.builder.nixos.org".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOh4/3m7o6H3J5QG711aJdlSUVvlC8yW6KoqAES3Fy6I";
152
+ "elated-minsky.builder.nixos.org".publicKey =
153
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIvrJpd3aynfPVGGG/s7MtRFz/S6M4dtqvqKI3Da7O7+";
154
+ "sleepy-brown.builder.nixos.org".publicKey =
155
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOh4/3m7o6H3J5QG711aJdlSUVvlC8yW6KoqAES3Fy6I";
156
# aarch64-linux at Hetzner
155
- "goofy-hopcroft.builder.nixos.org".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICTJEi+nQNd7hzNYN3cLBK/0JCkmwmyC1I+b5nMI7+dd";
157
+ "goofy-hopcroft.builder.nixos.org".publicKey =
158
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICTJEi+nQNd7hzNYN3cLBK/0JCkmwmyC1I+b5nMI7+dd";
159
160
# M1 Macs in North America
161
"*.foundation.detsys.dev" = {
@@ -161,19 +164,28 @@ in
164
};
165
166
# M1 Macs at Hetzner
164
- "intense-heron.mac.nixos.org".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICeSgOe/cr1yVAJOl30t3AZOLtvzeQa5rnrHGceKeBue";
165
- "sweeping-filly.mac.nixos.org".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE6b/coXQEcFZW1eG4zFyCMCF0mZFahqmadz6Gk9DWMF";
166
- "maximum-snail.mac.nixos.org".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEs+fK4hH8UKo+Pa7u1VYltkMufBHHH5uC93RQ2S6Xy9";
167
- "growing-jennet.mac.nixos.org".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAQGthkSSOnhxrIUCMlRQz8FOo5Y5Nk9f9WnVLNeRJpm";
168
- "enormous-catfish.mac.nixos.org".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMlg7NXxeG5L3s0YqSQIsqVG0MTyvyWDHUyYEfFPazLe";
167
+ "intense-heron.mac.nixos.org".publicKey =
168
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICeSgOe/cr1yVAJOl30t3AZOLtvzeQa5rnrHGceKeBue";
169
+ "sweeping-filly.mac.nixos.org".publicKey =
170
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE6b/coXQEcFZW1eG4zFyCMCF0mZFahqmadz6Gk9DWMF";
171
+ "maximum-snail.mac.nixos.org".publicKey =
172
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEs+fK4hH8UKo+Pa7u1VYltkMufBHHH5uC93RQ2S6Xy9";
173
+ "growing-jennet.mac.nixos.org".publicKey =
174
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAQGthkSSOnhxrIUCMlRQz8FOo5Y5Nk9f9WnVLNeRJpm";
175
+ "enormous-catfish.mac.nixos.org".publicKey =
176
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMlg7NXxeG5L3s0YqSQIsqVG0MTyvyWDHUyYEfFPazLe";
177
178
# M2 Macs at Oakhost
171
- "kind-lumiere.mac.nixos.org".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFoqn1AAcOqtG65milpBtWVXP5VcBmTUSMGNfJzPwW8Q";
172
- "eager-heisenberg.mac.nixos.org".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBp9NStfEPu7HdeK8f2KEnynyirjG9BUk+6w2SgJtQyS";
179
+ "kind-lumiere.mac.nixos.org".publicKey =
180
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFoqn1AAcOqtG65milpBtWVXP5VcBmTUSMGNfJzPwW8Q";
181
+ "eager-heisenberg.mac.nixos.org".publicKey =
182
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBp9NStfEPu7HdeK8f2KEnynyirjG9BUk+6w2SgJtQyS";
183
184
# vcunat
175
- "t2a.cunat.cz".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIu3itg4hn5e4KrnyoreAUN3RIbAcvqc7yWx5i6EWqAu";
176
- "t4b.cunat.cz".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC/jE8c0lkc/DlK3R7A+zBr6j/lfEQrhqSD/YOEVs8za";
185
+ "t2a.cunat.cz".publicKey =
186
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIu3itg4hn5e4KrnyoreAUN3RIbAcvqc7yWx5i6EWqAu";
187
+ "t4b.cunat.cz".publicKey =
188
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC/jE8c0lkc/DlK3R7A+zBr6j/lfEQrhqSD/YOEVs8za";
189
};
190
191
}
build/pluto/nginx.nix
+2
-1
@@ -26,7 +26,8 @@
26
add_header Access-Control-Allow-Origin "*" always;
27
'';
28
};
29
- locations."~ ^/grafana/?(?<action>[^\\s]+)".return = "301 https://grafana.nixos.org/$action$is_args$args";
29
+ locations."~ ^/grafana/?(?<action>[^\\s]+)".return =
30
+ "301 https://grafana.nixos.org/$action$is_args$args";
31
};
32
33
virtualHosts."prometheus.nixos.org" = {
modules/rfc39.nix
+2
-1
@@ -20,7 +20,8 @@ in
20
};
21
users.groups.rfc39 = { };
22
23
- programs.ssh.knownHosts."github.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl";
23
+ programs.ssh.knownHosts."github.com".publicKey =
24
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl";
25
26
systemd.services.rfc39-sync = {
27
description = "Sync the Maintainer Team ";