3 files changed, 49 insertions, 68 deletions

diff --git a/flakes/opendmarc/default.nix b/flakes/opendmarc/default.nix
new file mode 100644
index 0000000..53c1fe2
--- /dev/null
+++ b/flakes/opendmarc/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, libspf2, libbsd, openssl, libmilter, perl, libnsl, fetchurl }:
+stdenv.mkDerivation rec {
+  pname = "opendmarc";
+  version = "1.3.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/opendmarc/files/${pname}-${version}.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 libnsl ];
+
+  meta = {
+    description = "Free open source software implementation of the DMARC specification";
+    homepage = "http://www.trusteddomain.org/opendmarc/";
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/flakes/opendmarc/flake.lock b/flakes/opendmarc/flake.lock
index 9e6a869..0bd645c 100644
--- a/flakes/opendmarc/flake.lock
+++ b/flakes/opendmarc/flake.lock
@@ -33,39 +33,29 @@
     "libspf2": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "dir": "flakes/libspf2",
-        "lastModified": 1609548509,
-        "narHash": "sha256-d9gssVdKV0EaeDU/L5QgQpQwFuxWMbwNQ71i7z4LdDs=",
-        "ref": "master",
-        "rev": "749623765bef80615fc21e73aff89521d262e277",
-        "revCount": 796,
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
+        "narHash": "sha256-q6JJxHV1hyMQlqsqFFTFeUyiH6HsVZJ3GYxXODybPfM=",
+        "path": "../libspf2",
+        "type": "path"
       },
       "original": {
-        "dir": "flakes/libspf2",
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
+        "path": "../libspf2",
+        "type": "path"
       }
     },
     "myuids": {
       "locked": {
-        "dir": "flakes/myuids",
-        "lastModified": 1609548509,
-        "narHash": "sha256-d9gssVdKV0EaeDU/L5QgQpQwFuxWMbwNQ71i7z4LdDs=",
-        "ref": "master",
-        "rev": "749623765bef80615fc21e73aff89521d262e277",
-        "revCount": 796,
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
+        "narHash": "sha256-GUYJUFgSpffirdUSwZ1r/NyAQkBkVxgH6fEaOvtyGiI=",
+        "path": "../myuids",
+        "type": "path"
       },
       "original": {
-        "dir": "flakes/myuids",
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
+        "path": "../myuids",
+        "type": "path"
       }
     },
     "nixpkgs": {
@@ -83,27 +73,12 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1597943282,
-        "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
         "libspf2": "libspf2",
         "myuids": "myuids",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flakes/opendmarc/flake.nix b/flakes/opendmarc/flake.nix
index e80376f..bf7bd5b 100644
--- a/flakes/opendmarc/flake.nix
+++ b/flakes/opendmarc/flake.nix
@@ -10,41 +10,16 @@
     url = "https://git.immae.eu/perso/Immae/Config/Nix.git";
     type = "git";
     dir = "flakes/libspf2";
+    inputs.nixpkgs.follows = "nixpkgs";
   };
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs";
 
   outputs = { self, myuids, libspf2, flake-utils, nixpkgs }: flake-utils.lib.eachSystem ["aarch64-linux" "i686-linux" "x86_64-linux"] (system:
     let
-      libspf2' = libspf2.defaultPackage."${system}";
-      pkgs = import nixpkgs { inherit system; overlays = []; };
-      inherit (pkgs) fetchurl stdenv libbsd perl openssl libmilter file libnsl;
+      pkgs = import nixpkgs { inherit system; overlays = [ libspf2.overlay ]; };
     in rec {
-      packages.opendmarc = stdenv.mkDerivation rec {
-        pname = "opendmarc";
-        version = "1.3.2";
-
-        src = fetchurl {
-          url = "mirror://sourceforge/opendmarc/files/${pname}-${version}.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 libnsl ];
-
-        meta = {
-          description = "Free open source software implementation of the DMARC specification";
-          homepage = "http://www.trusteddomain.org/opendmarc/";
-          platforms = stdenv.lib.platforms.unix;
-        };
-      };
-
+      packages.opendmarc = pkgs.callPackage ./. {};
       defaultPackage = packages.opendmarc;
       legacyPackages.opendmarc = packages.opendmarc;
       apps.opendmarc = flake-utils.lib.mkApp { drv = packages.opendmarc; };
@@ -69,7 +44,13 @@
             '';
           };
         };
-    }) // {
+    }) // rec {
+     overlays = {
+       opendmarc = final: prev: {
+         opendmarc = self.defaultPackage."${final.system}";
+       };
+     };
+     overlay = overlays.opendmarc;
      nixosModule = { config, lib, pkgs, ... }:
        let
          cfg = config.services.opendmarc;