From eac0873ddbb7279e5eaeaee91ecef541109d2d57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 17 Sep 2022 17:52:56 +0200
Subject: [PATCH] Dedupe flake-utils

---
 flake.lock | 40 +++++++---------------------------------
 flake.nix  | 10 ++++++----
 2 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1b0d325a..9679f3de 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,7 +2,9 @@
   "nodes": {
     "affection-src": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": [
+          "flake-utils"
+        ],
         "nixpkgs": [
           "nixos"
         ]
@@ -129,36 +131,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "heliwatch": {
       "inputs": {
         "fenix": [
@@ -649,7 +621,7 @@
         "bevy-mandelbrot": "bevy-mandelbrot",
         "eris": "eris",
         "fenix": "fenix",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "heliwatch": "heliwatch",
         "hydra": "hydra",
         "hydra-ca": "hydra-ca",
@@ -695,7 +667,9 @@
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": [
+          "flake-utils"
+        ],
         "nixpkgs": [
           "nixos"
         ]
diff --git a/flake.nix b/flake.nix
index 7cb80d3b..e313c4e4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,16 +11,15 @@
       url = "git+https://gitea.nek0.eu/nek0/affection";
       inputs = {
         nixpkgs.follows = "nixos";
-        utils.follows = "flake-utils";
+        flake-utils.follows = "flake-utils";
       };
     };
     bevy-mandelbrot = {
       # url = "github:matelab/bevy_mandelbrot";
       url = "git+https://gitea.c3d2.de/astro/bevy-mandelbrot.git?ref=main";
       inputs = {
-        nixpkgs.follows = "nixos";
         naersk.follows = "naersk";
-        naersk.inputs.nixpkgs.follows = "nixpkgs";
+        nixpkgs.follows = "nixos";
         rust-overlay.follows = "rust-overlay";
       };
     };
@@ -63,7 +62,9 @@
     };
     naersk = {
       url = "github:nix-community/naersk";
-      inputs.nixpkgs.follows = "nixos";
+      inputs = {
+        nixpkgs.follows = "nixos";
+      };
     };
     oparl-scraper = {
       url = "github:offenesdresden/ratsinfo-scraper/oparl";
@@ -86,6 +87,7 @@
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs = {
+        flake-utils.follows = "flake-utils";
         nixpkgs.follows = "nixos";
       };
     };