From cd713d773d8d6ed7b8bd3f06e9c495f63ed30480 Mon Sep 17 00:00:00 2001 From: Markus Schmidl Date: Thu, 16 Mar 2023 22:55:12 +0100 Subject: [PATCH] add follows for flake-utils --- flake.lock | 201 ++++++++++------------------------------------------- flake.nix | 13 ++++ 2 files changed, 50 insertions(+), 164 deletions(-) diff --git a/flake.lock b/flake.lock index 590c97f..bb65d70 100644 --- a/flake.lock +++ b/flake.lock @@ -8,7 +8,9 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils" + "utils": [ + "utils" + ] }, "locked": { "lastModified": 1678328499, @@ -35,7 +37,9 @@ "tlms-rs": [ "tlms-rs" ], - "utils": "utils_2" + "utils": [ + "utils" + ] }, "locked": { "lastModified": 1678477361, @@ -89,21 +93,6 @@ "type": "github" } }, - "flake-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" - } - }, "funnel": { "inputs": { "json-structs": "json-structs", @@ -111,7 +100,9 @@ "nixpkgs" ], "tlms-rust": "tlms-rust", - "utils": "utils_3" + "utils": [ + "utils" + ] }, "locked": { "lastModified": 1678020126, @@ -132,7 +123,9 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_4" + "utils": [ + "utils" + ] }, "locked": { "lastModified": 1678306615, @@ -169,7 +162,9 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_5" + "utils": [ + "utils" + ] }, "locked": { "lastModified": 1678484240, @@ -188,7 +183,9 @@ "microvm": { "inputs": { "fenix": "fenix", - "flake-utils": "flake-utils", + "flake-utils": [ + "utils" + ], "nixpkgs": [ "nixpkgs" ] @@ -291,6 +288,7 @@ "telegram-decoder": "telegram-decoder", "tlms-rs": "tlms-rs", "trekkie": "trekkie", + "utils": "utils", "wartrammer": "wartrammer", "windshield": "windshield" } @@ -341,7 +339,9 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_6" + "utils": [ + "utils" + ] }, "locked": { "lastModified": 1678547620, @@ -365,7 +365,9 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_7" + "utils": [ + "utils" + ] }, "locked": { "lastModified": 1678328168, @@ -428,7 +430,9 @@ "tlms-rs": [ "tlms-rs" ], - "utils": "utils_8" + "utils": [ + "utils" + ] }, "locked": { "lastModified": 1678485606, @@ -446,146 +450,11 @@ }, "utils": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_10": { - "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" - } - }, - "utils_2": { - "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" - } - }, - "utils_3": { - "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" - } - }, - "utils_4": { - "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" - } - }, - "utils_5": { - "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" - } - }, - "utils_6": { - "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" - } - }, - "utils_7": { - "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" - } - }, - "utils_8": { - "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" - } - }, - "utils_9": { - "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { @@ -603,7 +472,9 @@ "nixpkgs" ], "nixpkgs-unstable": "nixpkgs-unstable", - "utils": "utils_9" + "utils": [ + "utils" + ] }, "locked": { "lastModified": 1677985694, @@ -624,7 +495,9 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_10" + "utils": [ + "utils" + ] }, "locked": { "lastModified": 1678530041, diff --git a/flake.nix b/flake.nix index 8eb09ef..4d26138 100644 --- a/flake.nix +++ b/flake.nix @@ -9,9 +9,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + utils.url = github:numtide/flake-utils; + microvm = { url = "github:astro/microvm.nix"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "utils"; }; sops-nix = { @@ -31,6 +34,7 @@ nixpkgs.follows = "nixpkgs"; naersk.follows = "naersk"; tlms-rs.follows = "tlms-rs"; + utils.follows = "utils"; }; }; @@ -40,12 +44,14 @@ nixpkgs.follows = "nixpkgs"; naersk.follows = "naersk"; tlms-rs.follows = "tlms-rs"; + utils.follows = "utils"; }; }; kindergarten = { url = "github:tlm-solutions/kindergarten"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.utils.follows = "utils"; }; telegram-decoder = { @@ -53,40 +59,47 @@ inputs = { nixpkgs.follows = "nixpkgs"; naersk.follows = "naersk"; + utils.follows = "utils"; }; }; gnuradio-decoder = { url = "github:tlm-solutions/gnuradio-decoder"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.utils.follows = "utils"; }; data-accumulator = { url = "github:tlm-solutions/data-accumulator"; inputs.nixpkgs.follows = "nixpkgs"; inputs.naersk.follows = "naersk"; + inputs.utils.follows = "utils"; }; state-api = { url = "github:tlm-solutions/state-api"; inputs.nixpkgs.follows = "nixpkgs"; inputs.naersk.follows = "naersk"; + inputs.utils.follows = "utils"; }; funnel = { url = "github:tlm-solutions/funnel"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.utils.follows = "utils"; }; windshield = { url = "github:tlm-solutions/windshield"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.utils.follows = "utils"; }; wartrammer = { url = "github:tlm-solutions/wartrammer-40k"; inputs.nixpkgs.follows = "nixpkgs"; inputs.naersk.follows = "naersk"; + inputs.utils.follows = "utils"; }; tlms-rs = {