From 7e27762b60cebe86be1135680f2b5f3e193c398c Mon Sep 17 00:00:00 2001
From: Max Audron <audron@cocaine.farm>
Date: Fri, 29 Sep 2023 09:56:22 +0200
Subject: merge diverged changes

---
 flake.lock | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'flake.lock')

diff --git a/flake.lock b/flake.lock
index 0c574ac..258fea8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -109,11 +109,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1691421349,
-        "narHash": "sha256-RRJyX0CUrs4uW4gMhd/X4rcDG8PTgaaCQM5rXEJOx6g=",
+        "lastModified": 1691592289,
+        "narHash": "sha256-Lqpw7lrXlLkYra33tp57ms8tZ0StWhbcl80vk4D90F8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "011567f35433879aae5024fc6ec53f2a0568a6c4",
+        "rev": "9034b46dc4c7596a87ab837bb8a07ef2d887e8c7",
         "type": "github"
       },
       "original": {
@@ -127,7 +127,24 @@
       "inputs": {
         "flake-parts": "flake-parts",
         "nixinate": "nixinate",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_2",
+        "secrets": "secrets"
+      }
+    },
+    "secrets": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1691591003,
+        "narHash": "sha256-nerinKxLVgEvu+kw4d6Q2H4gSG8R9Ab0DLMcFSb4IrI=",
+        "ref": "refs/heads/main",
+        "rev": "c046615c7c2254a7b32d2e8969f068d163ab63ec",
+        "revCount": 11,
+        "type": "git",
+        "url": "ssh://git@gitlab.com/cocainefarm/k8s/secrets"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://git@gitlab.com/cocainefarm/k8s/secrets"
       }
     }
   },
-- 
cgit v1.2.3