From 75918debfd7245d90478f882b0323a705ab3c7be Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Mon, 24 Jun 2024 11:10:21 +0300
Subject: 2024-06-24

---
 modules/common/nix.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'modules/common')

diff --git a/modules/common/nix.nix b/modules/common/nix.nix
index 6c5bd18..3342113 100644
--- a/modules/common/nix.nix
+++ b/modules/common/nix.nix
@@ -126,11 +126,16 @@ in
 
         overlays = with inputs; [
           self.overlays.default
-          (_: _: {
+          (_: prev: {
             # Global PR package overrides go here. Example:
             # ```
             # inherit (pkgsPr 309018 "sha256-x3ATxjrTVdaX5eo9P6pz+8/W6D2TNYzvjZpOBa3ZRI8=") endlessh-go;
             # ```
+
+            spf-engine = prev.spf-engine.override {
+              # FIXME https://nixpk.gs/pr-tracker.html?pr=321940
+              inherit (pkgsMaster.python311.pkgs) pymilter;
+            };
           })
         ];
       };
@@ -141,7 +146,6 @@ in
         systemPackages =
           with pkgs;
           optionals this.isHeadful [
-            nix-top
             nix-tree
             nixfiles
           ];
@@ -151,9 +155,6 @@ in
         };
       };
 
-      system = {
-        # HACK This lets `nix flake check` to pass.
-        stateVersion = if hasAttr "stateVersion" this then this.stateVersion else trivial.release;
-      };
+      system.stateVersion = this.stateVersion or trivial.release;
     };
 }
-- 
cgit v1.2.3