From 1a64deeb894dc95e2645a75771732c6cc53a79ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Wed, 4 Oct 2023 01:35:06 +0200
Subject: Squash changes containing private information

There were a lot of changes since the previous commit, but a lot of them
contained personnal information about users. All thos changes got
stashed into a single commit (history is kept in a different place) and
private information was moved in a separate private repository
---
 flakes/opendmarc/flake.lock | 17 ++++++-----------
 flakes/opendmarc/flake.nix  |  8 ++++----
 2 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'flakes/opendmarc')

diff --git a/flakes/opendmarc/flake.lock b/flakes/opendmarc/flake.lock
index 4503c79..e0cbe17 100644
--- a/flakes/opendmarc/flake.lock
+++ b/flakes/opendmarc/flake.lock
@@ -17,19 +17,14 @@
     },
     "myuids": {
       "locked": {
-        "dir": "flakes/myuids",
-        "lastModified": 1628207001,
-        "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=",
-        "ref": "master",
-        "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3",
-        "revCount": 865,
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
+        "lastModified": 1,
+        "narHash": "sha256-HkW9YCLQCNBX3Em7J7MjraVEZO3I3PizkVV2QrUdULQ=",
+        "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": {
diff --git a/flakes/opendmarc/flake.nix b/flakes/opendmarc/flake.nix
index 277fd25..70b8cd7 100644
--- a/flakes/opendmarc/flake.nix
+++ b/flakes/opendmarc/flake.nix
@@ -2,9 +2,7 @@
   description = "Open source ARC implementation";
 
   inputs.myuids = {
-    url = "https://git.immae.eu/perso/Immae/Config/Nix.git";
-    type = "git";
-    dir = "flakes/myuids";
+    url = "path:../myuids";
   };
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs";
@@ -51,7 +49,9 @@
          defaultSock = "/run/opendmarc/opendmarc.sock";
          args = [ "-f" "-l" "-p" "local:${cfg.socket}" ] ++ lib.optionals (cfg.configFile != null) [ "-c" cfg.configFile ];
        in {
-         options = {
+        # Necessary for situations where flake gets included multiple times
+        key = builtins.hashString "sha256" (builtins.path { path = self.sourceInfo.outPath; name = "source"; });
+        options = {
            services.opendmarc = {
              enable = lib.mkOption {
                type = lib.types.bool;
-- 
cgit v1.2.3