From 48052ca0dd1939beed30dc8c65f541cfa05704fa Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 26 Feb 2021 21:37:33 +0100
Subject: [PATCH] nixos/ksm: remove udev-settle dependency

The sysfs file /sys/kernel/mm/ksm/run seems to be available as soon as
the kernel has started, so no point in waiting for udev to "settle". If
for some reason it doesn't, we let the unit fail explicitly.
---
 nixos/modules/hardware/ksm.nix | 12 ++++++------
 nixos/tests/ksm.nix            |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/hardware/ksm.nix b/nixos/modules/hardware/ksm.nix
index 0938dbdc1101..829c3532c459 100644
--- a/nixos/modules/hardware/ksm.nix
+++ b/nixos/modules/hardware/ksm.nix
@@ -26,13 +26,13 @@ in {
     systemd.services.enable-ksm = {
       description = "Enable Kernel Same-Page Merging";
       wantedBy = [ "multi-user.target" ];
-      after = [ "systemd-udev-settle.service" ];
-      script = ''
-        if [ -e /sys/kernel/mm/ksm ]; then
+      script =
+        ''
           echo 1 > /sys/kernel/mm/ksm/run
-          ${optionalString (cfg.sleep != null) ''echo ${toString cfg.sleep} > /sys/kernel/mm/ksm/sleep_millisecs''}
-        fi
-      '';
+        '' + optionalString (cfg.sleep != null)
+        ''
+          echo ${toString cfg.sleep} > /sys/kernel/mm/ksm/sleep_millisecs
+        '';
     };
   };
 }
diff --git a/nixos/tests/ksm.nix b/nixos/tests/ksm.nix
index 8feccbe6df5a..8f84b32020ab 100644
--- a/nixos/tests/ksm.nix
+++ b/nixos/tests/ksm.nix
@@ -1,8 +1,8 @@
-import ./make-test-python.nix ({ pkgs, ...} :
+import ./make-test-python.nix ({ lib, ...} :
 
 {
   name = "ksm";
-  meta = with pkgs.lib.maintainers; {
+  meta = with lib.maintainers; {
     maintainers = [ rnhmjoj ];
   };