From 6e882886587b82b740bec24530355421ad93bca3 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Fri, 7 Jun 2024 20:40:22 +0200
Subject: [PATCH] Fix Kubenix execution

---
 flake.lock | 40 +++++++++++++++++++++++++++-------------
 flake.nix  |  8 +-------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index 25f87d4..d3638d3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -94,11 +94,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717574802,
-        "narHash": "sha256-TprJdvfwdjj3co7CGZ4jPIlAdZPFwYrQjamvt2B2L4g=",
+        "lastModified": 1717770040,
+        "narHash": "sha256-eq9gP060TqWqRf2k4WO5FrG49rVq5Jy3Ptusg0CFdds=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "7fc7009c892509b9bf81cb73c6575f3f9e6321f5",
+        "rev": "398acc470f7c2d68621db01900f053e6000129c4",
         "type": "github"
       },
       "original": {
@@ -270,9 +270,7 @@
     "kubenix": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_2",
         "systems": "systems_5",
         "treefmt": "treefmt"
       },
@@ -354,11 +352,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-        "lastModified": 1717549473,
-        "narHash": "sha256-ZDJwC8HaNwam72OQSPG4mEEYBkG969HzJHfFlLNUOQM=",
+        "lastModified": 1717722458,
+        "narHash": "sha256-D9DSHU68yifGrrwX9VARYs3BrWk1pmjULMVW0SaXPdQ=",
         "owner": "farcaller",
         "repo": "nixhelm",
-        "rev": "745b44671ccbc2651d6f1025f18b666c5e806db0",
+        "rev": "a592d7672cfd0ee2c7dda33b8fc8fe75b6442f77",
         "type": "github"
       },
       "original": {
@@ -417,11 +415,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1717281328,
-        "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
+        "lastModified": 1717646450,
+        "narHash": "sha256-KE+UmfSVk5PG8jdKdclPVcMrUB8yVZHbsjo7ZT1Bm3c=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "818dbe2f96df233d2041739d6079bb616d3e5597",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1717555607,
+        "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
+        "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105",
         "type": "github"
       },
       "original": {
@@ -467,7 +481,7 @@
         "kubenix": "kubenix",
         "nixhelm": "nixhelm",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
     },
diff --git a/flake.nix b/flake.nix
index 5a610a1..7ccd3f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,6 +7,7 @@
     deploy-rs.url = "github:serokell/deploy-rs";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     flake-utils.url = "github:numtide/flake-utils";
+    kubenix.url = "github:pizzapim/kubenix/servers";
 
     disko = {
       url = "github:nix-community/disko";
@@ -23,13 +24,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    kubenix = {
-      url = "github:pizzapim/kubenix/servers";
-      # url = "file:///home/pim/git/forks/kubenix";
-      # type = "git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     nixhelm = {
       url = "github:farcaller/nixhelm";
       inputs.nixpkgs.follows = "nixpkgs";