From fcd762f830e12b5aa86e53ef6907026983bd997c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 23 May 2023 01:20:14 +0200
Subject: [PATCH] Reduce flake inputs

---
 flake.lock | 97 +++++++++---------------------------------------------
 flake.nix  | 14 +++++---
 2 files changed, 26 insertions(+), 85 deletions(-)

diff --git a/flake.lock b/flake.lock
index d5a92d2a..ce0abc9b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -335,56 +335,17 @@
         "type": "github"
       }
     },
-    "naersk_2": {
-      "inputs": {
-        "nixpkgs": [
-          "skyflake",
-          "nix-cache-cut",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1671096816,
-        "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
-    "naersk_3": {
-      "inputs": {
-        "nixpkgs": [
-          "ticker",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1659610603,
-        "narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "c6a45e4277fa58abd524681466d3450f896dc094",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "c6a45e4277fa58abd524681466d3450f896dc094",
-        "type": "github"
-      }
-    },
     "nix-cache-cut": {
       "inputs": {
-        "naersk": "naersk_2",
-        "nixpkgs": "nixpkgs",
-        "utils": "utils"
+        "naersk": [
+          "naersk"
+        ],
+        "nixpkgs": [
+          "nixos"
+        ],
+        "utils": [
+          "flake-utils"
+        ]
       },
       "locked": {
         "lastModified": 1677107143,
@@ -451,22 +412,6 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1676790509,
-        "narHash": "sha256-W9uWAWokgS8US8rJf79qBLS2M+ZgIscfoz+KsNE7VGQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a1291d0d020a200c7ce3c48e96090bfa4890a475",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "oparl-scraper": {
       "flake": false,
       "locked": {
@@ -537,6 +482,7 @@
         "heliwatch": "heliwatch",
         "microvm": "microvm",
         "naersk": "naersk",
+        "nix-cache-cut": "nix-cache-cut",
         "nixos": "nixos",
         "nixos-hardware": "nixos-hardware",
         "nixos-modules": "nixos-modules",
@@ -634,7 +580,9 @@
         "microvm": [
           "microvm"
         ],
-        "nix-cache-cut": "nix-cache-cut",
+        "nix-cache-cut": [
+          "nix-cache-cut"
+        ],
         "nixpkgs": [
           "nixos"
         ]
@@ -742,7 +690,9 @@
         "fenix": [
           "fenix"
         ],
-        "naersk": "naersk_3",
+        "naersk": [
+          "naersk"
+        ],
         "nixpkgs": [
           "nixos"
         ],
@@ -806,21 +756,6 @@
         "url": "https://gitea.c3d2.de/astro/tracer"
       }
     },
-    "utils": {
-      "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "yammat": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 74121fc6..d85f31f6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,8 +11,6 @@
     nixos.url = "github:SuperSandro2000/nixpkgs/nixos-22.11";
     # nixos-mobilizon.url = "github:minijackson/nixpkgs/init-mobilizon";
     nixos-hardware.url = "github:nixos/nixos-hardware";
-    # nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-    # nixos-unstable-simd.url = "github:SuperSandro2000/nixpkgs/nixos-unstable-simd";
 
     affection-src = {
       url = "git+https://gitea.nek0.eu/nek0/affection";
@@ -112,6 +110,14 @@
         nixpkgs.follows = "nixos";
       };
     };
+    nix-cache-cut = {
+      url = "github:astro/nix-cache-cut";
+      inputs = {
+        naersk.follows = "naersk";
+        nixpkgs.follows = "nixos";
+        utils.follows = "flake-utils";
+      };
+    };
     nixos-modules = {
       url = "github:SuperSandro2000/nixos-modules";
       inputs.nixpkgs-lib.follows = "nixos";
@@ -146,6 +152,7 @@
       inputs = {
         microvm.follows = "microvm";
         nixpkgs.follows = "nixos";
+        nix-cache-cut.follows = "nix-cache-cut";
       };
     };
     sshlogd = {
@@ -174,8 +181,7 @@
       url = "git+https://gitea.c3d2.de/astro/ticker.git";
       inputs = {
         fenix.follows = "fenix";
-        # causes build failure
-        # naersk.follows = "naersk";
+        naersk.follows = "naersk";
         nixpkgs.follows = "nixos";
         utils.follows = "flake-utils";
       };