treewide: address all warnings
Martin Weinelt committed
Nov 26, 2025 at 19:24 UTC
66bd6013619ad2bcf53b10c8a1f0e8e32ff06e4a
10 files changed
+19
-22
build/diffoscope.nix
+1
-1
@@ -11,7 +11,7 @@ let
11
echo ""
12
echo "non-determinism detected in $2; diff with previous round follows:"
13
echo ""
14
- time ${pkgs.utillinux}/bin/runuser -u diffoscope -- ${pkgs.diffoscope}/bin/diffoscope "$1" "$2"
14
+ time ${pkgs.util-linux}/bin/runuser -u diffoscope -- ${pkgs.diffoscope}/bin/diffoscope "$1" "$2"
15
exit 0
16
'';
17
build/mimas/firewall.nix
+1
-1
@@ -51,7 +51,7 @@ in
51
Group = "nft-asblock";
52
ExecStart = toString (
53
[
54
- (lib.getExe inputs.nft-prefix-import.packages.${pkgs.hostPlatform.system}.default)
54
+ (lib.getExe inputs.nft-prefix-import.packages.${pkgs.stdenv.hostPlatform.system}.default)
55
"--table"
56
"abuse"
57
"--ipv4set"
modules/hydra-mirror.nix
+1
-1
@@ -17,7 +17,7 @@ let
17
description = "Update Channel ${channelName}";
18
path = with pkgs; [
19
git
20
- inputs.nixos-channel-scripts.packages.${pkgs.hostPlatform.system}.default
20
+ inputs.nixos-channel-scripts.packages.${pkgs.stdenv.hostPlatform.system}.default
21
];
22
script = ''
23
# Hardcoded in channel scripts.
non-critical-infra/modules/hydra-queue-builder-v2.nix
+1
-1
@@ -136,7 +136,7 @@ in
136
package = lib.mkOption {
137
type = lib.types.package;
138
default =
139
- (pkgs.recurseIntoAttrs (
139
+ (lib.recurseIntoAttrs (
140
pkgs.callPackage ../packages/hydra-queue-runner {
141
inherit (unstable) nixVersions openssl;
142
}
non-critical-infra/modules/hydra-queue-runner-v2.nix
+2
-2
@@ -188,7 +188,7 @@ in
188
package = lib.mkOption {
189
type = lib.types.package;
190
default =
191
- (pkgs.recurseIntoAttrs (
191
+ (lib.recurseIntoAttrs (
192
pkgs.callPackage ../packages/hydra-queue-runner {
193
inherit (unstable) nixVersions openssl;
194
}
@@ -254,7 +254,7 @@ in
254
StateDirectoryMode = "0700";
255
ReadWritePaths = [
256
"/nix/var/nix/gcroots/"
257
- "/run/postgresql/.s.PGSQL.${toString config.services.postgresql.port}"
257
+ "/run/postgresql/.s.PGSQL.${toString config.services.postgresql.settings.port}"
258
"/nix/var/nix/daemon-socket/socket"
259
"/var/lib/hydra/build-logs/"
260
];
non-critical-infra/modules/mailserver/default.nix
+1
-1
@@ -69,7 +69,7 @@
69
path = "${config.mailserver.dkimKeyDirectory}/nixcon.org.mail.key";
70
};
71
72
- services.postfix.config.bounce_template_file = "${pkgs.writeText "bounce-template.cf" ''
72
+ services.postfix.settings.main.bounce_template_file = "${pkgs.writeText "bounce-template.cf" ''
73
failure_template = <<EOF
74
Charset: us-ascii
75
From: MAILER-DAEMON (Mail Delivery System)
non-critical-infra/modules/mailserver/mailing-lists-options.nix
+1
-1
@@ -138,6 +138,6 @@ in
138
services.postfix.mapFiles.virtual-mailing-lists =
139
config.sops.templates."postfix-virtual-mailing-lists".path;
140
141
- services.postfix.config.virtual_alias_maps = [ "hash:/etc/postfix/virtual-mailing-lists" ];
141
+ services.postfix.settings.main.virtual_alias_maps = [ "hash:/etc/postfix/virtual-mailing-lists" ];
142
};
143
}
non-critical-infra/modules/postfix.nix
+3
-3
@@ -24,9 +24,9 @@
24
25
services.postfix = {
26
enable = true;
27
- hostname = config.networking.fqdn;
28
- domain = config.networking.fqdn;
29
- config = {
27
+ settings.main = {
28
+ myhostname = config.networking.fqdn;
29
+ mydomain = config.networking.fqdn;
30
smtp_tls_note_starttls_offer = "yes";
31
smtp_tls_security_level = "may";
32
tls_medium_cipherlist = "AES128+EECDH:AES128+EDH";
non-critical-infra/packages/hydra-queue-runner/default.nix
-3
@@ -21,7 +21,6 @@ let
21
rev = "81e6209e9107a62e9fba3d29f2ead8e9cf35bea1";
22
hash = "sha256-MGoC9bLa9Ih66UbHkxGuAGvj/GfPZzG9N6liiHX0Sos=";
23
};
24
- useFetchCargoVendor = true;
24
cargoHash = "sha256-eFfrwLUnI35WhzO+enr2dTe5blwY00cGQoT5mfs9ZTw=";
25
nativeBuildInputs = [
26
pkg-config
@@ -54,7 +53,6 @@ in
53
strictDeps = true;
54
55
inherit
57
- useFetchCargoVendor
56
cargoHash
57
nativeBuildInputs
58
buildInputs
@@ -81,7 +79,6 @@ in
79
strictDeps = true;
80
81
inherit
84
- useFetchCargoVendor
82
cargoHash
83
nativeBuildInputs
84
buildInputs
terraform/flake-module.nix
+8
-8
@@ -22,10 +22,10 @@ in
22
(pkgs.opentofu.withPlugins (
23
p:
24
builtins.map convert2Tofu [
25
- p.aws
26
- p.fastly
27
- p.netlify
28
- p.secret
25
+ p.hashicorp_aws
26
+ p.fastly_fastly
27
+ p.aegirhealth_netlify
28
+ p.numtide_secret
29
]
30
))
31
];
@@ -38,10 +38,10 @@ in
38
(pkgs.opentofu.withPlugins (
39
p:
40
builtins.map convert2Tofu [
41
- p.aws
42
- p.fastly
43
- p.netlify
44
- p.secret
41
+ p.hashicorp_aws
42
+ p.fastly_fastly
43
+ p.aegirhealth_netlify
44
+ p.numtide_secret
45
]
46
))
47
];