build02, build03: refactor

build02/configuration.nix

@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ./nixpkgs-update.nix
     ../roles/common.nix
     ../roles/hercules-ci
     ../roles/zfs-raid.nix

build02/nixpkgs-update.nix

@@ -1,7 +1,4 @@
-{ nixpkgs-update
+{ pkgs, lib, inputs, config, ... }:
-, nixpkgs-update-github-releases
-}:
-{ pkgs, lib, config, ... }:
 let
   userLib = import ../users/lib.nix { inherit lib; };
 
@@ -18,7 +15,7 @@ let
     cachix
   ];
 
-  nixpkgs-update-github-releases' = "${nixpkgs-update-github-releases}/main.py";
+  nixpkgs-update-github-releases' = "${inputs.nixpkgs-update-github-releases}/main.py";
 
   mkWorker = name: {
     after = [ "network-online.target" ];
@@ -156,7 +153,7 @@ in
     "e /var/cache/nixpkgs-update/worker/nixpkgs-review - - - 1d -"
 
     "d /var/lib/nixpkgs-update/bin/ 700 r-ryantm r-ryantm - -"
-    "L+ ${nixpkgs-update-bin} - - - - ${nixpkgs-update.packages.${pkgs.system}.default}/bin/nixpkgs-update"
+    "L+ ${nixpkgs-update-bin} - - - - ${inputs.nixpkgs-update.packages.${pkgs.system}.default}/bin/nixpkgs-update"
     "L+ /var/lib/nixpkgs-update/worker/github_token.txt - - - - ${config.sops.secrets.github-r-ryantm-token.path}"
     "d /var/lib/nixpkgs-update/worker/cachix/ 700 r-ryantm r-ryantm - -"
     "L+ /var/lib/nixpkgs-update/worker/cachix/cachix.dhall - - - - ${config.sops.secrets.nix-community-cachix.path}"

build03/configuration.nix

@@ -17,6 +17,7 @@
 
     ../services/hound
     ../services/hydra
+    ../services/nur-update
   ];
 
   # /boot is a mirror raid

flake.nix

@@ -91,13 +91,6 @@
               modules =
                 common
                 ++ [
-                  (import ./build02/nixpkgs-update.nix {
-                    inherit
-                      (inputs)
-                      nixpkgs-update
-                      nixpkgs-update-github-releases
-                      ;
-                  })
                   ./build02/configuration.nix
                   inputs.srvos.nixosModules.mixins-nginx
                   inputs.srvos.nixosModules.hardware-hetzner-online-amd
@@ -109,9 +102,6 @@
               modules =
                 common
                 ++ [
-                  (import ./services/nur-update {
-                    inherit (inputs) nur-update;
-                  })
                   ./build03/configuration.nix
                   inputs.srvos.nixosModules.mixins-nginx
                   inputs.srvos.nixosModules.hardware-hetzner-online-amd

services/nur-update/default.nix

@@ -1,4 +1,4 @@
-{ nur-update }: { config, pkgs, ... }:
+{ config, inputs, pkgs, ... }:
 
 {
   services.nginx.virtualHosts."nur-update.nix-community.org" = {
@@ -13,7 +13,7 @@
     let
       python = pkgs.python3.withPackages
         (ps: with ps; [
-          (ps.toPythonModule nur-update.packages.${pkgs.system}.default)
+          (ps.toPythonModule inputs.nur-update.packages.${pkgs.system}.default)
           gunicorn
         ]);
     in