From b1c964b55750ca8b86947e26226f05f1203f9e58 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 8 Jul 2025 01:30:49 +0200
Subject: [PATCH 1/2] nixos/tests/chrony: graphene-hardened works without mlock

Fix #423330. Broken by #416715.
---
 nixos/modules/services/networking/ntp/chrony.nix | 7 -------
 nixos/tests/chrony.nix                           | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix
index b0af0a6e6ee7..ea09cef12fb6 100644
--- a/nixos/modules/services/networking/ntp/chrony.nix
+++ b/nixos/modules/services/networking/ntp/chrony.nix
@@ -318,13 +318,6 @@ in
           Alternatively, disable this behaviour by `services.chrony.enableRTCTrimming = false;`
         '';
       }
-      {
-        assertion = !(cfg.enable && config.environment.memoryAllocator.provider == "graphene-hardened");
-        message = ''
-          Chrony doesn't work with the graphene-hardened memory allocator set by
-          `environment.memoryAllocator.provider`.
-        '';
-      }
     ];
   };
 }
diff --git a/nixos/tests/chrony.nix b/nixos/tests/chrony.nix
index 99722d76bbbe..d34836c83cd2 100644
--- a/nixos/tests/chrony.nix
+++ b/nixos/tests/chrony.nix
@@ -8,7 +8,7 @@
     services.chrony.enable = true;
 
     specialisation.hardened.configuration = {
-      services.chrony.enableMemoryLocking = true;
+      environment.memoryAllocator.provider = "graphene-hardened";
     };
   };
 

From 12d25c49bda8ad646304934c0a9029cf4fbb6780 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 8 Jul 2025 01:27:13 +0200
Subject: [PATCH 2/2] chrony: remove myself as maintainer

---
 nixos/tests/chrony.nix             | 3 ---
 pkgs/by-name/ch/chrony/package.nix | 1 -
 2 files changed, 4 deletions(-)

diff --git a/nixos/tests/chrony.nix b/nixos/tests/chrony.nix
index d34836c83cd2..ddb375a40f75 100644
--- a/nixos/tests/chrony.nix
+++ b/nixos/tests/chrony.nix
@@ -1,9 +1,6 @@
-{ lib, ... }:
 {
   name = "chrony";
 
-  meta.maintainers = with lib.maintainers; [ fpletz ];
-
   nodes.machine = {
     services.chrony.enable = true;
 
diff --git a/pkgs/by-name/ch/chrony/package.nix b/pkgs/by-name/ch/chrony/package.nix
index c772779bf757..4b95ca262320 100644
--- a/pkgs/by-name/ch/chrony/package.nix
+++ b/pkgs/by-name/ch/chrony/package.nix
@@ -82,7 +82,6 @@ stdenv.mkDerivation rec {
         illumos
       ];
     maintainers = with lib.maintainers; [
-      fpletz
       thoughtpolice
       vifino
     ];