From 8b16e002815b622768bdfa3c9797a3b8e7b4c467 Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Fri, 4 Aug 2023 02:01:17 +0000 Subject: [PATCH 1/6] Automatically update flake.lock to the latest version composition-c4 2175e6fc35 (2022-05-27) -> 0d3f787d71 (2023-05-19) deploy-rs 8c9ea9605e (2023-01-19) -> 724463b5a9 (2023-06-14) flake-utils 93a2b84fc4 (2023-03-15) -> 919d646de7 (2023-07-11) nix-npm-buildpackage d45296118c (2023-02-28) -> 991a792bcc (2023-06-09) nixpkgs 1dfdbb65d7 (2023-01-26) -> 998da51f68 (2023-08-01) serokell-nix e639aa7208 (2023-04-11) -> 851b937e52 (2023-08-03) terranix ac98723a6c (2023-02-10) -> c0dd150768 (2023-05-24) terranix-simple a6f1947a07 (2023-04-19) -> bf8c8112dd (2023-08-03) vault-secrets e4ec077c26 (2023-03-24) -> 30c5b1c532 (2023-06-15) --- flake.lock | 1336 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 1142 insertions(+), 194 deletions(-) diff --git a/flake.lock b/flake.lock index 932b7ae..3619d48 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,22 @@ "type": "github" } }, + "HTTP_2": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, "bats-assert": { "flake": false, "locked": { @@ -63,6 +79,21 @@ "type": "github" } }, + "blank_2": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, "cabal-32": { "flake": false, "locked": { @@ -80,7 +111,41 @@ "type": "github" } }, + "cabal-32_2": { + "flake": false, + "locked": { + "lastModified": 1603716527, + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "owner": "haskell", + "repo": "cabal", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.2", + "repo": "cabal", + "type": "github" + } + }, "cabal-34": { + "flake": false, + "locked": { + "lastModified": 1645834128, + "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", + "owner": "haskell", + "repo": "cabal", + "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, + "cabal-34_2": { "flake": false, "locked": { "lastModified": 1640353650, @@ -98,6 +163,23 @@ } }, "cabal-36": { + "flake": false, + "locked": { + "lastModified": 1669081697, + "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", + "owner": "haskell", + "repo": "cabal", + "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, + "cabal-36_2": { "flake": false, "locked": { "lastModified": 1641652457, @@ -130,13 +212,29 @@ "type": "github" } }, + "cardano-shell_2": { + "flake": false, + "locked": { + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "type": "github" + } + }, "composition-c4": { "locked": { - "lastModified": 1653632860, - "narHash": "sha256-ZG4sKVlgwqMTMigJefu9H1AlHpcuxDbaG8KiziBdii8=", + "lastModified": 1684533115, + "narHash": "sha256-a+qumQAxgUkeH5U/9b9X7JGeYn+61nV0Y/bCGU1FO/M=", "owner": "fossar", "repo": "composition-c4", - "rev": "2175e6fc35126255ca51fe6dec978f93f3ce7464", + "rev": "0d3f787d71ab954235491352887b69bf52c5e865", "type": "github" }, "original": { @@ -152,11 +250,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674127017, - "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=", + "lastModified": 1686747123, + "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=", "owner": "serokell", "repo": "deploy-rs", - "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77", + "rev": "724463b5a94daa810abfc64a4f87faef4e00f984", "type": "github" }, "original": { @@ -185,9 +283,9 @@ }, "deploy-rs_3": { "inputs": { - "flake-compat": "flake-compat_6", - "nixpkgs": "nixpkgs_9", - "utils": "utils_3" + "flake-compat": "flake-compat_8", + "nixpkgs": "nixpkgs_13", + "utils": "utils_4" }, "locked": { "lastModified": 1674127017, @@ -204,9 +302,9 @@ }, "deploy-rs_4": { "inputs": { - "flake-compat": "flake-compat_10", - "nixpkgs": "nixpkgs_15", - "utils": "utils_5" + "flake-compat": "flake-compat_12", + "nixpkgs": "nixpkgs_19", + "utils": "utils_6" }, "locked": { "lastModified": 1648475189, @@ -222,6 +320,37 @@ } }, "devshell": { + "inputs": { + "flake-utils": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "owner": "numtide", + "repo": "devshell", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_2": { "inputs": { "flake-utils": [ "tzbot", @@ -253,6 +382,37 @@ } }, "dmerge": { + "inputs": { + "nixlib": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "nixpkgs" + ], + "yants": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "data-merge", + "type": "github" + } + }, + "dmerge_2": { "inputs": { "nixlib": [ "tzbot", @@ -300,6 +460,38 @@ } }, "flake-compat_10": { + "flake": false, + "locked": { + "lastModified": 1635892615, + "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "eca47d3377946315596da653862d341ee5341318", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_11": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_12": { "flake": false, "locked": { "lastModified": 1648199409, @@ -315,7 +507,7 @@ "type": "github" } }, - "flake-compat_11": { + "flake-compat_13": { "flake": false, "locked": { "lastModified": 1627913399, @@ -330,7 +522,7 @@ "type": "indirect" } }, - "flake-compat_12": { + "flake-compat_14": { "flake": false, "locked": { "lastModified": 1673956053, @@ -410,15 +602,16 @@ "flake-compat_6": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "owner": "input-output-hk", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "input-output-hk", + "ref": "hkm/gitlab-fix", "repo": "flake-compat", "type": "github" } @@ -426,30 +619,31 @@ "flake-compat_7": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { - "id": "flake-compat", - "type": "indirect" + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" } }, "flake-compat_8": { "flake": false, "locked": { - "lastModified": 1635892615, - "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=", - "owner": "input-output-hk", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "eca47d3377946315596da653862d341ee5341318", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { - "owner": "input-output-hk", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } @@ -457,26 +651,28 @@ "flake-compat_9": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "id": "flake-compat", + "type": "indirect" } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -486,11 +682,11 @@ }, "flake-utils_10": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -501,29 +697,74 @@ }, "flake-utils_11": { "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { - "id": "flake-utils", - "type": "indirect" + "owner": "numtide", + "repo": "flake-utils", + "type": "github" } }, "flake-utils_12": { "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { - "id": "flake-utils", + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_13": { + "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" + } + }, + "flake-utils_14": { + "locked": { + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, + "flake-utils_15": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "id": "flake-utils", "type": "indirect" } }, @@ -558,11 +799,11 @@ }, "flake-utils_4": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -573,11 +814,11 @@ }, "flake-utils_5": { "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -588,11 +829,11 @@ }, "flake-utils_6": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -618,11 +859,11 @@ }, "flake-utils_8": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", "type": "github" }, "original": { @@ -633,11 +874,11 @@ }, "flake-utils_9": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -646,6 +887,23 @@ "type": "github" } }, + "get-tested-src": { + "flake": false, + "locked": { + "lastModified": 1687355864, + "narHash": "sha256-yQ4coxfnp2Jsw1kvwf2/Zn72Kltze2WrfHN54eLR070=", + "owner": "Sereja313", + "repo": "get-tested", + "rev": "455bbd047374ed907900b49641a4ea7f0a905709", + "type": "github" + }, + "original": { + "owner": "Sereja313", + "ref": "issue-8-emit-ghc-versions", + "repo": "get-tested", + "type": "github" + } + }, "ghc-8.6.5-iohk": { "flake": false, "locked": { @@ -663,6 +921,23 @@ "type": "github" } }, + "ghc-8.6.5-iohk_2": { + "flake": false, + "locked": { + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -718,8 +993,27 @@ }, "gomod2nix": { "inputs": { - "nixpkgs": "nixpkgs_11", - "utils": "utils_4" + "nixpkgs": "nixpkgs_8", + "utils": "utils_3" + }, + "locked": { + "lastModified": 1655245309, + "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, + "gomod2nix_2": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "utils": "utils_5" }, "locked": { "lastModified": 1655245309, @@ -736,6 +1030,22 @@ } }, "hackage": { + "flake": false, + "locked": { + "lastModified": 1678926579, + "narHash": "sha256-5t1QRBTsEM2wREtDf3xrHp9Kphs+AdQZKAEltaylIJQ=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "fb58b0ba5773c5f0211f284b0fae061426cf8267", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackage_2": { "flake": false, "locked": { "lastModified": 1675299877, @@ -757,18 +1067,15 @@ "cabal-34": "cabal-34", "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", - "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_7", + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_4", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "hackage": [ - "tzbot", - "hackage" - ], + "hackage": "hackage", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", "nixpkgs": [ - "tzbot", + "serokell-nix", "haskell-nix", "nixpkgs-unstable" ], @@ -779,11 +1086,56 @@ "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", + "stackage": "stackage", + "tullia": "tullia" + }, + "locked": { + "lastModified": 1678950661, + "narHash": "sha256-lvL54W90BTvwLVnFjPYmFVmgHyaGcFrt5FBy1F0rro8=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "fce554bc6a41d12f7a18a0e8290bf43f925d7a29", + "type": "github" + }, + "original": { + "id": "haskell-nix", + "type": "indirect" + } + }, + "haskell-nix_2": { + "inputs": { + "HTTP": "HTTP_2", + "cabal-32": "cabal-32_2", + "cabal-34": "cabal-34_2", + "cabal-36": "cabal-36_2", + "cardano-shell": "cardano-shell_2", + "flake-compat": "flake-compat_10", + "flake-utils": "flake-utils_10", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", + "hackage": [ + "tzbot", + "hackage" + ], + "hpc-coveralls": "hpc-coveralls_2", + "hydra": "hydra_2", + "iserv-proxy": "iserv-proxy_2", + "nixpkgs": [ + "tzbot", + "haskell-nix", + "nixpkgs-unstable" + ], + "nixpkgs-2003": "nixpkgs-2003_2", + "nixpkgs-2105": "nixpkgs-2105_2", + "nixpkgs-2111": "nixpkgs-2111_2", + "nixpkgs-2205": "nixpkgs-2205_2", + "nixpkgs-2211": "nixpkgs-2211_2", + "nixpkgs-unstable": "nixpkgs-unstable_2", + "old-ghc-nix": "old-ghc-nix_2", "stackage": [ "tzbot", "stackage" ], - "tullia": "tullia" + "tullia": "tullia_2" }, "locked": { "lastModified": 1671151873, @@ -836,9 +1188,49 @@ "type": "github" } }, + "hpc-coveralls_2": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "type": "github" + } + }, "hydra": { "inputs": { - "nix": "nix_3", + "nix": "nix_2", + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", + "owner": "NixOS", + "repo": "hydra", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, + "hydra_2": { + "inputs": { + "nix": "nix_4", "nixpkgs": [ "tzbot", "haskell-nix", @@ -860,7 +1252,48 @@ "type": "indirect" } }, + "incl": { + "inputs": { + "nixlib": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1669263024, + "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", + "owner": "divnix", + "repo": "incl", + "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, "iserv-proxy": { + "flake": false, + "locked": { + "lastModified": 1670983692, + "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=", + "ref": "hkm/remote-iserv", + "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300", + "revCount": 10, + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + }, + "original": { + "ref": "hkm/remote-iserv", + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + } + }, + "iserv-proxy_2": { "flake": false, "locked": { "lastModified": 1639165170, @@ -893,6 +1326,22 @@ } }, "lowdown-src_2": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "lowdown-src_3": { "flake": false, "locked": { "lastModified": 1632468475, @@ -908,7 +1357,7 @@ "type": "github" } }, - "lowdown-src_3": { + "lowdown-src_4": { "flake": false, "locked": { "lastModified": 1633514407, @@ -924,7 +1373,7 @@ "type": "github" } }, - "lowdown-src_4": { + "lowdown-src_5": { "flake": false, "locked": { "lastModified": 1632468475, @@ -940,7 +1389,7 @@ "type": "github" } }, - "lowdown-src_5": { + "lowdown-src_6": { "flake": false, "locked": { "lastModified": 1633514407, @@ -991,9 +1440,15 @@ }, "n2c": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "flake-utils" + ], "nixpkgs": [ - "tzbot", + "serokell-nix", "haskell-nix", "tullia", "std", @@ -1014,10 +1469,35 @@ "type": "github" } }, - "nix": { + "n2c_2": { "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_3", + "flake-utils": "flake-utils_13", + "nixpkgs": [ + "tzbot", + "haskell-nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": "nixpkgs_3", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -1037,15 +1517,53 @@ }, "nix-nomad": { "inputs": { - "flake-compat": "flake-compat_9", + "flake-compat": "flake-compat_7", "flake-utils": [ - "tzbot", + "serokell-nix", "haskell-nix", "tullia", "nix2container", "flake-utils" ], "gomod2nix": "gomod2nix", + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "tullia", + "nixpkgs" + ], + "nixpkgs-lib": [ + "serokell-nix", + "haskell-nix", + "tullia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658277770, + "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", + "owner": "tristanpemble", + "repo": "nix-nomad", + "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", + "type": "github" + }, + "original": { + "owner": "tristanpemble", + "repo": "nix-nomad", + "type": "github" + } + }, + "nix-nomad_2": { + "inputs": { + "flake-compat": "flake-compat_11", + "flake-utils": [ + "tzbot", + "haskell-nix", + "tullia", + "nix2container", + "flake-utils" + ], + "gomod2nix": "gomod2nix_2", "nixpkgs": [ "tzbot", "haskell-nix", @@ -1078,11 +1596,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1677562139, - "narHash": "sha256-J39FdMjECbWGSXVHmEdyGBD2aRYGhg9bWEPf1/ZR47k=", + "lastModified": 1686315622, + "narHash": "sha256-ccqZqY6wUFot0ewyNKQUrMR6IEliGza+pjKoSVMXIeM=", "owner": "serokell", "repo": "nix-npm-buildpackage", - "rev": "d45296118cae672982f192451dd3e19fa6c2d068", + "rev": "991a792bccd611842f6bc1aa99fe80380ad68d44", "type": "github" }, "original": { @@ -1093,8 +1611,27 @@ }, "nix2container": { "inputs": { - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_12" + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix2container_2": { + "inputs": { + "flake-utils": "flake-utils_11", + "nixpkgs": "nixpkgs_16" }, "locked": { "lastModified": 1658567952, @@ -1113,7 +1650,28 @@ "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_7", + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", + "owner": "NixOS", + "repo": "nix", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.11.0", + "repo": "nix", + "type": "github" + } + }, + "nix_3": { + "inputs": { + "lowdown-src": "lowdown-src_3", + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1633098935, @@ -1128,11 +1686,11 @@ "type": "indirect" } }, - "nix_3": { + "nix_4": { "inputs": { - "lowdown-src": "lowdown-src_3", - "nixpkgs": "nixpkgs_10", - "nixpkgs-regression": "nixpkgs-regression_2" + "lowdown-src": "lowdown-src_4", + "nixpkgs": "nixpkgs_14", + "nixpkgs-regression": "nixpkgs-regression_3" }, "locked": { "lastModified": 1643066034, @@ -1149,10 +1707,10 @@ "type": "github" } }, - "nix_4": { + "nix_5": { "inputs": { - "lowdown-src": "lowdown-src_4", - "nixpkgs": "nixpkgs_16" + "lowdown-src": "lowdown-src_5", + "nixpkgs": "nixpkgs_20" }, "locked": { "lastModified": 1633098935, @@ -1167,11 +1725,11 @@ "type": "indirect" } }, - "nix_5": { + "nix_6": { "inputs": { - "lowdown-src": "lowdown-src_5", - "nixpkgs": "nixpkgs_18", - "nixpkgs-regression": "nixpkgs-regression_3" + "lowdown-src": "lowdown-src_6", + "nixpkgs": "nixpkgs_22", + "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { "lastModified": 1654239108, @@ -1187,6 +1745,44 @@ } }, "nixago": { + "inputs": { + "flake-utils": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "owner": "nix-community", + "repo": "nixago", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, + "nixago_2": { "inputs": { "flake-utils": [ "tzbot", @@ -1256,6 +1852,22 @@ "type": "github" } }, + "nixpkgs-2003_2": { + "locked": { + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-2105": { "locked": { "lastModified": 1659914493, @@ -1272,6 +1884,22 @@ "type": "github" } }, + "nixpkgs-2105_2": { + "locked": { + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-2111": { "locked": { "lastModified": 1659446231, @@ -1288,7 +1916,39 @@ "type": "github" } }, + "nixpkgs-2111_2": { + "locked": { + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-2205": { + "locked": { + "lastModified": 1672580127, + "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0874168639713f547c05947c76124f78441ea46c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2205_2": { "locked": { "lastModified": 1663981975, "narHash": "sha256-TKaxWAVJR+a5JJauKZqibmaM5e/Pi5tBDx9s8fl/kSE=", @@ -1305,6 +1965,22 @@ } }, "nixpkgs-2211": { + "locked": { + "lastModified": 1675730325, + "narHash": "sha256-uNvD7fzO5hNlltNQUAFBPlcEjNG5Gkbhl/ROiX+GZU4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b7ce17b1ebf600a72178f6302c77b6382d09323f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2211_2": { "locked": { "lastModified": 1669997163, "narHash": "sha256-vhjC0kZMFoN6jzK0GR+tBzKi5KgBXgehadfidW8+Va4=", @@ -1337,6 +2013,22 @@ } }, "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-regression_3": { "locked": { "lastModified": 1643052045, "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", @@ -1351,7 +2043,7 @@ "type": "indirect" } }, - "nixpkgs-regression_3": { + "nixpkgs-regression_4": { "locked": { "lastModified": 1643052045, "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", @@ -1367,13 +2059,90 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs-unstable": { + "locked": { + "lastModified": 1675758091, + "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable_2": { + "locked": { + "lastModified": 1663905476, + "narHash": "sha256-0CSwRKaYravh9v6qSlBpM0gNg0UhKT2lL7Yn6Zbx7UM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e14f9fb57315f0d4abde222364f19f88c77d2b79", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_10": { + "locked": { + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1645433236, + "narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_13": { "locked": { - "lastModified": 1663905476, - "narHash": "sha256-0CSwRKaYravh9v6qSlBpM0gNg0UhKT2lL7Yn6Zbx7UM=", + "lastModified": 1671417167, + "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e14f9fb57315f0d4abde222364f19f88c77d2b79", + "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7", "type": "github" }, "original": { @@ -1383,7 +2152,7 @@ "type": "github" } }, - "nixpkgs_10": { + "nixpkgs_14": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -1398,7 +2167,7 @@ "type": "indirect" } }, - "nixpkgs_11": { + "nixpkgs_15": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -1414,7 +2183,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_16": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -1429,7 +2198,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_17": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -1445,7 +2214,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_18": { "locked": { "lastModified": 1674736538, "narHash": "sha256-/DszFMkAgYyB9dTWKkoZa9i0zcrA6Z4hYrOr/u/FSxY=", @@ -1459,7 +2228,7 @@ "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_19": { "locked": { "lastModified": 1648219316, "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", @@ -1475,7 +2244,21 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_2": { + "locked": { + "lastModified": 1602126357, + "narHash": "sha256-9CVubBIrWzdWZCVVa0uF5OHls19r5gZz3qMeEAJPowQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8aeaba64d757e5cc626ac525f7504308de83741f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_20": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -1490,7 +2273,7 @@ "type": "indirect" } }, - "nixpkgs_17": { + "nixpkgs_21": { "locked": { "lastModified": 1674736538, "narHash": "sha256-/DszFMkAgYyB9dTWKkoZa9i0zcrA6Z4hYrOr/u/FSxY=", @@ -1504,7 +2287,7 @@ "type": "indirect" } }, - "nixpkgs_18": { + "nixpkgs_22": { "locked": { "lastModified": 1645296114, "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", @@ -1520,7 +2303,7 @@ "type": "github" } }, - "nixpkgs_19": { + "nixpkgs_23": { "locked": { "lastModified": 1674736538, "narHash": "sha256-/DszFMkAgYyB9dTWKkoZa9i0zcrA6Z4hYrOr/u/FSxY=", @@ -1534,20 +2317,6 @@ "type": "indirect" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1602126357, - "narHash": "sha256-9CVubBIrWzdWZCVVa0uF5OHls19r5gZz3qMeEAJPowQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8aeaba64d757e5cc626ac525f7504308de83741f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_3": { "locked": { "lastModified": 1657693803, @@ -1580,11 +2349,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1674736538, - "narHash": "sha256-/DszFMkAgYyB9dTWKkoZa9i0zcrA6Z4hYrOr/u/FSxY=", + "lastModified": 1690887328, + "narHash": "sha256-G/W/wWRU3YS8F485OTI7srCz8NJVlIIlQZ9OFjdPKFg=", "owner": "serokell", "repo": "nixpkgs", - "rev": "1dfdbb65d77430fc0935e8592d0abc4addcce711", + "rev": "998da51f6857c912aca93c51285cbf234f93c80b", "type": "github" }, "original": { @@ -1610,49 +2379,66 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_8": { "locked": { - "lastModified": 1645433236, - "narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", - "owner": "nixos", + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1671417167, - "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, + "nosys": { + "locked": { + "lastModified": 1667881534, + "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", + "owner": "divnix", + "repo": "nosys", + "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "nosys", + "type": "github" + } + }, "old-ghc-nix": { "flake": false, "locked": { @@ -1670,6 +2456,23 @@ "type": "github" } }, + "old-ghc-nix_2": { + "flake": false, + "locked": { + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", + "owner": "angerman", + "repo": "old-ghc-nix", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "type": "github" + }, + "original": { + "owner": "angerman", + "ref": "master", + "repo": "old-ghc-nix", + "type": "github" + } + }, "root": { "inputs": { "composition-c4": "composition-c4", @@ -1694,18 +2497,20 @@ "deploy-rs": "deploy-rs_2", "flake-compat": "flake-compat_5", "flake-utils": "flake-utils_3", + "get-tested-src": "get-tested-src", "gitignore-nix": "gitignore-nix", - "nix": "nix_2", + "haskell-nix": "haskell-nix", + "nix": "nix_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1681214954, - "narHash": "sha256-iprckWofsTbHumIFQXwZmSVZ/wjnA/xRevKleoA9q4k=", + "lastModified": 1691074364, + "narHash": "sha256-MsTnPLKX1ToI9/yYGN2SW+qyFBWqA+H2nQfyNBQPrfg=", "owner": "serokell", "repo": "serokell.nix", - "rev": "e639aa7208337550ac4d27c5c7bdfbd921ad4291", + "rev": "851b937e522c0f58844097e420beb7723dd977aa", "type": "github" }, "original": { @@ -1716,11 +2521,11 @@ "serokell-nix_2": { "inputs": { "deploy-rs": "deploy-rs_4", - "flake-compat": "flake-compat_11", - "flake-utils": "flake-utils_11", + "flake-compat": "flake-compat_13", + "flake-utils": "flake-utils_14", "gitignore-nix": "gitignore-nix_2", - "nix": "nix_4", - "nixpkgs": "nixpkgs_17" + "nix": "nix_5", + "nixpkgs": "nixpkgs_21" }, "locked": { "lastModified": 1677574306, @@ -1736,6 +2541,22 @@ } }, "stackage": { + "flake": false, + "locked": { + "lastModified": 1678925630, + "narHash": "sha256-rl8qnpAUJl4tRZpaZ5DpgSueNfreArW09t4zTnOaoYA=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "bf29b23fb77017e78c6e7b199b2c7bfb5079c4cd", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, + "stackage_2": { "flake": false, "locked": { "lastModified": 1675210232, @@ -1752,20 +2573,27 @@ }, "std": { "inputs": { + "arion": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "blank" + ], "blank": "blank", "devshell": "devshell", "dmerge": "dmerge", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_6", + "incl": "incl", "makes": [ - "tzbot", + "serokell-nix", "haskell-nix", "tullia", "std", "blank" ], - "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", "microvm": [ - "tzbot", + "serokell-nix", "haskell-nix", "tullia", "std", @@ -1773,9 +2601,50 @@ ], "n2c": "n2c", "nixago": "nixago", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_10", + "nosys": "nosys", "yants": "yants" }, + "locked": { + "lastModified": 1674526466, + "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=", + "owner": "divnix", + "repo": "std", + "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "std_2": { + "inputs": { + "blank": "blank_2", + "devshell": "devshell_2", + "dmerge": "dmerge_2", + "flake-utils": "flake-utils_12", + "makes": [ + "tzbot", + "haskell-nix", + "tullia", + "std", + "blank" + ], + "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", + "microvm": [ + "tzbot", + "haskell-nix", + "tullia", + "std", + "blank" + ], + "n2c": "n2c_2", + "nixago": "nixago_2", + "nixpkgs": "nixpkgs_17", + "yants": "yants_2" + }, "locked": { "lastModified": 1665513321, "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", @@ -1809,8 +2678,8 @@ }, "subspace": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_8" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1669688895, @@ -1826,22 +2695,37 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "terranix": { "inputs": { "bats-assert": "bats-assert", "bats-support": "bats-support", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs" ], "terranix-examples": "terranix-examples" }, "locked": { - "lastModified": 1676043131, - "narHash": "sha256-xA3vUk86nFoDkYmW+bOgX/hTWWDdgumsJMlYE7iumgQ=", + "lastModified": 1684906298, + "narHash": "sha256-pNuJxmVMGbBHw7pa+Bx0HY0orXIXoyyAXOKuQ1zpfus=", "owner": "terranix", "repo": "terranix", - "rev": "ac98723a6c66fce3f91b0e8cbf8911430736f130", + "rev": "c0dd15076856c6cb425795b8c7d5d37d3a1e922a", "type": "github" }, "original": { @@ -1874,11 +2758,11 @@ "vpcModule": "vpcModule" }, "locked": { - "lastModified": 1681908195, - "narHash": "sha256-ne+Bo7GVPUPm7eIuIcWPN8Y1JrqucLyqgKcnCiwHI5c=", + "lastModified": 1691070634, + "narHash": "sha256-XnUsbqc2rJZ52oZAdqe3B7VpPxqkkk7QH178byj8eYw=", "ref": "refs/heads/main", - "rev": "a6f1947a07669738cf2503668d912da53c8d0ce6", - "revCount": 14, + "rev": "bf8c8112ddbc5d86baf2a908199ee651f7925834", + "revCount": 20, "type": "git", "url": "ssh://git@github.com/serokell/terranix-simple" }, @@ -1908,12 +2792,37 @@ "nix-nomad": "nix-nomad", "nix2container": "nix2container", "nixpkgs": [ - "tzbot", + "serokell-nix", "haskell-nix", "nixpkgs" ], "std": "std" }, + "locked": { + "lastModified": 1675695930, + "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=", + "owner": "input-output-hk", + "repo": "tullia", + "rev": "621365f2c725608f381b3ad5b57afef389fd4c31", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "tullia", + "type": "github" + } + }, + "tullia_2": { + "inputs": { + "nix-nomad": "nix-nomad_2", + "nix2container": "nix2container_2", + "nixpkgs": [ + "tzbot", + "haskell-nix", + "nixpkgs" + ], + "std": "std_2" + }, "locked": { "lastModified": 1668711738, "narHash": "sha256-CBjky16o9pqsGE1bWu6nRlRajgSXMEk+yaFQLibqXcE=", @@ -1931,13 +2840,13 @@ "tzbot": { "inputs": { "deploy-rs": "deploy-rs_3", - "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_6", - "hackage": "hackage", - "haskell-nix": "haskell-nix", - "nixpkgs": "nixpkgs_14", + "flake-compat": "flake-compat_9", + "flake-utils": "flake-utils_9", + "hackage": "hackage_2", + "haskell-nix": "haskell-nix_2", + "nixpkgs": "nixpkgs_18", "serokell-nix": "serokell-nix_2", - "stackage": "stackage" + "stackage": "stackage_2" }, "locked": { "lastModified": 1678351515, @@ -1984,6 +2893,21 @@ } }, "utils_3": { + "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_4": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -1998,7 +2922,7 @@ "type": "github" } }, - "utils_4": { + "utils_5": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -2013,7 +2937,7 @@ "type": "github" } }, - "utils_5": { + "utils_6": { "locked": { "lastModified": 1648297722, "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", @@ -2030,17 +2954,17 @@ }, "vault-secrets": { "inputs": { - "flake-compat": "flake-compat_12", - "flake-utils": "flake-utils_12", - "nix": "nix_5", - "nixpkgs": "nixpkgs_19" + "flake-compat": "flake-compat_14", + "flake-utils": "flake-utils_15", + "nix": "nix_6", + "nixpkgs": "nixpkgs_23" }, "locked": { - "lastModified": 1679628347, - "narHash": "sha256-FacS4utvrARToWss3REX/0KMiP87BXE+2xc3a+vrvQI=", + "lastModified": 1686833044, + "narHash": "sha256-pl5qH72KNOgS9ivj06Nh272HTPd5cYPSL768RsYiLDg=", "owner": "serokell", "repo": "vault-secrets", - "rev": "e4ec077c2650a6d5500b34d0baae2e0d4c61c2ff", + "rev": "30c5b1c532d10e40c8a196995acee675d7d731f2", "type": "github" }, "original": { @@ -2051,21 +2975,45 @@ "vpcModule": { "flake": false, "locked": { - "lastModified": 1647526450, - "narHash": "sha256-JnsoRylXCuav5UvfATacE7wQUoD6Xn6hsaQVJ9SJLI4=", + "lastModified": 1690309012, + "narHash": "sha256-yaPySYttfHLdlqLQpX5FnsJuulGGaRgbM8sPvtpKp44=", "owner": "terraform-aws-modules", "repo": "terraform-aws-vpc", - "rev": "e02118633f268ff1f86021a8fa9f3afcd1c37d85", + "rev": "fbd4ff646b4caaa6fcc1fb71bc88d377cc8b3b48", "type": "github" }, "original": { "owner": "terraform-aws-modules", + "ref": "v5.1.1", "repo": "terraform-aws-vpc", - "rev": "e02118633f268ff1f86021a8fa9f3afcd1c37d85", "type": "github" } }, "yants": { + "inputs": { + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667096281, + "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", + "owner": "divnix", + "repo": "yants", + "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } + }, + "yants_2": { "inputs": { "nixpkgs": [ "tzbot", From 8c90e1eee7b11f6ad8bce3434ac29d0e034afc6c Mon Sep 17 00:00:00 2001 From: Roman Melnikov Date: Fri, 4 Aug 2023 13:43:51 +0200 Subject: [PATCH 2/6] [Repin] Update HCloud terraform instances definition Base VM image name is now mandatory. --- terraform/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/common.nix b/terraform/common.nix index 3e34ff6..abe13b6 100644 --- a/terraform/common.nix +++ b/terraform/common.nix @@ -11,6 +11,7 @@ in { mkHcloud = {name, ssh_keys}: mkHcloud { inherit name ssh_keys; server_type = "cx11"; + image = "ubuntu-20.04"; # Install NixOS 20.09 user_data = '' #cloud-config From e31cba1e87409a13e3ed5c1f39000266c7500f3e Mon Sep 17 00:00:00 2001 From: Roman Melnikov Date: Fri, 4 Aug 2023 13:44:19 +0200 Subject: [PATCH 3/6] Build corsProxy using 'buildNpmPackage' from nixpkgs This way it works :shrug: --- flake.lock | 157 ++++++++++++++++------------------------- flake.nix | 4 +- modules/cors-proxy.nix | 9 ++- 3 files changed, 69 insertions(+), 101 deletions(-) diff --git a/flake.lock b/flake.lock index 3619d48..03f2181 100644 --- a/flake.lock +++ b/flake.lock @@ -265,7 +265,7 @@ "deploy-rs_2": { "inputs": { "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "utils": "utils_2" }, "locked": { @@ -284,7 +284,7 @@ "deploy-rs_3": { "inputs": { "flake-compat": "flake-compat_8", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "utils": "utils_4" }, "locked": { @@ -303,7 +303,7 @@ "deploy-rs_4": { "inputs": { "flake-compat": "flake-compat_12", - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_18", "utils": "utils_6" }, "locked": { @@ -993,7 +993,7 @@ }, "gomod2nix": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "utils": "utils_3" }, "locked": { @@ -1012,7 +1012,7 @@ }, "gomod2nix_2": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_14", "utils": "utils_5" }, "locked": { @@ -1591,28 +1591,10 @@ "type": "github" } }, - "nix-npm-buildpackage": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1686315622, - "narHash": "sha256-ccqZqY6wUFot0ewyNKQUrMR6IEliGza+pjKoSVMXIeM=", - "owner": "serokell", - "repo": "nix-npm-buildpackage", - "rev": "991a792bccd611842f6bc1aa99fe80380ad68d44", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "nix-npm-buildpackage", - "type": "github" - } - }, "nix2container": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1658567952, @@ -1631,7 +1613,7 @@ "nix2container_2": { "inputs": { "flake-utils": "flake-utils_11", - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1658567952, @@ -1650,7 +1632,7 @@ "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -1671,7 +1653,7 @@ "nix_3": { "inputs": { "lowdown-src": "lowdown-src_3", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1633098935, @@ -1689,7 +1671,7 @@ "nix_4": { "inputs": { "lowdown-src": "lowdown-src_4", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "nixpkgs-regression": "nixpkgs-regression_3" }, "locked": { @@ -1710,7 +1692,7 @@ "nix_5": { "inputs": { "lowdown-src": "lowdown-src_5", - "nixpkgs": "nixpkgs_20" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1633098935, @@ -1728,7 +1710,7 @@ "nix_6": { "inputs": { "lowdown-src": "lowdown-src_6", - "nixpkgs": "nixpkgs_22", + "nixpkgs": "nixpkgs_21", "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { @@ -2092,22 +2074,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -2122,7 +2088,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1645433236, "narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", @@ -2136,7 +2102,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1671417167, "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", @@ -2152,7 +2118,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -2167,7 +2133,7 @@ "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -2183,7 +2149,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -2198,7 +2164,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_16": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -2214,7 +2180,7 @@ "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_17": { "locked": { "lastModified": 1674736538, "narHash": "sha256-/DszFMkAgYyB9dTWKkoZa9i0zcrA6Z4hYrOr/u/FSxY=", @@ -2228,7 +2194,7 @@ "type": "indirect" } }, - "nixpkgs_19": { + "nixpkgs_18": { "locked": { "lastModified": 1648219316, "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", @@ -2244,36 +2210,36 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_19": { "locked": { - "lastModified": 1602126357, - "narHash": "sha256-9CVubBIrWzdWZCVVa0uF5OHls19r5gZz3qMeEAJPowQ=", + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8aeaba64d757e5cc626ac525f7504308de83741f", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", "type": "github" }, "original": { "id": "nixpkgs", + "ref": "nixos-21.05-small", "type": "indirect" } }, - "nixpkgs_20": { + "nixpkgs_2": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "lastModified": 1602126357, + "narHash": "sha256-9CVubBIrWzdWZCVVa0uF5OHls19r5gZz3qMeEAJPowQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "8aeaba64d757e5cc626ac525f7504308de83741f", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.05-small", "type": "indirect" } }, - "nixpkgs_21": { + "nixpkgs_20": { "locked": { "lastModified": 1674736538, "narHash": "sha256-/DszFMkAgYyB9dTWKkoZa9i0zcrA6Z4hYrOr/u/FSxY=", @@ -2287,7 +2253,7 @@ "type": "indirect" } }, - "nixpkgs_22": { + "nixpkgs_21": { "locked": { "lastModified": 1645296114, "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", @@ -2303,13 +2269,13 @@ "type": "github" } }, - "nixpkgs_23": { + "nixpkgs_22": { "locked": { - "lastModified": 1674736538, - "narHash": "sha256-/DszFMkAgYyB9dTWKkoZa9i0zcrA6Z4hYrOr/u/FSxY=", + "lastModified": 1690887328, + "narHash": "sha256-G/W/wWRU3YS8F485OTI7srCz8NJVlIIlQZ9OFjdPKFg=", "owner": "serokell", "repo": "nixpkgs", - "rev": "1dfdbb65d77430fc0935e8592d0abc4addcce711", + "rev": "998da51f6857c912aca93c51285cbf234f93c80b", "type": "github" }, "original": { @@ -2334,20 +2300,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1653917367, - "narHash": "sha256-04MsJC0g9kE01nBuXThMppZK+yvCZECQnUaZKSU+HJo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "437c8e6554911095f0557d524e9d2ffe1c26e33a", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1690887328, "narHash": "sha256-G/W/wWRU3YS8F485OTI7srCz8NJVlIIlQZ9OFjdPKFg=", @@ -2361,7 +2313,7 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1648219316, "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", @@ -2377,7 +2329,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -2393,7 +2345,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -2409,7 +2361,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -2424,6 +2376,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nosys": { "locked": { "lastModified": 1667881534, @@ -2481,8 +2449,7 @@ "flake-utils": "flake-utils", "hermetic": "hermetic", "nix": "nix", - "nix-npm-buildpackage": "nix-npm-buildpackage", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "serokell-nix": "serokell-nix", "stevenblack-hosts": "stevenblack-hosts", "subspace": "subspace", @@ -2525,7 +2492,7 @@ "flake-utils": "flake-utils_14", "gitignore-nix": "gitignore-nix_2", "nix": "nix_5", - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_20" }, "locked": { "lastModified": 1677574306, @@ -2601,7 +2568,7 @@ ], "n2c": "n2c", "nixago": "nixago", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nosys": "nosys", "yants": "yants" }, @@ -2642,7 +2609,7 @@ ], "n2c": "n2c_2", "nixago": "nixago_2", - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_16", "yants": "yants_2" }, "locked": { @@ -2679,7 +2646,7 @@ "subspace": { "inputs": { "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1669688895, @@ -2844,7 +2811,7 @@ "flake-utils": "flake-utils_9", "hackage": "hackage_2", "haskell-nix": "haskell-nix_2", - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_17", "serokell-nix": "serokell-nix_2", "stackage": "stackage_2" }, @@ -2957,7 +2924,7 @@ "flake-compat": "flake-compat_14", "flake-utils": "flake-utils_15", "nix": "nix_6", - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_22" }, "locked": { "lastModified": 1686833044, diff --git a/flake.nix b/flake.nix index abbeaae..d2f2017 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,6 @@ # inputs.nixpkgs.follows = "nixpkgs"; }; - nix-npm-buildpackage.url = "github:serokell/nix-npm-buildpackage"; tzbot.url = "github:serokell/tzbot"; serokell-nix.inputs.nixpkgs.follows = "nixpkgs"; @@ -36,7 +35,7 @@ }; outputs = { self, nix, nixpkgs, serokell-nix, deploy-rs, flake-utils, vault-secrets - , composition-c4, nix-npm-buildpackage, terranix, terranix-simple, ... }@inputs: + , composition-c4, terranix, terranix-simple, ... }@inputs: let inherit (nixpkgs.lib) nixosSystem filterAttrs const recursiveUpdate; inherit (builtins) readDir mapAttrs attrNames; @@ -45,7 +44,6 @@ serokell-nix.overlay vault-secrets.overlay composition-c4.overlays.default - nix-npm-buildpackage.overlays.default terranix-simple.overlay ]; diff --git a/modules/cors-proxy.nix b/modules/cors-proxy.nix index 0cb90c5..fb7e550 100644 --- a/modules/cors-proxy.nix +++ b/modules/cors-proxy.nix @@ -1,6 +1,8 @@ { config, lib, pkgs, ... }: let - cors-proxy = (pkgs.extend (self: super: {nodejs = super.nodejs-14_x;})).buildNpmPackage { + cors-proxy = pkgs.buildNpmPackage { + name = "cors-proxy"; + npmDepsHash = "sha256-csWMR3cHLrdePxaOMnwWeohP/zYaNaHuA+myx43zERg="; src = pkgs.fetchFromGitHub { owner = "isomorphic-git"; repo = "cors-proxy"; @@ -8,8 +10,9 @@ let rev = "1b1c91e71d946544d97ccc7cf0ac62b859e03311"; sha256 = "sha256-YnSYVeq9Irc2QexvSuE7wq+hi8OGZhlLE2JlbRqzMi4="; }; + dontNpmBuild = true; postInstall = '' - wrapProgram $out/bin/npm --prefix PATH : ${pkgs.lib.makeBinPath (with pkgs; [ nodejs-14_x ])} + wrapProgram $out/bin/@isomorphic-git/cors-proxy --prefix PATH : ${pkgs.lib.makeBinPath (with pkgs; [ nodejs-18_x ])} ''; }; cfg = config.services.cors-proxy; @@ -40,7 +43,7 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; script = '' - ${cfg.package}/bin/npm start + ${cfg.package}/bin/@isomorphic-git/cors-proxy start ''; environment = { PORT = toString cfg.port; From 6bb3e0da9c1762f3d72d777eda7f7ee6e17150bb Mon Sep 17 00:00:00 2001 From: Roman Melnikov Date: Fri, 4 Aug 2023 13:46:01 +0200 Subject: [PATCH 4/6] Update vault-secrets nixpkgs input to follow the existing nixpkgs input Vault-secrets scripts and modules are essentially nixpkgs-version-agnostic. Making it use the same nixpkgs revision as the root flake reduces the overall number of various used nixpkgs revisions which reduces the time needed for evaluation and build. --- flake.lock | 18 +++--------------- flake.nix | 1 + 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 03f2181..787c9f4 100644 --- a/flake.lock +++ b/flake.lock @@ -2269,20 +2269,6 @@ "type": "github" } }, - "nixpkgs_22": { - "locked": { - "lastModified": 1690887328, - "narHash": "sha256-G/W/wWRU3YS8F485OTI7srCz8NJVlIIlQZ9OFjdPKFg=", - "owner": "serokell", - "repo": "nixpkgs", - "rev": "998da51f6857c912aca93c51285cbf234f93c80b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_3": { "locked": { "lastModified": 1657693803, @@ -2924,7 +2910,9 @@ "flake-compat": "flake-compat_14", "flake-utils": "flake-utils_15", "nix": "nix_6", - "nixpkgs": "nixpkgs_22" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1686833044, diff --git a/flake.nix b/flake.nix index d2f2017..1625f88 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,7 @@ tzbot.url = "github:serokell/tzbot"; serokell-nix.inputs.nixpkgs.follows = "nixpkgs"; + vault-secrets.inputs.nixpkgs.follows = "nixpkgs"; terranix-simple = { url = "git+ssh://git@github.com/serokell/terranix-simple"; From f0e02318976b93f6f1ca832c5e30f48054561f90 Mon Sep 17 00:00:00 2001 From: Roman Melnikov Date: Fri, 4 Aug 2023 13:48:46 +0200 Subject: [PATCH 5/6] [Repin] Update alzirr configuration Problem: Some modules options were renamed as well as some additional checks were added in some of them. Solution: Update configuration to make them buildable (almost) without warnings. --- servers/alzirr/platform.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/alzirr/platform.nix b/servers/alzirr/platform.nix index 8f3e4f2..8ab9591 100644 --- a/servers/alzirr/platform.nix +++ b/servers/alzirr/platform.nix @@ -18,7 +18,7 @@ swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 12; + nix.settings.max-jobs = lib.mkDefault 12; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; # Use GRUB2 as the boot loader. @@ -49,7 +49,7 @@ ''; # The RAIDs are assembled in stage1, so we need to make the config # available there. - boot.initrd.mdadmConf = config.environment.etc."mdadm.conf".text; + boot.swraid.mdadmConf = config.environment.etc."mdadm.conf".text; # Default mdmonitor service does not work, fix it by directing events to the log. # See https://github.com/NixOS/nixpkgs/issues/72394 From 103b66d5869e668d2c9104182ee80f406879f952 Mon Sep 17 00:00:00 2001 From: Roman Melnikov Date: Fri, 4 Aug 2023 14:17:08 +0200 Subject: [PATCH 6/6] Remove mentions of mekbuda from README Problem: Mekbuda was decommissioned some time ago, however, README still mentions it. Solution: Remove its mention from README. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 885d685..5b7ba68 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ All necessary programs and dependencies are provided by Nix in `nix-shell` or `n | Castor | EDNA Staging | | | Jishui | EDNA Demo | | | Mebsuta | vpn.serokell.net | | -| Mekbuda | MTProxy server | | | Tejat Prior | Mumble + tzbot | | | Wasat | Old Wireguard server | |