From 86ad92070cbfb29b872044d85bb149940ac098de Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 27 Oct 2024 14:34:19 +0100
Subject: [PATCH 1/4] dmarc-report-converter: format with nixfmt

---
 pkgs/by-name/dm/dmarc-report-converter/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix
index 0c9265415f15..75d712cc4e1c 100644
--- a/pkgs/by-name/dm/dmarc-report-converter/package.nix
+++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix
@@ -1,8 +1,9 @@
-{ lib
-, buildGoModule
-, dmarc-report-converter
-, fetchFromGitHub
-, runCommand
+{
+  lib,
+  buildGoModule,
+  dmarc-report-converter,
+  fetchFromGitHub,
+  runCommand,
 }:
 
 buildGoModule rec {

From eafc83d37d117ff09f44d3da7ebeee8e703f3858 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 27 Oct 2024 14:35:05 +0100
Subject: [PATCH 2/4] dmarc-report-converter: remove with statements

---
 pkgs/by-name/dm/dmarc-report-converter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix
index 75d712cc4e1c..59a7ca8aab01 100644
--- a/pkgs/by-name/dm/dmarc-report-converter/package.nix
+++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix
@@ -31,11 +31,11 @@ buildGoModule rec {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "Convert DMARC report files from xml to human-readable formats";
     homepage = "https://github.com/tierpod/dmarc-report-converter";
-    license = licenses.mit;
-    maintainers = with maintainers; [ Nebucatnetzer ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.Nebucatnetzer ];
     mainProgram = "dmarc-report-converter";
   };
 }

From 4449484156e85fbfee84566dde5a780a0d3e34d2 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 27 Oct 2024 14:35:39 +0100
Subject: [PATCH 3/4] dmarc-report-converter: replace custom test with
 testers.testVersion

---
 pkgs/by-name/dm/dmarc-report-converter/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix
index 59a7ca8aab01..8f5b3eb44270 100644
--- a/pkgs/by-name/dm/dmarc-report-converter/package.nix
+++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix
@@ -3,7 +3,7 @@
   buildGoModule,
   dmarc-report-converter,
   fetchFromGitHub,
-  runCommand,
+  testers,
 }:
 
 buildGoModule rec {
@@ -25,11 +25,7 @@ buildGoModule rec {
     "-X main.version=${version}"
   ];
 
-  passthru.tests = {
-    simple = runCommand "dmarc-report-converter-test" { } ''
-      ${dmarc-report-converter}/bin/dmarc-report-converter -h > $out
-    '';
-  };
+  passthru.tests.version = testers.testVersion { package = dmarc-report-converter; };
 
   meta = {
     description = "Convert DMARC report files from xml to human-readable formats";

From eeed5c04c92b27d6b0ad547df7e420a2cee5fffe Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Sun, 27 Oct 2024 14:46:25 +0100
Subject: [PATCH 4/4] dmarc-report-converter: add checkFlags to run the
 unittests

---
 pkgs/by-name/dm/dmarc-report-converter/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix
index 8f5b3eb44270..507fbe4a4300 100644
--- a/pkgs/by-name/dm/dmarc-report-converter/package.nix
+++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix
@@ -19,6 +19,8 @@ buildGoModule rec {
 
   vendorHash = null;
 
+  checkFlags = [ "-mod=vendor ./cmd/... ./pkg/..." ];
+
   ldflags = [
     "-s"
     "-w"