Add opendmarc flake

3 files changed, 1 insertions, 62 deletions

diff --git a/pkgs/default.nix b/pkgs/default.nix
index ff21a20..5b347be 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -23,7 +23,7 @@ rec {
   notmuch-python3 = callPackage ./notmuch/notmuch-python { pythonPackages = python3Packages; };
   notmuch-vim = callPackage ./notmuch/notmuch-vim {};
   openarc = (mylibs.flakeCompat ../flakes/openarc).default;
-  opendmarc = callPackage ./opendmarc { libspf2 = callPackage ./opendmarc/libspf2.nix {}; };
+  opendmarc = (mylibs.flakeCompat ../flakes/opendmarc).default;
   pg_activity = callPackage ./pg_activity { inherit mylibs; };
   pgloader = callPackage ./pgloader {};
   predixy = callPackage ./predixy { inherit mylibs; };
diff --git a/pkgs/opendmarc/default.nix b/pkgs/opendmarc/default.nix
deleted file mode 100644
index 1c50248..0000000
--- a/pkgs/opendmarc/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libbsd, openssl, libmilter , perl, makeWrapper, libspf2 }:
-
-stdenv.mkDerivation rec {
-  name = "opendmarc-${version}";
-  version = "1.3.2";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/opendmarc/files/${name}.tar.gz";
-    sha256 = "1yrggj8yq0915y2i34gfz2xpl1w2lgb1vggp67rwspgzm40lng11";
-  };
-
-  configureFlags= [
-    "--with-spf"
-    "--with-spf2-include=${libspf2}/include/spf2"
-    "--with-spf2-lib=${libspf2}/lib/"
-    "--with-milter=${libmilter}"
-  ];
-
-  buildInputs = [ libspf2 libbsd openssl libmilter perl ];
-
-  meta = with stdenv.lib; {
-    description = "Free open source software implementation of the DMARC specification";
-    homepage = http://www.trusteddomain.org/opendmarc/;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/opendmarc/libspf2.nix b/pkgs/opendmarc/libspf2.nix
deleted file mode 100644
index ca02d59..0000000
--- a/pkgs/opendmarc/libspf2.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, file, fetchurl, fetchpatch, libnsl }:
-
-stdenv.mkDerivation rec {
-  name = "libspf2-${version}";
-  version = "1.2.10";
-
-  patches = [
-    (fetchpatch {
-      name = "fix-variadic-macros.patch";
-      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/fix-variadic-macros.patch?h=packages/libspf2";
-      sha256 = "00dqpcgjr9jy2qprgqv2qiyvq8y3wlz4yns9xzabf2064jzqh2ic";
-    })
-  ];
-  preConfigure = ''
-    sed -i -e "s@/usr/bin/file@${file}/bin/file@" ./configure
-    '';
-  configureFlags = [
-    "--enable-static"
-  ];
-  postInstall = ''
-    rm $out/bin/*_static
-    '';
-  src = fetchurl {
-    url = "https://www.libspf2.org/spf/${name}.tar.gz";
-    sha256 = "1j91p0qiipzf89qxq4m1wqhdf01hpn1h5xj4djbs51z23bl3s7nr";
-  };
-
-  buildInputs = [ libnsl ];
-
-  meta = with stdenv.lib; {
-    description = "Sender Policy Framework record checking library";
-    homepage = https://www.libspf2.org/;
-    platforms = platforms.unix;
-  };
-}