WIP

NixOS · Jun 24, 2024 · d00f070 · d00f070
1 parent 719d387
commit d00f070
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 28 deletions.
diff --git a/build/datadog/hydra.nix b/build/datadog/hydra.nix
@@ -1,4 +1,4 @@
-{config, pkgs, ...}:
+{ pkgs, ...}:
 {
   systemd.services.dd-agent.environment.PYTHONPATH = "${pkgs.pythonPackages.requests}/lib/python2.7/site-packages";
   environment.etc =

diff --git a/build/diffoscope.nix b/build/diffoscope.nix
@@ -1,6 +1,4 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
+{ pkgs, ... }:
 
 let
 

diff --git a/build/flake.nix b/build/flake.nix
@@ -26,10 +26,8 @@
   inputs.rfc39.url = "github:NixOS/rfc39";
   inputs.rfc39.inputs.nixpkgs.follows = "nixpkgs";
 
-  outputs = flakes @ { self, agenix, colmena, disko, hydra, hydra-scale-equinix-metal, nix, nixpkgs, nixos-channel-scripts, nix-netboot-serve, rfc39 }:
+  outputs = { self, agenix, colmena, disko, hydra, hydra-scale-equinix-metal, nix, nixpkgs, nixos-channel-scripts, nix-netboot-serve, rfc39 }:
     let
-      inherit (nixpkgs) lib;
-
       flakesModule = {
         imports = [
           agenix.nixosModules.age
@@ -93,7 +91,7 @@
       devShell.x86_64-linux = let
         pkgs = import nixpkgs { system = "x86_64-linux"; };
       in pkgs.mkShell {
-        buildInputs = with pkgs; [
+        buildInputs = [
           agenix.packages.x86_64-linux.agenix
           colmena.packages.x86_64-linux.colmena
         ];

diff --git a/build/hydra-proxy.nix b/build/hydra-proxy.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ...}:
+{ config, ...}:
 
 {
   services.nginx = {

diff --git a/build/hydra-scaler.nix b/build/hydra-scaler.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, lib, ... }:
-
 {
   services.hydra-scale-equinix-metal = {
     enable = true;
@@ -24,7 +22,7 @@
         # The netboot URL for arm64 big-parallel is: https://netboot.nixos.org/dispatch/hydra/hydra.nixos.org/equinix-metal-builders/main/c3-large-arm--big-parallel ("Always PXE" enabled, "hydra" tag)
         # The netboot URL for arm64 small is: https://netboot.nixos.org/dispatch/hydra/hydra.nixos.org/equinix-metal-builders/main/c3-large-arm ("Always PXE" enabled, "hydra" tag)
 
-        x86_64-linux = rec {
+        x86_64-linux = {
           bigparallel = {
             divisor = 16;
             minimum = 1;

diff --git a/build/hydra.nix b/build/hydra.nix
@@ -62,7 +62,7 @@ in
     '';
 
   # Work around https://github.com/NixOS/hydra/issues/1337
-  services.hydra-dev.package = pkgs.hydra.overrideAttrs(final: prev: {
+  services.hydra-dev.package = pkgs.hydra.overrideAttrs(_: prev: {
     postPatch = ''
       ${prev.postPatch or ""}
       rm src/lib/Hydra/Plugin/DeclarativeJobsets.pm

diff --git a/build/packet-importer.nix b/build/packet-importer.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 let
   importer = pkgs.callPackage ../hydra-packet-importer { };
 in

diff --git a/build/pluto/prometheus/default.nix b/build/pluto/prometheus/default.nix
@@ -1,7 +1,3 @@
-{ config
-, ...
-}:
-
 {
   imports = [
     ./alertmanager.nix

diff --git a/build/rhea/configuration.nix b/build/rhea/configuration.nix
@@ -1,4 +1,4 @@
-{ nodes, config, lib, pkgs, ... }:
+{ pkgs, ... }:
 {
   imports =
     [ ./hardware-configuration.nix
@@ -44,9 +44,6 @@
 
   nix.extraOptions = "gc-keep-outputs = false";
 
-  #services.postfix.enable = true;
-  #services.postfix.hostname = "hydra.nixos.org";
-
   # Don't rate-limit the journal.
   services.journald.rateLimitBurst = 0;
 

diff --git a/build/rhea/hardware-configuration.nix b/build/rhea/hardware-configuration.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =

diff --git a/channels.nix b/channels.nix
@@ -88,5 +88,5 @@ rec {
     };
   };
 
-  channels-with-urls = builtins.mapAttrs (name: about: about.job) channels;
+  channels-with-urls = builtins.mapAttrs (_: about: about.job) channels;
 }
diff --git a/lib/service-order.nix b/lib/service-order.nix
@@ -2,7 +2,6 @@
 #
 # Given a set of services, make them run one at a time in a specific
 # order, on a timer.
-{ lib }:
 {
   # Given a list of systemd service, give each one an After
   # attribute, so they start in a specific order. The returned

diff --git a/survey/flake.nix b/survey/flake.nix
@@ -10,9 +10,9 @@
   #       https://github.com/NixOS/nixpkgs/pull/157832
   inputs.nixpkgs.url = "github:garbas/nixpkgs/update-limesurvey";
 
-  outputs = flakes @ { self, nixpkgs }: 
+  outputs = { self, nixpkgs }:
     let
-      customOverlay = final: prev: {
+      customOverlay = _: prev: {
         limesurvey = prev.limesurvey.overrideAttrs (old: {
           installPhase = old.installPhase + ''
             mkdir -p $out/share/limesurvey/upload/themes/survey/generalfiles/
@@ -27,7 +27,7 @@
         [
           "${nixpkgs}/nixos/modules/virtualisation/amazon-image.nix"
           ../modules/common.nix
-          ({ config, pkgs, lib, ... }:
+          ({ pkgs, lib, ... }:
           {
             ec2.hvm = true;