treewide: apply deadnix
Jörg Thalheim committed
Aug 17, 2024 at 09:48 UTC
494bcbbde5261fabb37c4d8888ede631a9385fc3
23 files changed
+27
-30
build/datadog/hydra.nix
+1
-1
@@ -1,4 +1,4 @@
1
-{config, pkgs, ...}:
1
+{ pkgs, ...}:
2
{
3
systemd.services.dd-agent.environment.PYTHONPATH = "${pkgs.pythonPackages.requests}/lib/python2.7/site-packages";
4
environment.etc =
build/diffoscope.nix
+1
-1
@@ -1,4 +1,4 @@
1
-{ config, pkgs, ... }:
1
+{ pkgs, ... }:
2
3
with pkgs.lib;
4
build/flake.nix
+1
-1
@@ -26,7 +26,7 @@
26
inputs.rfc39.url = "github:NixOS/rfc39";
27
inputs.rfc39.inputs.nixpkgs.follows = "nixpkgs";
28
29
- outputs = flakes @ { self, agenix, colmena, disko, hydra, hydra-scale-equinix-metal, nix, nixpkgs, nixos-channel-scripts, nix-netboot-serve, rfc39 }:
29
+ outputs = { self, agenix, colmena, disko, hydra, hydra-scale-equinix-metal, nix, nixpkgs, nixos-channel-scripts, nix-netboot-serve, rfc39 }:
30
let
31
inherit (nixpkgs) lib;
32
build/hydra-proxy.nix
+1
-1
@@ -1,4 +1,4 @@
1
-{ config, lib, pkgs, ...}:
1
+{ config, ...}:
2
3
{
4
services.nginx = {
build/hydra-scaler.nix
+1
-1
@@ -1,4 +1,4 @@
1
-{ config, pkgs, lib, ... }:
1
+{ config, ... }:
2
3
{
4
services.hydra-scale-equinix-metal = {
build/hydra.nix
+1
-1
@@ -62,7 +62,7 @@ in
62
'';
63
64
# Work around https://github.com/NixOS/hydra/issues/1337
65
- services.hydra-dev.package = pkgs.hydra.overrideAttrs(final: prev: {
65
+ services.hydra-dev.package = pkgs.hydra.overrideAttrs(_final: prev: {
66
postPatch = ''
67
${prev.postPatch or ""}
68
rm src/lib/Hydra/Plugin/DeclarativeJobsets.pm
build/packet-importer.nix
+1
-1
@@ -1,4 +1,4 @@
1
-{ config, lib, pkgs, ... }:
1
+{ pkgs, ... }:
2
let
3
importer = pkgs.callPackage ../hydra-packet-importer { };
4
in
build/pluto/prometheus/default.nix
+1
-2
@@ -1,5 +1,4 @@
1
-{ config
2
-, ...
1
+{ ...
2
}:
3
4
{
build/rhea/configuration.nix
+1
-1
@@ -1,4 +1,4 @@
1
-{ nodes, config, lib, pkgs, ... }:
1
+{ pkgs, ... }:
2
{
3
imports =
4
[ ./hardware-configuration.nix
build/rhea/hardware-configuration.nix
+1
-1
@@ -1,4 +1,4 @@
1
-{ config, lib, pkgs, modulesPath, ... }:
1
+{ config, lib, modulesPath, ... }:
2
3
{
4
imports =
channels.nix
+1
-1
@@ -88,5 +88,5 @@ rec {
88
};
89
};
90
91
- channels-with-urls = builtins.mapAttrs (name: about: about.job) channels;
91
+ channels-with-urls = builtins.mapAttrs (_name: about: about.job) channels;
92
}
macs/flake.nix
+2
-3
@@ -7,10 +7,9 @@
7
};
8
9
outputs =
10
- { nixpkgs
11
- , darwin
10
+ { darwin
11
, ...
13
- }@inputs:
12
+ }:
13
{
14
darwinConfigurations =
15
let
metrics/fastly/flake.nix
+2
-2
@@ -1,6 +1,6 @@
1
{
2
- outputs = { self, nixpkgs }: {
3
- nixosModules.nix-metrics = { config, pkgs, ... }: {
2
+ outputs = { nixpkgs }: {
3
+ nixosModules.nix-metrics = { pkgs, ... }: {
4
5
users.users.nix-metrics =
6
{ isNormalUser = true;
modules/common.nix
+1
-1
@@ -1,4 +1,4 @@
1
-{ config, pkgs, lib, ... }:
1
+{ pkgs, lib, ... }:
2
3
with lib;
4
modules/wireguard.nix
+1
-1
@@ -17,7 +17,7 @@ in lib.mkMerge [
17
generatePrivateKeyFile = true;
18
listenPort = hosts."${config.networking.hostName}".port or null;
19
20
- peers = lib.mapAttrsToList (hostname: hostcfg:
20
+ peers = lib.mapAttrsToList (_hostname: hostcfg:
21
{
22
inherit (hostcfg) publicKey;
23
allowedIPs = [ "${hostcfg.ip}/32" ];
non-critical-infra/flake.nix
+3
-3
@@ -37,15 +37,15 @@
37
};
38
};
39
40
- outputs = { self, nixpkgs, flake-utils, colmena, disko, srvos, first-time-contribution-tagger, sops-nix, ... }@inputs:
40
+ outputs = { self, nixpkgs, flake-utils, colmena, disko, first-time-contribution-tagger, sops-nix, ... }@inputs:
41
let
42
- importConfig = path: (lib.mapAttrs (name: value: import (path + "/${name}/default.nix")) (lib.filterAttrs (_: v: v == "directory") (builtins.readDir path)));
42
+ importConfig = path: (lib.mapAttrs (name: _value: import (path + "/${name}/default.nix")) (lib.filterAttrs (_: v: v == "directory") (builtins.readDir path)));
43
inherit (nixpkgs) lib;
44
in
45
{
46
47
nixosConfigurations = builtins.mapAttrs
48
- (name: value: nixpkgs.lib.nixosSystem {
48
+ (_name: value: nixpkgs.lib.nixosSystem {
49
inherit lib;
50
system = "x86_64-linux";
51
specialArgs = {
non-critical-infra/hosts/caliban.nixos.org/default.nix
+1
-1
@@ -1,4 +1,4 @@
1
-{ config, pkgs, lib, inputs, ... }:
1
+{ config, inputs, ... }:
2
3
{
4
imports =
non-critical-infra/hosts/caliban.nixos.org/limesurvey-tmp.nix
+1
-1
@@ -1,6 +1,6 @@
1
# the content of this file should be put in the modules folder once the actual module has been upstreamed
2
# PR: https://github.com/NixOS/nixpkgs/pull/325665/
3
-{ config, pkgs, ... }:
3
+{ config, ... }:
4
{
5
disabledModules = [ "services/web-apps/limesurvey.nix" ];
6
non-critical-infra/modules/element-web.nix
+1
-1
@@ -58,7 +58,7 @@ in
58
enableACME = true;
59
forceSSL = true;
60
61
- root = pkgs.element-web.override (old: {
61
+ root = pkgs.element-web.override (_old: {
62
conf = elementWebConfig;
63
});
64
};
non-critical-infra/modules/limesurvey.nix
+1
-2
@@ -6,7 +6,6 @@ let
6
inherit (lib) literalExpression mapAttrs optional optionalString types recursiveUpdate;
7
8
cfg = config.services.limesurvey;
9
- fpm = config.services.phpfpm.pools.limesurvey;
9
10
user = "limesurvey";
11
group = config.services.nginx.group;
@@ -240,7 +239,7 @@ in
239
}
240
];
241
243
- services.limesurvey.config = mapAttrs (name: mkDefault) {
242
+ services.limesurvey.config = mapAttrs (_name: mkDefault) {
243
runtimePath = "${stateDir}/tmp/runtime";
244
components = {
245
db = {
non-critical-infra/modules/vaultwarden.nix
+1
-1
@@ -1,4 +1,4 @@
1
-{ config, pkgs, ... }:
1
+{ config, ... }:
2
{
3
imports = [
4
./backup.nix
terraform-iam/flake.nix
+1
-1
@@ -1,7 +1,7 @@
1
{
2
inputs.nixpkgs.url = "nixpkgs/master";
3
4
- outputs = flakes @ { self, nixpkgs }: {
4
+ outputs = { nixpkgs }: {
5
6
devShell.x86_64-linux =
7
with import nixpkgs { system = "x86_64-linux"; };
terraform/flake.nix
+1
-1
@@ -1,7 +1,7 @@
1
{
2
inputs.nixpkgs.url = "nixpkgs/master";
3
4
- outputs = flakes @ { self, nixpkgs }: {
4
+ outputs = { nixpkgs }: {
5
6
devShell.x86_64-linux =
7
with import nixpkgs { system = "x86_64-linux"; };