From be2229b13e5cecbf3885a1a8083a4aa87ab21510 Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Wed, 6 Jul 2022 19:59:25 +0200 Subject: [PATCH] switch overlays to dump-dvb.nix --- flake.lock | 725 +++++++++++++++++++++++++++++++++++++++++++++++++---- flake.nix | 30 ++- 2 files changed, 694 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index 7ebd005..19ce304 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,30 @@ "type": "github" } }, + "clicky-bunty-server_2": { + "inputs": { + "naersk": "naersk_4", + "nixpkgs": [ + "dump-dvb", + "nixpkgs" + ], + "stops": "stops_4", + "utils": "utils_4" + }, + "locked": { + "lastModified": 1657127209, + "narHash": "sha256-QzwaSEDwD2Jps2cqs6RM2Ua1X+KdRNOCM4AiMYLhl48=", + "owner": "dump-dvb", + "repo": "clicky-bunty-server", + "rev": "8916f7dc6440ed52b43840ac02ca8de6e86d80bb", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "clicky-bunty-server", + "type": "github" + } + }, "data-accumulator": { "inputs": { "naersk": "naersk_2", @@ -46,6 +70,30 @@ "type": "github" } }, + "data-accumulator_2": { + "inputs": { + "naersk": "naersk_5", + "nixpkgs": [ + "dump-dvb", + "nixpkgs" + ], + "stops": "stops_5", + "utils": "utils_5" + }, + "locked": { + "lastModified": 1657125265, + "narHash": "sha256-0BeBMH7ocuJqRLcFPSpJyEkc2KxgE3GENTnNvS6HM88=", + "owner": "dump-dvb", + "repo": "data-accumulator", + "rev": "c64ccd6accbe15d643d06f121c50f44b28c9ca8f", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "data-accumulator", + "type": "github" + } + }, "decode-server": { "inputs": { "naersk": "naersk_3", @@ -69,6 +117,30 @@ "type": "github" } }, + "decode-server_2": { + "inputs": { + "naersk": "naersk_6", + "nixpkgs": [ + "dump-dvb", + "nixpkgs" + ], + "stops": "stops_6", + "utils": "utils_6" + }, + "locked": { + "lastModified": 1657128199, + "narHash": "sha256-6d1qpbtFV3kfFQITaZh5Pr7NO0zgGs2A3d18wdqWXRc=", + "owner": "dump-dvb", + "repo": "decode-server", + "rev": "35763467f98904e517bac0ec1fe4ad88d28df1bd", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "decode-server", + "type": "github" + } + }, "docs": { "inputs": { "nixpkgs": [ @@ -89,13 +161,88 @@ "type": "github" } }, - "dvb-api": { + "docs_2": { "inputs": { - "naersk": "naersk_4", + "nixpkgs": [ + "dump-dvb", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1655240032, + "narHash": "sha256-wfzpOs0Xiuht9pTxM8MXOHYjGWZWpt/fqOgJ0YiZGbY=", + "owner": "dump-dvb", + "repo": "documentation", + "rev": "69f9e7df6e94d85984d4836e58a193284ff36047", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "documentation", + "type": "github" + } + }, + "dump-dvb": { + "inputs": { + "clicky-bunty-server": "clicky-bunty-server_2", + "data-accumulator": "data-accumulator_2", + "decode-server": "decode-server_2", + "docs": "docs_2", + "dvb-api": "dvb-api", + "funnel": "funnel", "nixpkgs": [ "nixpkgs" ], - "utils": "utils_4" + "radio-conf": "radio-conf", + "stops": "stops_7", + "utils": "utils_10", + "wartrammer": "wartrammer", + "windshield": "windshield" + }, + "locked": { + "lastModified": 1657130234, + "narHash": "sha256-D3vzUu4128VyzgRTLdv2wkSHUU7ftBxc38rRDfEdsEM=", + "owner": "dump-dvb", + "repo": "dump-dvb.nix", + "rev": "4e10a2d614b605ae6d301fca069d1df5808ca9b4", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "dump-dvb.nix", + "type": "github" + } + }, + "dvb-api": { + "inputs": { + "naersk": "naersk_7", + "nixpkgs": [ + "dump-dvb", + "nixpkgs" + ], + "utils": "utils_7" + }, + "locked": { + "lastModified": 1657125414, + "narHash": "sha256-sITZeIs/GkyXeWJbGIEfphhThDAO3UX/ExcjPNjQBtM=", + "owner": "dump-dvb", + "repo": "dvb-api", + "rev": "d9841e8a1c6945ce14aeaec160e50d7b74c8a865", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "dvb-api", + "type": "github" + } + }, + "dvb-api_2": { + "inputs": { + "naersk": "naersk_10", + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils_13" }, "locked": { "lastModified": 1656196623, @@ -128,11 +275,34 @@ }, "funnel": { "inputs": { - "naersk": "naersk_5", + "naersk": "naersk_8", + "nixpkgs": [ + "dump-dvb", + "nixpkgs" + ], + "utils": "utils_8" + }, + "locked": { + "lastModified": 1657126087, + "narHash": "sha256-Z20fREEYP+C+P0sdtUMPLuxWzu2zzzeTR/nDXy0CpWE=", + "owner": "dump-dvb", + "repo": "funnel", + "rev": "f07b1bffa4f9dfb1f4c0134a4f4f97945a40f614", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "funnel", + "type": "github" + } + }, + "funnel_2": { + "inputs": { + "naersk": "naersk_11", "nixpkgs": [ "nixpkgs" ], - "utils": "utils_5" + "utils": "utils_14" }, "locked": { "lastModified": 1656855582, @@ -187,6 +357,80 @@ "type": "github" } }, + "naersk_10": { + "inputs": { + "nixpkgs": "nixpkgs_10" + }, + "locked": { + "lastModified": 1652722411, + "narHash": "sha256-FxzNgYiH9c91hUVAntcjrqY//KOTUPP2a4e8Wyuysxg=", + "owner": "nix-community", + "repo": "naersk", + "rev": "94beb7a3edfeb3bcda65fa3f2ebc48ec6b40bf72", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "naersk_11": { + "inputs": { + "nixpkgs": "nixpkgs_11" + }, + "locked": { + "lastModified": 1655042882, + "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=", + "owner": "nix-community", + "repo": "naersk", + "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "naersk_12": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1655042882, + "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=", + "owner": "nix-community", + "repo": "naersk", + "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "naersk_13": { + "inputs": { + "nixpkgs": "nixpkgs_13" + }, + "locked": { + "lastModified": 1652722411, + "narHash": "sha256-FxzNgYiH9c91hUVAntcjrqY//KOTUPP2a4e8Wyuysxg=", + "owner": "nix-community", + "repo": "naersk", + "rev": "94beb7a3edfeb3bcda65fa3f2ebc48ec6b40bf72", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, "naersk_2": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -228,11 +472,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1652722411, - "narHash": "sha256-FxzNgYiH9c91hUVAntcjrqY//KOTUPP2a4e8Wyuysxg=", + "lastModified": 1653413650, + "narHash": "sha256-wojDHjb+eU80MPH+3HQaK0liUy8EgR95rvmCl24i58Y=", "owner": "nix-community", "repo": "naersk", - "rev": "94beb7a3edfeb3bcda65fa3f2ebc48ec6b40bf72", + "rev": "69daaceebe12c070cd5ae69ba38f277bbf033695", "type": "github" }, "original": { @@ -246,11 +490,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1655042882, - "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=", + "lastModified": 1653413650, + "narHash": "sha256-wojDHjb+eU80MPH+3HQaK0liUy8EgR95rvmCl24i58Y=", "owner": "nix-community", "repo": "naersk", - "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f", + "rev": "69daaceebe12c070cd5ae69ba38f277bbf033695", "type": "github" }, "original": { @@ -261,9 +505,7 @@ }, "naersk_6": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1655042882, @@ -297,6 +539,42 @@ "type": "github" } }, + "naersk_8": { + "inputs": { + "nixpkgs": "nixpkgs_8" + }, + "locked": { + "lastModified": 1655042882, + "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=", + "owner": "nix-community", + "repo": "naersk", + "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "naersk_9": { + "inputs": { + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1652722411, + "narHash": "sha256-FxzNgYiH9c91hUVAntcjrqY//KOTUPP2a4e8Wyuysxg=", + "owner": "nix-community", + "repo": "naersk", + "rev": "94beb7a3edfeb3bcda65fa3f2ebc48ec6b40bf72", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1653326962, @@ -343,6 +621,64 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1652840887, + "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1655876541, + "narHash": "sha256-eOz1YNclUTobC2f9meWpw+idhzWImdti43OKjLBoDq8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a0edeb02ae5b92eda6efbee4e26d8c33c15063fd", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1656947410, + "narHash": "sha256-htDR/PZvjUJGyrRJsVqDmXR8QeoswBaRLzHt13fd0iY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e8d47977286a44955262adbc76f2c8a66e7419d5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_13": { + "locked": { + "lastModified": 1652840887, + "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1653326962, @@ -373,11 +709,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1652840887, - "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", + "lastModified": 1653326962, + "narHash": "sha256-W8feCYqKTsMre4nAEpv5Kx1PVFC+hao/LwqtB2Wci/8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "rev": "41cc1d5d9584103be4108c1815c350e07c807036", "type": "github" }, "original": { @@ -387,11 +723,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1655876541, - "narHash": "sha256-eOz1YNclUTobC2f9meWpw+idhzWImdti43OKjLBoDq8=", + "lastModified": 1653326962, + "narHash": "sha256-W8feCYqKTsMre4nAEpv5Kx1PVFC+hao/LwqtB2Wci/8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0edeb02ae5b92eda6efbee4e26d8c33c15063fd", + "rev": "41cc1d5d9584103be4108c1815c350e07c807036", "type": "github" }, "original": { @@ -401,18 +737,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1656947410, - "narHash": "sha256-htDR/PZvjUJGyrRJsVqDmXR8QeoswBaRLzHt13fd0iY=", + "lastModified": 1656936967, + "narHash": "sha256-7EWfyOpyS33v5WsaIxm9Rw5yUBkoBZLHds8SsS0Mr/4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8d47977286a44955262adbc76f2c8a66e7419d5", + "rev": "e0db4edff65df3bd12012adb36244a9409d7a754", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs_7": { @@ -429,12 +763,62 @@ "type": "indirect" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1655876541, + "narHash": "sha256-eOz1YNclUTobC2f9meWpw+idhzWImdti43OKjLBoDq8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a0edeb02ae5b92eda6efbee4e26d8c33c15063fd", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1652840887, + "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "radio-conf": { + "inputs": { + "nixpkgs": [ + "dump-dvb", + "nixpkgs" + ], + "utils": "utils_9" + }, + "locked": { + "lastModified": 1657130203, + "narHash": "sha256-1iww9+It0Q4pkxu9EROE5IpmIDim5j/HNbvFVaKoN6A=", + "owner": "dump-dvb", + "repo": "radio-conf", + "rev": "c7a3aaa134500ae224927e30901b2af2dc08029e", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "radio-conf", + "type": "github" + } + }, + "radio-conf_2": { "inputs": { "nixpkgs": [ "nixpkgs" ], - "utils": "utils_6" + "utils": "utils_15" }, "locked": { "lastModified": 1654440596, @@ -456,16 +840,17 @@ "data-accumulator": "data-accumulator", "decode-server": "decode-server", "docs": "docs", - "dvb-api": "dvb-api", - "funnel": "funnel", + "dump-dvb": "dump-dvb", + "dvb-api": "dvb-api_2", + "funnel": "funnel_2", "microvm": "microvm", - "naersk": "naersk_6", - "nixpkgs": "nixpkgs_6", - "radio-conf": "radio-conf", + "naersk": "naersk_12", + "nixpkgs": "nixpkgs_12", + "radio-conf": "radio-conf_2", "sops-nix": "sops-nix", - "stops": "stops_4", - "wartrammer": "wartrammer", - "windshield": "windshield" + "stops": "stops_8", + "wartrammer": "wartrammer_2", + "windshield": "windshield_2" } }, "sops-nix": { @@ -554,6 +939,70 @@ "type": "github" } }, + "stops_5": { + "flake": false, + "locked": { + "lastModified": 1652912878, + "narHash": "sha256-HexjCe/egqPy+pgJniQB+EgFc04lH0HCuZ7kNzRsBJU=", + "owner": "dump-dvb", + "repo": "stop-names", + "rev": "17c22c4d4908f08166e7a737abc65dee5d46dcc4", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "stop-names", + "type": "github" + } + }, + "stops_6": { + "flake": false, + "locked": { + "lastModified": 1652912878, + "narHash": "sha256-HexjCe/egqPy+pgJniQB+EgFc04lH0HCuZ7kNzRsBJU=", + "owner": "dump-dvb", + "repo": "stop-names", + "rev": "17c22c4d4908f08166e7a737abc65dee5d46dcc4", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "stop-names", + "type": "github" + } + }, + "stops_7": { + "flake": false, + "locked": { + "lastModified": 1657094312, + "narHash": "sha256-WF9HuGWa8novzWhAY2j6VwjfZwPEDFRaLgXug6aahhg=", + "owner": "dump-dvb", + "repo": "stop-names", + "rev": "31e2ddd0f2eb0fe09163a111265a5acfc0fbc2bc", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "stop-names", + "type": "github" + } + }, + "stops_8": { + "flake": false, + "locked": { + "lastModified": 1652912878, + "narHash": "sha256-HexjCe/egqPy+pgJniQB+EgFc04lH0HCuZ7kNzRsBJU=", + "owner": "dump-dvb", + "repo": "stop-names", + "rev": "17c22c4d4908f08166e7a737abc65dee5d46dcc4", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "stop-names", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1652776076, @@ -569,6 +1018,126 @@ "type": "github" } }, + "utils_10": { + "locked": { + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_11": { + "locked": { + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_12": { + "locked": { + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_13": { + "locked": { + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_14": { + "locked": { + "lastModified": 1656065134, + "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_15": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_16": { + "locked": { + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_17": { + "locked": { + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "utils_2": { "locked": { "lastModified": 1652776076, @@ -616,11 +1185,11 @@ }, "utils_5": { "locked": { - "lastModified": 1656065134, - "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", "owner": "numtide", "repo": "flake-utils", - "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", "type": "github" }, "original": { @@ -631,11 +1200,11 @@ }, "utils_6": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", "type": "github" }, "original": { @@ -661,11 +1230,26 @@ }, "utils_8": { "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "lastModified": 1656065134, + "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_9": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -676,11 +1260,34 @@ }, "wartrammer": { "inputs": { - "naersk": "naersk_7", + "naersk": "naersk_9", + "nixpkgs": [ + "dump-dvb", + "nixpkgs" + ], + "utils": "utils_11" + }, + "locked": { + "lastModified": 1657129381, + "narHash": "sha256-owx0effAQHQyf2taeCv7AmQffhcYplmBrMsTaC41uXc=", + "owner": "dump-dvb", + "repo": "wartrammer-40k", + "rev": "483d05f1f35bbb40be70d32def3e52471359bf32", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "wartrammer-40k", + "type": "github" + } + }, + "wartrammer_2": { + "inputs": { + "naersk": "naersk_13", "nixpkgs": [ "nixpkgs" ], - "utils": "utils_7" + "utils": "utils_16" }, "locked": { "lastModified": 1653046795, @@ -699,9 +1306,31 @@ "windshield": { "inputs": { "nixpkgs": [ + "dump-dvb", "nixpkgs" ], - "utils": "utils_8" + "utils": "utils_12" + }, + "locked": { + "lastModified": 1657126666, + "narHash": "sha256-5xOWMrYHdKiU2LwMiKQr3kblYUot7xP9lkg5sNt2ZTo=", + "owner": "dump-dvb", + "repo": "windshield", + "rev": "257dff04b866e0470dcd4bd12b923bf67ef5c489", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "windshield", + "type": "github" + } + }, + "windshield_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils_17" }, "locked": { "lastModified": 1653517562, diff --git a/flake.nix b/flake.nix index 99083a5..a646eec 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,11 @@ inputs = { nixpkgs.url = github:NixOS/nixpkgs/nixos-22.05; + dump-dvb = { + url = github:dump-dvb/dump-dvb.nix; + inputs.nixpkgs.follows = "nixpkgs"; + }; + naersk = { url = github:nix-community/naersk; inputs.nixpkgs.follows = "nixpkgs"; @@ -68,7 +73,7 @@ }; }; - outputs = { self, nixpkgs, microvm, radio-conf, data-accumulator, decode-server, dvb-api, funnel, stops, windshield, docs, wartrammer, clicky-bunty-server, sops-nix, ... }@inputs: + outputs = { self, dump-dvb, nixpkgs, microvm, radio-conf, data-accumulator, decode-server, dvb-api, funnel, stops, windshield, docs, wartrammer, clicky-bunty-server, sops-nix, ... }@inputs: let pkgs = nixpkgs.legacyPackages."x86_64-linux"; lib = pkgs.lib; @@ -90,12 +95,8 @@ sops-nix.nixosModules.sops { nixpkgs.overlays = [ - data-accumulator.overlay."x86_64-linux" - dvb-api.overlay."x86_64-linux" - funnel.overlay."x86_64-linux" - windshield.overlay."x86_64-linux" + dump-dvb.overlays.default docs.overlay."x86_64-linux" - clicky-bunty-server.overlay."x86_64-linux" ]; dump-dvb.stopsJson = "${stops}/stops.json"; dump-dvb.graphJson = "${stops}/graph.json"; @@ -137,7 +138,9 @@ ./modules/traffic-stop-boxes/radio-config.nix ./modules/dump-dvb { - nixpkgs.overlays = [ radio-conf.overlay."x86_64-linux" decode-server.overlay."x86_64-linux" ]; + nixpkgs.overlays = [ + dump-dvb.overlays.default + ]; dump-dvb.systemNumber = number; dump-dvb.stopsJson = "${stops}/stops.json"; } @@ -184,10 +187,7 @@ sops-nix.nixosModules.sops { nixpkgs.overlays = [ - radio-conf.overlay."x86_64-linux" - decode-server.overlay."x86_64-linux" - data-accumulator.overlay."x86_64-linux" - wartrammer.overlay."x86_64-linux" + dump-dvb.overlays.default ]; dump-dvb.stopsJson = "${stops}/stops.json"; dump-dvb.systemNumber = 130; @@ -227,7 +227,9 @@ ./modules/user-stop-box/user.nix ./user-config.nix { - nixpkgs.overlays = [ radio-conf.overlay."x86_64-linux" decode-server.overlay."x86_64-linux" ]; + nixpkgs.overlays = [ + dump-dvb.overlays.default + ]; dump-dvb.stopsJson = "${stops}/stops.json"; } ]; @@ -245,7 +247,9 @@ ./modules/dump-dvb ./modules/user-stop-box/user.nix { - nixpkgs.overlays = [ radio-conf.overlay."aarch64-linux" decode-server.overlay."aarch64-linux" ]; + nixpkgs.overlays = [ + dump-dvb.overlays.default + ]; } ]; };