From 476020749e4ee26d506073f37b7b91639c120900 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 31 May 2022 23:46:35 +0200
Subject: [PATCH] flake.nix: remove hydra.inputs.*.follows again

this is very picky
---
 flake.lock | 84 +++++++++++++++++++++++++++++++++++-------------------
 flake.nix  |  9 ------
 2 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/flake.lock b/flake.lock
index c3f8a632..31931bf8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -65,13 +65,11 @@
     },
     "hydra": {
       "inputs": {
-        "newNixpkgs": [
-          "nixpkgs"
-        ],
-        "nix": [
-          "nix"
-        ],
+        "newNixpkgs": "newNixpkgs",
+        "nix": "nix",
         "nixpkgs": [
+          "hydra",
+          "nix",
           "nixpkgs"
         ]
       },
@@ -146,28 +144,41 @@
         "type": "github"
       }
     },
-    "nix": {
-      "inputs": {
-        "lowdown-src": "lowdown-src",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-regression": "nixpkgs-regression"
-      },
+    "newNixpkgs": {
       "locked": {
-        "lastModified": 1653986283,
-        "narHash": "sha256-/ZAS5a3u4/s6EQi8pLbp0GVxOOXbz9YaWkk0i1LJq1s=",
-        "owner": "nixos",
-        "repo": "nix",
-        "rev": "04a699b8a9cebd83ece0011ec3a99e38a2adc3a8",
+        "lastModified": 1654012153,
+        "narHash": "sha256-In+gfoH2Tnf/UmpzeuGlfuexU2EC4QIelBsm2zMK5AE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "49a2bcc6e2065909c701f862f9a1a62b3082b40a",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "repo": "nix",
+        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "nix": {
+      "inputs": {
+        "lowdown-src": "lowdown-src",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-regression": "nixpkgs-regression"
+      },
+      "locked": {
+        "lastModified": 1654010257,
+        "narHash": "sha256-YSdusHgljEI35at0p4orNMbR2bT/W+BuTaoWEHlHTFo=",
+        "owner": "NixOS",
+        "repo": "nix",
+        "rev": "078c80f7500edd3adc3be5f7fb2801ba346c1d81",
+        "type": "github"
+      },
+      "original": {
+        "id": "nix",
+        "type": "indirect"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1653463224,
@@ -185,16 +196,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653988320,
-        "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=",
-        "owner": "nixos",
+        "lastModified": 1645296114,
+        "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1",
+        "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "release-22.05",
+        "owner": "NixOS",
+        "ref": "nixos-21.05-small",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -279,6 +290,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1653988320,
+        "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "release-22.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "openwrt": {
       "flake": false,
       "locked": {
@@ -326,9 +353,8 @@
         "hydra": "hydra",
         "microvm": "microvm",
         "naersk": "naersk",
-        "nix": "nix",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-mobilizon": "nixpkgs-mobilizon",
         "nixpkgs-openwebrx": "nixpkgs-openwebrx",
         "openwrt": "openwrt",
diff --git a/flake.nix b/flake.nix
index 85e9ac84..a8ddc98f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,11 +20,6 @@
     };
     hydra = {
       url = "github:nixos/hydra";
-      inputs = {
-        newNixpkgs.follows = "nixpkgs";
-        nix.follows = "nix";
-        nixpkgs.follows = "nixpkgs";
-      };
     };
     microvm = {
       url = "github:astro/microvm.nix";
@@ -34,10 +29,6 @@
       url = "github:nix-community/naersk";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nix = {
-      url = "github:/nixos/nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     openwrt = {
       url = "git+https://git.openwrt.org/openwrt/openwrt.git?ref=openwrt-21.02";
       flake = false;