Merge pull request #788 from NixOS/renovate/lock-file-maintenance

Lock file maintenance

Author: mweinelt

build/colmena.nix

@@ -54,19 +54,18 @@
     };
   };
   config.flake.colmenaHive = inputs.colmena.lib.makeHive self.outputs.colmena;
-  config.flake.colmena =
-    {
-      meta = {
-        nixpkgs = inputs.nixpkgs.legacyPackages.${config.colmena.system};
-        # https://github.com/zhaofengli/colmena/issues/60#issuecomment-1510496861
-        nodeSpecialArgs = builtins.mapAttrs (_: value: value._module.specialArgs) self.nixosConfigurations;
-      };
-    }
-    // builtins.mapAttrs (name: _: {
-      imports = (self.nixosConfigurations.${name})._module.args.modules ++ [
-        {
-          deployment = config.colmena.hosts.${name};
-        }
-      ];
-    }) config.colmena.hosts;
+  config.flake.colmena = {
+    meta = {
+      nixpkgs = inputs.nixpkgs.legacyPackages.${config.colmena.system};
+      # https://github.com/zhaofengli/colmena/issues/60#issuecomment-1510496861
+      nodeSpecialArgs = builtins.mapAttrs (_: value: value._module.specialArgs) self.nixosConfigurations;
+    };
+  }
+  // builtins.mapAttrs (name: _: {
+    imports = (self.nixosConfigurations.${name})._module.args.modules ++ [
+      {
+        deployment = config.colmena.hosts.${name};
+      }
+    ];
+  }) config.colmena.hosts;
 }

build/pluto/prometheus/exporters/channel.nix

@@ -24,27 +24,26 @@ in
     };
   };
 
-  services.prometheus.scrapeConfigs =
-    [
+  services.prometheus.scrapeConfigs = [
+    {
+      job_name = "channel-updates";
+      metrics_path = "/";
+      static_configs = [ { targets = [ "127.0.0.1:9402" ]; } ];
+    }
+  ]
+  ++ lib.mapAttrsToList (name: value: {
+    job_name = "channel-job-${name}";
+    scheme = "https";
+    scrape_interval = "5m";
+    metrics_path = "/job/${value.job}/prometheus";
+    static_configs = [
       {
-        job_name = "channel-updates";
-        metrics_path = "/";
-        static_configs = [ { targets = [ "127.0.0.1:9402" ]; } ];
+        labels = {
+          current = if value.status != "unmaintained" then "1" else "0";
+          channel = name;
+        };
+        targets = [ "hydra.nixos.org:443" ];
       }
-    ]
-    ++ lib.mapAttrsToList (name: value: {
-      job_name = "channel-job-${name}";
-      scheme = "https";
-      scrape_interval = "5m";
-      metrics_path = "/job/${value.job}/prometheus";
-      static_configs = [
-        {
-          labels = {
-            current = if value.status != "unmaintained" then "1" else "0";
-            channel = name;
-          };
-          targets = [ "hydra.nixos.org:443" ];
-        }
-      ];
-    }) (import ../../../../channels.nix).channels;
+    ];
+  }) (import ../../../../channels.nix).channels;
 }

flake.lock

@@ -342,7 +342,8 @@ in
       settings = {
         "listen.owner" = config.services.nginx.user;
         "listen.group" = config.services.nginx.group;
-      } // cfg.poolConfig;
+      }
+      // cfg.poolConfig;
     };
     systemd.services.phpfpm-limesurvey.serviceConfig = {
       ExecStartPre = pkgs.writeShellScript "limesurvey-phpfpm-exec-pre" ''
@@ -433,8 +434,7 @@ in
     };
 
     systemd.services.nginx.after =
-      optional mysqlLocal "mysql.service"
-      ++ optional pgsqlLocal "postgresql.service";
+      optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
 
     users.users.${user} = {
       group = group;