Refactor flakes using follows

3 files changed, 32 insertions, 27 deletions

diff --git a/flakes/openarc/default.nix b/flakes/openarc/default.nix
new file mode 100644
index 0000000..c6d74c6
--- /dev/null
+++ b/flakes/openarc/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, automake, autoconf, libbsd, libtool, openssl, pkg-config, libmilter, file, lib, src }:
+stdenv.mkDerivation rec {
+  pname = "openarc";
+  version = "master-${src.shortRev or "unknown"}";
+  inherit src;
+  buildInputs = [ automake autoconf libbsd libtool openssl pkg-config libmilter ];
+
+  configureFlags = [
+    "--with-milter=${libmilter}"
+  ];
+  preConfigure = ''
+  autoreconf --force --install
+  sed -i -e "s@/usr/bin/file@${file}/bin/file@" ./configure
+  '';
+  meta = {
+    description = "Open source ARC implementation";
+    homepage = "https://github.com/trusteddomainproject/OpenARC";
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/flakes/openarc/flake.lock b/flakes/openarc/flake.lock
index 78c0fba..e0b78a8 100644
--- a/flakes/openarc/flake.lock
+++ b/flakes/openarc/flake.lock
@@ -18,11 +18,11 @@
     "myuids": {
       "locked": {
         "dir": "flakes/myuids",
-        "lastModified": 1609281959,
-        "narHash": "sha256-SYNlHeobQAzTzK0pM5AqMn7M2WbTuzBeoD+Q3Mu+sho=",
+        "lastModified": 1628207001,
+        "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=",
         "ref": "master",
-        "rev": "1be9e64bb4556676f65e6e5044e04426848849c0",
-        "revCount": 791,
+        "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3",
+        "revCount": 865,
         "type": "git",
         "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
       },
diff --git a/flakes/openarc/flake.nix b/flakes/openarc/flake.nix
index fbb7fb1..f47afcf 100644
--- a/flakes/openarc/flake.nix
+++ b/flakes/openarc/flake.nix
@@ -15,30 +15,9 @@
 
   outputs = { self, myuids, openarc, flake-utils, nixpkgs }: flake-utils.lib.eachDefaultSystem (system:
     let
-      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
       pkgs = import nixpkgs { inherit system; overlays = []; };
-      inherit (pkgs) stdenv automake autoconf libbsd libtool openssl pkg-config libmilter file;
     in rec {
-      packages.openarc = stdenv.mkDerivation rec {
-        pname = "openarc";
-        version = "master-${builtins.substring 0 7 lock.nodes.openarc.locked.rev}";
-        src = openarc;
-        buildInputs = [ automake autoconf libbsd libtool openssl pkg-config libmilter ];
-
-        configureFlags = [
-          "--with-milter=${libmilter}"
-        ];
-        preConfigure = ''
-        autoreconf --force --install
-        sed -i -e "s@/usr/bin/file@${file}/bin/file@" ./configure
-        '';
-        meta = {
-          description = "Open source ARC implementation";
-          homepage = "https://github.com/trusteddomainproject/OpenARC";
-          platforms = stdenv.lib.platforms.unix;
-        };
-      };
-
+      packages.openarc = pkgs.callPackage ./. { src = openarc; };
       defaultPackage = packages.openarc;
       legacyPackages.openarc = packages.openarc;
       apps.openarc = flake-utils.lib.mkApp { drv = packages.openarc; };
@@ -74,7 +53,13 @@
             '';
           };
         };
-    }) // {
+    }) // rec {
+      overlays = {
+        openarc = final: prev: {
+          openarc = self.defaultPackage."${final.system}";
+        };
+      };
+      overlay = overlays.openarc;
       nixosModule = { config, lib, pkgs, ... }:
         let
           cfg = config.services.openarc;