spf-engine: apply review comments

2 files changed, 11 insertions, 5 deletions

diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix
index 46ca3d27c3aaa..0724161bf4236 100644
--- a/pkgs/development/python-modules/pymilter/default.nix
+++ b/pkgs/development/python-modules/pymilter/default.nix
@@ -29,6 +29,8 @@ buildPythonPackage rec {
     rm testpolicy.py
   '';
 
+  pythonImportsCheck = [ "Milter" ];
+
   meta = with lib; {
     homepage = "http://bmsi.com/python/milter.html";
     description = "Python bindings for libmilter api";
diff --git a/pkgs/servers/mail/spf-engine/default.nix b/pkgs/servers/mail/spf-engine/default.nix
index 9237d735971a5..0f2e985825141 100644
--- a/pkgs/servers/mail/spf-engine/default.nix
+++ b/pkgs/servers/mail/spf-engine/default.nix
@@ -2,25 +2,29 @@
 
 buildPythonApplication rec {
   pname = "spf-engine";
-  majorVersion = lib.versions.majorMinor version;
   version = "2.9.3";
 
   src = fetchurl {
-    url = "https://launchpad.net/${pname}/${majorVersion}/${version}/+download/${pname}-${version}.tar.gz";
+    url = "https://launchpad.net/${pname}/${lib.versions.majorMinor version}/${version}/+download/${pname}-${version}.tar.gz";
     sha256 = "sha256-w0Nb+L/Os3KPApENoylxCVaCD4FvgmvpfVvwCkt2IDE=";
   };
 
   propagatedBuildInputs = [ pyspf dnspython authres pymilter ];
 
-  preBuild = ''
+  pythonImportsCheck = [
+    "spf_engine"
+    "spf_engine.milter_spf"
+    "spf_engine.policyd_spf"
+  ];
+
+  postPatch = ''
     substituteInPlace setup.py --replace "'/etc'" "'$out/etc'"
   '';
 
   meta = with lib; {
-    homepage = "https://launchpad.net/${pname}/";
+    homepage = "https://launchpad.net/spf-engine/";
     description = "Postfix policy engine for Sender Policy Framework (SPF) checking";
     maintainers = with maintainers; [ abbradar ];
     license = licenses.asl20;
-    platforms = platforms.all;
   };
 }