From dea23084d0999b00a6b52059181561e30f163fb1 Mon Sep 17 00:00:00 2001 From: revol-xut Date: Mon, 20 Mar 2023 03:56:14 +0100 Subject: [PATCH] adding chemo as sink for data-accumulator --- flake.lock | 178 +++++++++++++++++----- flake.nix | 8 + modules/data-hoarder/data-accumulator.nix | 11 +- 3 files changed, 154 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index 590c97f..b36bd34 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,54 @@ { "nodes": { + "chemo": { + "inputs": { + "crane": "crane", + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1679280550, + "narHash": "sha256-dcThjjB1nq8+pRCk88jpem9pE8xgcNBmcXD9Mof2MtY=", + "owner": "tlm-solutions", + "repo": "chemo", + "rev": "31d61f1b4ab5e2ef2f7e1cf8fd8f27a5280dea6c", + "type": "github" + }, + "original": { + "owner": "tlm-solutions", + "repo": "chemo", + "type": "github" + } + }, + "crane": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": [ + "chemo", + "utils" + ], + "nixpkgs": [ + "chemo", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1679269454, + "narHash": "sha256-vzDw6uXwZ63iKuyO7rzN48uc7BZ1pnupdcNrWxQADXA=", + "owner": "ipetkov", + "repo": "crane", + "rev": "475de74fa29594a9d0a20bb032826d306be4d686", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "data-accumulator": { "inputs": { "naersk": [ @@ -8,14 +57,14 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils" + "utils": "utils_2" }, "locked": { - "lastModified": 1678328499, - "narHash": "sha256-02MUHiApaBDxK7MjHekyWkAY3M6i+1TsXY0lKpbeKGg=", + "lastModified": 1679280255, + "narHash": "sha256-Z0LfAI9AfdhnPoT1TEFu5F11XgJ6UNwQIZILgYnrxfU=", "owner": "tlm-solutions", "repo": "data-accumulator", - "rev": "66014ff90a9ea164a3221d7e11e4dd8df3667f2a", + "rev": "ae17cdbc7590f82a224301899be34c57ccee8811", "type": "github" }, "original": { @@ -35,7 +84,7 @@ "tlms-rs": [ "tlms-rs" ], - "utils": "utils_2" + "utils": "utils_3" }, "locked": { "lastModified": 1678477361, @@ -89,6 +138,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1676283394, @@ -111,7 +176,7 @@ "nixpkgs" ], "tlms-rust": "tlms-rust", - "utils": "utils_3" + "utils": "utils_4" }, "locked": { "lastModified": 1678020126, @@ -132,7 +197,7 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_4" + "utils": "utils_5" }, "locked": { "lastModified": 1678306615, @@ -169,7 +234,7 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_5" + "utils": "utils_6" }, "locked": { "lastModified": 1678484240, @@ -229,11 +294,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1678872516, - "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", + "lastModified": 1679139072, + "narHash": "sha256-Gtw2Yj8DfETie3u7iHv1y5Wt+plGRmp6nTQ0EEfaPho=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", + "rev": "08ef7dc8334521605a5c8b7086cc248e74ee338b", "type": "github" }, "original": { @@ -245,11 +310,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1678582009, - "narHash": "sha256-J8QzUOOv3/y97q19pGOz28gLC3lAUy1c4bWpsi5D460=", + "lastModified": 1679163677, + "narHash": "sha256-VC0tc3EjJZFPXgucFQAYMIHce5nJWYR0kVCk4TVg6gg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c34fc09c77172c4189df4594a0749e25a23cdd9b", + "rev": "c3912035d00ef755ab19394488b41feab95d2e40", "type": "github" }, "original": { @@ -277,6 +342,7 @@ }, "root": { "inputs": { + "chemo": "chemo", "data-accumulator": "data-accumulator", "datacare": "datacare", "documentation-src": "documentation-src", @@ -312,6 +378,33 @@ "type": "github" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "chemo", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "chemo", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677812689, + "narHash": "sha256-EakqhgRnjVeYJv5+BJx/NZ7/eFTMBxc4AhICUNquhUg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e53e8853aa7b0688bc270e9e6a681d22e01cf299", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -320,11 +413,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1678590185, - "narHash": "sha256-scvu8HegWwbcvPKjh6M1DnpPYAv4EnP1krsRPItoQ+E=", + "lastModified": 1679194991, + "narHash": "sha256-SSJ/NvhXJeDzSgfEjKO1V/2olI4UlEAxK54DVWJIPjA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9e98f7a442b0e318de9cce757675c2ab922bdf2b", + "rev": "08a0b5f25a73130869b3cc375eaf0e6ff317435e", "type": "github" }, "original": { @@ -341,7 +434,7 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_6" + "utils": "utils_7" }, "locked": { "lastModified": 1678547620, @@ -365,14 +458,14 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_7" + "utils": "utils_8" }, "locked": { - "lastModified": 1678328168, - "narHash": "sha256-3Ekz6Ocy2MEJHd1S67lBKsm/ndTNsdJ29bHqvVnKqAo=", + "lastModified": 1679279026, + "narHash": "sha256-ep22GpG1Bs+bJkk/T2odFlDMSYtsojn1hmfMBnCIlB0=", "owner": "tlm-solutions", "repo": "telegram-decoder", - "rev": "b95ffffd623b1a3004e48b19f37d0d558ce7970b", + "rev": "3a441f90c1dc02ffe3b1cc892e37d272f83efef6", "type": "github" }, "original": { @@ -388,11 +481,11 @@ ] }, "locked": { - "lastModified": 1678668058, - "narHash": "sha256-WHTBvjrs3JI6TQ2wiwrcfoZyGiwhmgf83Sv/NFHwcTU=", + "lastModified": 1679278853, + "narHash": "sha256-wGWZ1Cs0VRREms6/Yfdd70ECm7gsRWw6EQOet0MbWyg=", "owner": "tlm-solutions", "repo": "tlms.rs", - "rev": "bebb4e4457fc6a4c6a1fa87c0eb8b813548479b7", + "rev": "4b78be3caa74591928f93bc1219a18a0413a51cf", "type": "github" }, "original": { @@ -428,7 +521,7 @@ "tlms-rs": [ "tlms-rs" ], - "utils": "utils_8" + "utils": "utils_9" }, "locked": { "lastModified": 1678485606, @@ -445,6 +538,21 @@ } }, "utils": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_10": { "locked": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", @@ -459,7 +567,7 @@ "type": "github" } }, - "utils_10": { + "utils_11": { "locked": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", @@ -506,11 +614,11 @@ }, "utils_4": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -521,11 +629,11 @@ }, "utils_5": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -603,7 +711,7 @@ "nixpkgs" ], "nixpkgs-unstable": "nixpkgs-unstable", - "utils": "utils_9" + "utils": "utils_10" }, "locked": { "lastModified": 1677985694, @@ -624,7 +732,7 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_10" + "utils": "utils_11" }, "locked": { "lastModified": 1678530041, diff --git a/flake.nix b/flake.nix index 8eb09ef..4f26ac4 100644 --- a/flake.nix +++ b/flake.nix @@ -93,6 +93,11 @@ url = "github:tlm-solutions/tlms.rs"; inputs.nixpkgs.follows = "nixpkgs"; }; + + chemo = { + url = "github:tlm-solutions/chemo"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -111,6 +116,7 @@ , trekkie , wartrammer , windshield + , chemo , ... }: let @@ -127,6 +133,7 @@ sops-nix.nixosModules.sops state-api.nixosModules.default trekkie.nixosModules.default + chemo.nixosModules.default { nixpkgs.overlays = [ datacare.overlays.default @@ -136,6 +143,7 @@ funnel.overlays.default data-accumulator.overlays.default windshield.overlays.default + chemo.overlays.default (final: prev: { inherit documentation-src; options-docs = (pkgs.nixosOptionsDoc { diff --git a/modules/data-hoarder/data-accumulator.nix b/modules/data-hoarder/data-accumulator.nix index 9d33cde..eeba0ff 100644 --- a/modules/data-hoarder/data-accumulator.nix +++ b/modules/data-hoarder/data-accumulator.nix @@ -13,14 +13,9 @@ }; GRPC = [ { - name = "API"; - host = config.TLMS.api.GRPC.host; - port = config.TLMS.api.GRPC.port; - } - { - name = "FUNNEL"; - host = config.TLMS.funnel.GRPC.host; - port = config.TLMS.funnel.GRPC.port; + name = "CHEMO"; + host = config.TLMS.chmo.host; + port = config.TLMS.chemo.port; } ]; };