From 96369fa24dbaa6c37d6c26b61a149002d2642e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 13 Jun 2022 12:46:07 +0200
Subject: [PATCH 1/2] drop deprecated arguments to `evalModules

---
 default.nix | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/default.nix b/default.nix
index d5e1e2d..c56682d 100644
--- a/default.nix
+++ b/default.nix
@@ -10,27 +10,26 @@ let
     };
   };
   baseModules = [
-      ./base.nix
-      ./system-path.nix
-      ./stage-1.nix
-      ./stage-2.nix
-      ./runit.nix
-      (nixpkgs + "/nixos/modules/system/etc/etc.nix")
-      (nixpkgs + "/nixos/modules/system/activation/activation-script.nix")
-      (nixpkgs + "/nixos/modules/misc/nixpkgs.nix")
-      (nixpkgs + "/nixos/modules/system/boot/kernel.nix")
-      (nixpkgs + "/nixos/modules/misc/assertions.nix")
-      (nixpkgs + "/nixos/modules/misc/lib.nix")
-      (nixpkgs + "/nixos/modules/config/sysctl.nix")
-      ./ipxe.nix
-      ./systemd-compat.nix
-      pkgsModule
+    ./base.nix
+    ./system-path.nix
+    ./stage-1.nix
+    ./stage-2.nix
+    ./runit.nix
+    (nixpkgs + "/nixos/modules/system/etc/etc.nix")
+    (nixpkgs + "/nixos/modules/system/activation/activation-script.nix")
+    (nixpkgs + "/nixos/modules/misc/nixpkgs.nix")
+    (nixpkgs + "/nixos/modules/system/boot/kernel.nix")
+    (nixpkgs + "/nixos/modules/misc/assertions.nix")
+    (nixpkgs + "/nixos/modules/misc/lib.nix")
+    (nixpkgs + "/nixos/modules/config/sysctl.nix")
+    ./ipxe.nix
+    ./systemd-compat.nix
+    pkgsModule
+    { _module.check = true; }
   ];
   evalConfig = modules: pkgs.lib.evalModules {
     prefix = [];
-    check = true;
     modules = modules ++ baseModules ++ [ pkgsModule ] ++ extraModules;
-    args = {};
   };
 in
 rec {

From 9dbd509335bc8f5bdc4bd4cc31925b9152a2680a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 13 Jun 2022 12:57:25 +0200
Subject: [PATCH 2/2] fix building utillinux without systemd

---
 base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base.nix b/base.nix
index f777cc8..9f5cdf4 100644
--- a/base.nix
+++ b/base.nix
@@ -44,7 +44,7 @@ with lib;
     environment.systemPackages = lib.optional config.not-os.nix pkgs.nix;
     nixpkgs.config = {
       packageOverrides = self: {
-        utillinux = self.utillinux.override { systemd = null; };
+        utillinux = self.utillinux.override { systemdSupport = false; };
         dhcpcd = self.dhcpcd.override { udev = null; };
         linux_rpixxx = self.linux_rpi.override {
           extraConfig = ''