diff --git a/common.nix b/common.nix index 20facff..9c7d68c 100644 --- a/common.nix +++ b/common.nix @@ -9,6 +9,7 @@ networking.domain = "gemini.serokell.team"; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (pkg.pname) [ "vault" ]; vault-secrets = { vaultPrefix = "kv/sys/gemini/${config.networking.hostName}"; vaultAddress = "https://vault.serokell.org:8200"; diff --git a/flake.lock b/flake.lock index 9485696..a0669af 100644 --- a/flake.lock +++ b/flake.lock @@ -32,6 +32,22 @@ "type": "github" } }, + "HTTP_3": { + "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": { @@ -79,6 +95,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": { @@ -113,6 +144,23 @@ "type": "github" } }, + "cabal-32_3": { + "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": { @@ -147,6 +195,23 @@ "type": "github" } }, + "cabal-34_3": { + "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-36": { "flake": false, "locked": { @@ -181,6 +246,23 @@ "type": "github" } }, + "cabal-36_3": { + "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" + } + }, "cardano-shell": { "flake": false, "locked": { @@ -213,6 +295,22 @@ "type": "github" } }, + "cardano-shell_3": { + "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": 1684533115, @@ -235,11 +333,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1704875591, - "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=", + "lastModified": 1711973905, + "narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=", "owner": "serokell", "repo": "deploy-rs", - "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b", + "rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b", "type": "github" }, "original": { @@ -250,7 +348,7 @@ "deploy-rs_2": { "inputs": { "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "utils": "utils_2" }, "locked": { @@ -273,11 +371,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1686747123, - "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=", + "lastModified": 1648475189, + "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=", "owner": "serokell", "repo": "deploy-rs", - "rev": "724463b5a94daa810abfc64a4f87faef4e00f984", + "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3", "type": "github" }, "original": { @@ -287,16 +385,16 @@ }, "deploy-rs_4": { "inputs": { - "flake-compat": "flake-compat_11", - "nixpkgs": "nixpkgs_15", - "utils": "utils_5" + "flake-compat": "flake-compat_12", + "nixpkgs": "nixpkgs_19", + "utils": "utils_6" }, "locked": { - "lastModified": 1648475189, - "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=", + "lastModified": 1686747123, + "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=", "owner": "serokell", "repo": "deploy-rs", - "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3", + "rev": "724463b5a94daa810abfc64a4f87faef4e00f984", "type": "github" }, "original": { @@ -305,6 +403,39 @@ } }, "devshell": { + "inputs": { + "flake-utils": [ + "hermetic", + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "hermetic", + "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": [ "serokell-nix", @@ -336,6 +467,39 @@ } }, "dmerge": { + "inputs": { + "nixlib": [ + "hermetic", + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "nixpkgs" + ], + "yants": [ + "hermetic", + "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": [ "serokell-nix", @@ -402,11 +566,11 @@ "flake-compat_11": { "flake": false, "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "owner": "edolstra", "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { @@ -418,16 +582,17 @@ "flake-compat_12": { "flake": false, "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { - "id": "flake-compat", - "type": "indirect" + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" } }, "flake-compat_13": { @@ -440,6 +605,38 @@ "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, + "original": { + "id": "flake-compat", + "type": "indirect" + } + }, + "flake-compat_14": { + "flake": false, + "locked": { + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "hkm/gitlab-fix", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_15": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, "original": { "owner": "edolstra", "repo": "flake-compat", @@ -544,11 +741,11 @@ "flake-compat_8": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", "type": "github" }, "original": { @@ -560,11 +757,11 @@ "flake-compat_9": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", "type": "github" }, "original": { @@ -577,11 +774,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -591,39 +788,71 @@ }, "flake-utils_10": { "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { - "id": "flake-utils", - "type": "indirect" + "owner": "numtide", + "repo": "flake-utils", + "type": "github" } }, "flake-utils_11": { "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { - "id": "flake-utils", - "type": "indirect" - } - }, - "flake-utils_2": { - "locked": { - "lastModified": 1601282935, - "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", "owner": "numtide", "repo": "flake-utils", - "rev": "588973065fce51f4763287f0fda87a174d78bf48", + "type": "github" + } + }, + "flake-utils_12": { + "locked": { + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_13": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1601282935, + "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "588973065fce51f4763287f0fda87a174d78bf48", "type": "github" }, "original": { @@ -693,26 +922,25 @@ }, "flake-utils_7": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" + "id": "flake-utils", + "type": "indirect" } }, "flake-utils_8": { "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -723,11 +951,11 @@ }, "flake-utils_9": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -753,6 +981,23 @@ "type": "github" } }, + "get-tested-src_2": { + "flake": false, + "locked": { + "lastModified": 1704576937, + "narHash": "sha256-STgnzFljXb4deHTGrIQc56YMX7Unmiy8P9NWwkChbYI=", + "owner": "Kleidukos", + "repo": "get-tested", + "rev": "64f016a0c53edfe52c237301ce062455344b51ac", + "type": "github" + }, + "original": { + "owner": "Kleidukos", + "ref": "v0.1.6.0", + "repo": "get-tested", + "type": "github" + } + }, "ghc-8.6.5-iohk": { "flake": false, "locked": { @@ -787,6 +1032,23 @@ "type": "github" } }, + "ghc-8.6.5-iohk_3": { + "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" + } + }, "ghc980": { "flake": false, "locked": { @@ -879,7 +1141,7 @@ }, "gomod2nix": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "utils": "utils_3" }, "locked": { @@ -896,6 +1158,25 @@ "type": "github" } }, + "gomod2nix_2": { + "inputs": { + "nixpkgs": "nixpkgs_14", + "utils": "utils_5" + }, + "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" + } + }, "hackage": { "flake": false, "locked": { @@ -913,6 +1194,22 @@ } }, "hackage_2": { + "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_3": { "flake": false, "locked": { "lastModified": 1695860572, @@ -942,6 +1239,7 @@ "hydra": "hydra", "iserv-proxy": "iserv-proxy", "nixpkgs": [ + "hermetic", "serokell-nix", "haskell-nix", "nixpkgs-unstable" @@ -977,7 +1275,49 @@ "cabal-36": "cabal-36_2", "cardano-shell": "cardano-shell_2", "flake-compat": "flake-compat_10", + "flake-utils": "flake-utils_8", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", + "hackage": "hackage_2", + "hpc-coveralls": "hpc-coveralls_2", + "hydra": "hydra_2", + "iserv-proxy": "iserv-proxy_2", + "nixpkgs": [ + "serokell-nix", + "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": "stackage_2", + "tullia": "tullia_2" + }, + "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_3": { + "inputs": { + "HTTP": "HTTP_3", + "cabal-32": "cabal-32_3", + "cabal-34": "cabal-34_3", + "cabal-36": "cabal-36_3", + "cardano-shell": "cardano-shell_3", + "flake-compat": "flake-compat_14", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_3", "ghc980": "ghc980", "ghc99": "ghc99", "hackage": [ @@ -987,22 +1327,22 @@ "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", "hls-2.2": "hls-2.2", - "hpc-coveralls": "hpc-coveralls_2", - "hydra": "hydra_2", - "iserv-proxy": "iserv-proxy_2", + "hpc-coveralls": "hpc-coveralls_3", + "hydra": "hydra_3", + "iserv-proxy": "iserv-proxy_3", "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-2003": "nixpkgs-2003_3", + "nixpkgs-2105": "nixpkgs-2105_3", + "nixpkgs-2111": "nixpkgs-2111_3", + "nixpkgs-2205": "nixpkgs-2205_3", + "nixpkgs-2211": "nixpkgs-2211_3", "nixpkgs-2305": "nixpkgs-2305", - "nixpkgs-unstable": "nixpkgs-unstable_2", - "old-ghc-nix": "old-ghc-nix_2", + "nixpkgs-unstable": "nixpkgs-unstable_3", + "old-ghc-nix": "old-ghc-nix_3", "stackage": [ "tzbot", "stackage" @@ -1027,14 +1367,15 @@ "flake-utils": "flake-utils_2", "gitignore": "gitignore", "mix-to-nix": "mix-to-nix", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "serokell-nix": "serokell-nix" }, "locked": { - "lastModified": 1667538004, - "narHash": "sha256-0Qp3sUSPbrlA55Pd8urt9LYsBZWBR672duTPEFuGMt8=", + "lastModified": 1710772799, + "narHash": "sha256-jSLZNsBbAamw9VUnPcyDguugJ6DDUMZ1GWHNu8kVvwA=", "owner": "serokell", "repo": "hermetic", - "rev": "26c22e982423fcf8813ac63185ee432093384253", + "rev": "3526392f07211990694c46c14af547219a630d8b", "type": "github" }, "original": { @@ -1126,10 +1467,27 @@ "type": "github" } }, + "hpc-coveralls_3": { + "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_2", + "nix": "nix", "nixpkgs": [ + "hermetic", "serokell-nix", "haskell-nix", "hydra", @@ -1153,6 +1511,30 @@ "hydra_2": { "inputs": { "nix": "nix_4", + "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_3": { + "inputs": { + "nix": "nix_6", "nixpkgs": [ "tzbot", "haskell-nix", @@ -1175,6 +1557,31 @@ } }, "incl": { + "inputs": { + "nixlib": [ + "hermetic", + "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" + } + }, + "incl_2": { "inputs": { "nixlib": [ "serokell-nix", @@ -1216,6 +1623,23 @@ } }, "iserv-proxy_2": { + "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_3": { "flake": false, "locked": { "lastModified": 1691634696, @@ -1251,11 +1675,11 @@ "lowdown-src_2": { "flake": false, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "lastModified": 1632468475, + "narHash": "sha256-NNOm9CbdA8cuwbvaBHslGbPTiU6bh1Ao+MpEPx4rSGo=", "owner": "kristapsdz", "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "rev": "6bd668af3fd098bdd07a1bedd399564141e275da", "type": "github" }, "original": { @@ -1267,11 +1691,11 @@ "lowdown-src_3": { "flake": false, "locked": { - "lastModified": 1632468475, - "narHash": "sha256-NNOm9CbdA8cuwbvaBHslGbPTiU6bh1Ao+MpEPx4rSGo=", + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", "owner": "kristapsdz", "repo": "lowdown", - "rev": "6bd668af3fd098bdd07a1bedd399564141e275da", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "type": "github" }, "original": { @@ -1346,6 +1770,39 @@ } }, "n2c": { + "inputs": { + "flake-utils": [ + "hermetic", + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "hermetic", + "serokell-nix", + "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" + } + }, + "n2c_2": { "inputs": { "flake-utils": [ "serokell-nix", @@ -1379,20 +1836,20 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1662468690, - "narHash": "sha256-PyDDOsRZivWrny8ETA9UUgfKAJbkunHWoIWmPmQ18Wg=", - "owner": "nixos", + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", + "owner": "NixOS", "repo": "nix", - "rev": "73b3ba878a86e9a4d5e46fb16ce735b7dea4c929", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", "type": "github" }, "original": { - "owner": "nixos", - "ref": "2.10-maintenance", + "owner": "NixOS", + "ref": "2.11.0", "repo": "nix", "type": "github" } @@ -1401,6 +1858,7 @@ "inputs": { "flake-compat": "flake-compat_7", "flake-utils": [ + "hermetic", "serokell-nix", "haskell-nix", "tullia", @@ -1408,6 +1866,46 @@ "flake-utils" ], "gomod2nix": "gomod2nix", + "nixpkgs": [ + "hermetic", + "serokell-nix", + "haskell-nix", + "tullia", + "nixpkgs" + ], + "nixpkgs-lib": [ + "hermetic", + "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": [ + "serokell-nix", + "haskell-nix", + "tullia", + "nix2container", + "flake-utils" + ], + "gomod2nix": "gomod2nix_2", "nixpkgs": [ "serokell-nix", "haskell-nix", @@ -1438,7 +1936,7 @@ "nix2container": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1658567952, @@ -1454,31 +1952,29 @@ "type": "github" } }, - "nix_2": { + "nix2container_2": { "inputs": { - "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_6", - "nixpkgs-regression": "nixpkgs-regression_2" + "flake-utils": "flake-utils_9", + "nixpkgs": "nixpkgs_15" }, "locked": { - "lastModified": 1661606874, - "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", - "owner": "NixOS", - "repo": "nix", - "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2.11.0", - "repo": "nix", + "owner": "nlewo", + "repo": "nix2container", "type": "github" } }, - "nix_3": { + "nix_2": { "inputs": { - "lowdown-src": "lowdown-src_3", - "nixpkgs": "nixpkgs_10" + "lowdown-src": "lowdown-src_2", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1633098935, @@ -1493,6 +1989,27 @@ "type": "indirect" } }, + "nix_3": { + "inputs": { + "lowdown-src": "lowdown-src_3", + "nixpkgs": "nixpkgs_10", + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1662468690, + "narHash": "sha256-PyDDOsRZivWrny8ETA9UUgfKAJbkunHWoIWmPmQ18Wg=", + "owner": "nixos", + "repo": "nix", + "rev": "73b3ba878a86e9a4d5e46fb16ce735b7dea4c929", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "2.10-maintenance", + "repo": "nix", + "type": "github" + } + }, "nix_4": { "inputs": { "lowdown-src": "lowdown-src_4", @@ -1517,7 +2034,7 @@ "nix_5": { "inputs": { "lowdown-src": "lowdown-src_5", - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_17" }, "locked": { "lastModified": 1633098935, @@ -1535,23 +2052,66 @@ "nix_6": { "inputs": { "lowdown-src": "lowdown-src_6", - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_20", "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { - "lastModified": 1654239108, - "narHash": "sha256-0JzuElxLe5DxM+R4tvBYfvQnMGCERZy4KMRf0JYxxS4=", - "owner": "nixos", + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", + "owner": "NixOS", "repo": "nix", - "rev": "1dd7253133c4dfd2e7a16ad6fe505442cef38a5b", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", "type": "github" }, "original": { - "id": "nix", - "type": "indirect" + "owner": "NixOS", + "ref": "2.11.0", + "repo": "nix", + "type": "github" } }, "nixago": { + "inputs": { + "flake-utils": [ + "hermetic", + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "hermetic", + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "hermetic", + "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": [ "serokell-nix", @@ -1637,6 +2197,22 @@ "type": "github" } }, + "nixpkgs-2003_3": { + "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, @@ -1669,6 +2245,22 @@ "type": "github" } }, + "nixpkgs-2105_3": { + "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, @@ -1701,6 +2293,22 @@ "type": "github" } }, + "nixpkgs-2111_3": { + "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, @@ -1718,6 +2326,22 @@ } }, "nixpkgs-2205_2": { + "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_3": { "locked": { "lastModified": 1685573264, "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", @@ -1750,6 +2374,22 @@ } }, "nixpkgs-2211_2": { + "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_3": { "locked": { "lastModified": 1688392541, "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", @@ -1862,6 +2502,22 @@ } }, "nixpkgs-unstable_2": { + "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_3": { "locked": { "lastModified": 1690720142, "narHash": "sha256-GywuiZjBKfFkntQwpNQfL+Ksa2iGjPprBGL0/psgRZM=", @@ -1879,26 +2535,27 @@ }, "nixpkgs_10": { "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_11": { "locked": { - "lastModified": 1645433236, - "narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", - "owner": "nixos", + "lastModified": 1716813161, + "narHash": "sha256-o3TvfBnorelY5bgMld1if0VsbJdt+LQ+CPCKMGDcDLE=", + "owner": "serokell", "repo": "nixpkgs", - "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", + "rev": "714b6b0b33a5929d83477eebb7d7feeb5d093ffb", "type": "github" }, "original": { @@ -1908,11 +2565,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1671417167, - "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", + "lastModified": 1648219316, + "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7", + "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", "type": "github" }, "original": { @@ -1940,35 +2597,52 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1690887328, - "narHash": "sha256-G/W/wWRU3YS8F485OTI7srCz8NJVlIIlQZ9OFjdPKFg=", - "owner": "serokell", + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "998da51f6857c912aca93c51285cbf234f93c80b", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_15": { "locked": { - "lastModified": 1648219316, - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_16": { + "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_17": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -1983,13 +2657,13 @@ "type": "indirect" } }, - "nixpkgs_17": { + "nixpkgs_18": { "locked": { - "lastModified": 1674736538, - "narHash": "sha256-/DszFMkAgYyB9dTWKkoZa9i0zcrA6Z4hYrOr/u/FSxY=", - "owner": "serokell", + "lastModified": 1645433236, + "narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "1dfdbb65d77430fc0935e8592d0abc4addcce711", + "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", "type": "github" }, "original": { @@ -1997,18 +2671,18 @@ "type": "indirect" } }, - "nixpkgs_18": { + "nixpkgs_19": { "locked": { - "lastModified": 1645296114, - "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", + "lastModified": 1671417167, + "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", + "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-21.05-small", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -2027,7 +2701,7 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_20": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -2043,13 +2717,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_21": { "locked": { - "lastModified": 1705310182, - "narHash": "sha256-/xTQtRECIweQuipf5vjMcJLWsbznS4fiUpn7Qyli+wg=", + "lastModified": 1690887328, + "narHash": "sha256-G/W/wWRU3YS8F485OTI7srCz8NJVlIIlQZ9OFjdPKFg=", "owner": "serokell", "repo": "nixpkgs", - "rev": "f724378e6136e105e40a1b03e10e24258b8bf06f", + "rev": "998da51f6857c912aca93c51285cbf234f93c80b", "type": "github" }, "original": { @@ -2057,7 +2731,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1648219316, "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", @@ -2073,7 +2747,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -2089,7 +2763,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -2105,7 +2779,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -2120,7 +2794,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -2136,6 +2810,35 @@ "type": "github" } }, + "nixpkgs_8": { + "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_9": { + "locked": { + "lastModified": 1702386253, + "narHash": "sha256-gWyY0ZnlyugHRthZQBmFfxeKNDq2o6g7kaSU1lwyj74=", + "owner": "serokell", + "repo": "nixpkgs", + "rev": "4a0f28c92f803406ca2eed0cce08230447ad9d01", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nosys": { "locked": { "lastModified": 1667881534, @@ -2151,6 +2854,21 @@ "type": "github" } }, + "nosys_2": { + "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": { @@ -2185,6 +2903,23 @@ "type": "github" } }, + "old-ghc-nix_3": { + "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", @@ -2192,9 +2927,9 @@ "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", "hermetic": "hermetic", - "nix": "nix", - "nixpkgs": "nixpkgs_4", - "serokell-nix": "serokell-nix", + "nix": "nix_3", + "nixpkgs": "nixpkgs_11", + "serokell-nix": "serokell-nix_2", "stevenblack-hosts": "stevenblack-hosts", "subspace": "subspace", "terranix": "terranix", @@ -2211,39 +2946,42 @@ "get-tested-src": "get-tested-src", "gitignore-nix": "gitignore-nix", "haskell-nix": "haskell-nix", - "nix": "nix_3", - "nixpkgs": [ - "nixpkgs" - ] + "nix": "nix_2", + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1704890292, - "narHash": "sha256-nqMUzbh2aD1Ipfrvn94oEc3DGxjyG2nZ2gAkd2E9tQU=", + "lastModified": 1710322711, + "narHash": "sha256-1q44s86q35YLtT+y0FUPI9teTqrgNZMDqNcuDQDXz9w=", "owner": "serokell", "repo": "serokell.nix", - "rev": "bfd859fcb96aa912f4ca05b4afe4082114ca9ec7", + "rev": "b6bbeda170469574789f9128c9aadc3a9e91e512", "type": "github" }, "original": { - "id": "serokell-nix", - "type": "indirect" + "owner": "serokell", + "repo": "serokell.nix", + "type": "github" } }, "serokell-nix_2": { "inputs": { - "deploy-rs": "deploy-rs_4", - "flake-compat": "flake-compat_12", - "flake-utils": "flake-utils_10", + "deploy-rs": "deploy-rs_3", + "flake-compat": "flake-compat_9", + "flake-utils": "flake-utils_7", + "get-tested-src": "get-tested-src_2", "gitignore-nix": "gitignore-nix_2", + "haskell-nix": "haskell-nix_2", "nix": "nix_5", - "nixpkgs": "nixpkgs_17" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1677574306, - "narHash": "sha256-j4guhHbuI5E4drK6vHWvPprjsZSz+9kWDOQ8fLK3B8U=", + "lastModified": 1714382435, + "narHash": "sha256-9QRuDfgRS/6UVIgTZta/stl2tUShM0EE0ExRvscG+po=", "owner": "serokell", "repo": "serokell.nix", - "rev": "e38cd7173926841bba21f3e0149b2ec8a42d9719", + "rev": "0c102bb3a29c4eda5192f704d2cd6c5ce141cff6", "type": "github" }, "original": { @@ -2268,6 +3006,22 @@ } }, "stackage_2": { + "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_3": { "flake": false, "locked": { "lastModified": 1695859746, @@ -2285,6 +3039,7 @@ "std": { "inputs": { "arion": [ + "hermetic", "serokell-nix", "haskell-nix", "tullia", @@ -2297,6 +3052,7 @@ "flake-utils": "flake-utils_6", "incl": "incl", "makes": [ + "hermetic", "serokell-nix", "haskell-nix", "tullia", @@ -2304,6 +3060,7 @@ "blank" ], "microvm": [ + "hermetic", "serokell-nix", "haskell-nix", "tullia", @@ -2312,7 +3069,7 @@ ], "n2c": "n2c", "nixago": "nixago", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_7", "nosys": "nosys", "yants": "yants" }, @@ -2330,6 +3087,54 @@ "type": "github" } }, + "std_2": { + "inputs": { + "arion": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "blank" + ], + "blank": "blank_2", + "devshell": "devshell_2", + "dmerge": "dmerge_2", + "flake-utils": "flake-utils_10", + "incl": "incl_2", + "makes": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "blank" + ], + "microvm": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "blank" + ], + "n2c": "n2c_2", + "nixago": "nixago_2", + "nixpkgs": "nixpkgs_16", + "nosys": "nosys_2", + "yants": "yants_2" + }, + "locked": { + "lastModified": 1674526466, + "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=", + "owner": "divnix", + "repo": "std", + "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, "stevenblack-hosts": { "flake": false, "locked": { @@ -2349,8 +3154,8 @@ }, "subspace": { "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_11" + "flake-utils": "flake-utils_11", + "nixpkgs": "nixpkgs_18" }, "locked": { "lastModified": 1705471941, @@ -2396,26 +3201,11 @@ "type": "github" } }, - "systems_3": { - "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_8", + "flake-utils": "flake-utils_12", "nixpkgs": [ "nixpkgs" ], @@ -2493,6 +3283,7 @@ "nix-nomad": "nix-nomad", "nix2container": "nix2container", "nixpkgs": [ + "hermetic", "serokell-nix", "haskell-nix", "nixpkgs" @@ -2513,23 +3304,50 @@ "type": "github" } }, + "tullia_2": { + "inputs": { + "nix-nomad": "nix-nomad_2", + "nix2container": "nix2container_2", + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "nixpkgs" + ], + "std": "std_2" + }, + "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" + } + }, "tzbot": { "inputs": { - "deploy-rs": "deploy-rs_3", - "flake-compat": "flake-compat_9", - "flake-utils": "flake-utils_9", - "hackage": "hackage_2", - "haskell-nix": "haskell-nix_2", - "nixpkgs": "nixpkgs_14", - "serokell-nix": "serokell-nix_2", - "stackage": "stackage_2" + "deploy-rs": "deploy-rs_4", + "flake-compat": "flake-compat_13", + "flake-utils": "flake-utils_13", + "hackage": "hackage_3", + "haskell-nix": "haskell-nix_3", + "nixpkgs": "nixpkgs_21", + "serokell-nix": [ + "serokell-nix" + ], + "stackage": "stackage_3" }, "locked": { - "lastModified": 1705471955, - "narHash": "sha256-3P8bg2LVVgf1NOYO2c6QFwGWeWF5yzam5y8SDdfwUdU=", + "lastModified": 1715071125, + "narHash": "sha256-+MSFYYihw9mfGWOiHSmSQDHSZ4sVt1hO9lzv9kAL1co=", "owner": "serokell", "repo": "tzbot", - "rev": "e949663a380697a998d2e952378f774a3b009227", + "rev": "17219a06f8b58c985d96a2301da430de8f5dbcd5", "type": "github" }, "original": { @@ -2588,11 +3406,11 @@ }, "utils_4": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", "type": "github" }, "original": { @@ -2603,11 +3421,11 @@ }, "utils_5": { "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -2617,15 +3435,12 @@ } }, "utils_6": { - "inputs": { - "systems": "systems_3" - }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -2636,20 +3451,17 @@ }, "vault-secrets": { "inputs": { - "flake-compat": "flake-compat_13", - "flake-utils": "flake-utils_11", - "nix": "nix_6", + "flake-compat": "flake-compat_15", "nixpkgs": [ "nixpkgs" - ], - "utils": "utils_6" + ] }, "locked": { - "lastModified": 1705066493, - "narHash": "sha256-x5VxzYep3ANmk5t3H1gONEqqVZvpbDAKzlSA8r3mqjA=", + "lastModified": 1714988039, + "narHash": "sha256-ZYPX1Skhy9ZEfeRkAzdqO+MvjBdF4a7blrXcTJ3q/Yw=", "owner": "serokell", "repo": "vault-secrets", - "rev": "202f0231f9906e8fab094c2ffc5bf24995b6df8b", + "rev": "44ef2078d9149aa3b23fe132e8c8d8bbd624c06c", "type": "github" }, "original": { @@ -2675,6 +3487,31 @@ } }, "yants": { + "inputs": { + "nixpkgs": [ + "hermetic", + "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": [ "serokell-nix", diff --git a/flake.nix b/flake.nix index b60c05d..fe6d8e4 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,8 @@ tzbot.url = "github:serokell/tzbot"; + tzbot.inputs.serokell-nix.follows = "serokell-nix"; + serokell-nix.inputs.nixpkgs.follows = "nixpkgs"; vault-secrets.inputs.nixpkgs.follows = "nixpkgs"; @@ -43,7 +45,7 @@ allOverlays = [ serokell-nix.overlay - vault-secrets.overlay + vault-secrets.overlays.default composition-c4.overlays.default terranix-simple.overlay ]; @@ -90,7 +92,7 @@ let pkgsAllowUnfree = import nixpkgs { inherit system; - config.allowUnfreePredicate = pkg: builtins.elem (pkg.pname) [ "terraform" ]; + config.allowUnfreePredicate = pkg: builtins.elem (pkg.pname) [ "terraform" "vault" ]; }; pkgs = serokell-nix.lib.pkgsWith pkgsAllowUnfree allOverlays; diff --git a/servers/alzirr/deployment.nix b/servers/alzirr/deployment.nix index 1c8fed3..d603a36 100644 --- a/servers/alzirr/deployment.nix +++ b/servers/alzirr/deployment.nix @@ -116,25 +116,35 @@ in }; }; - vault-secrets.secrets.oauth2_proxy.environmentVariableNamePrefix = "OAUTH2_PROXY"; - services.oauth2_proxy = { + vault-secrets.secrets.oauth2_proxy = { + environmentVariableNamePrefix = "OAUTH2_PROXY"; + services = ["oauth2-proxy"]; + }; + services.oauth2-proxy = { enable = true; # contains oauth2 client id, oauth2 client secret, and a cookie secret seed for signing cookies keyFile = "${config.vault-secrets.secrets.oauth2_proxy}/environment"; requestLogging = false; # don't log each request - redirectURL = "https://tt.serokell.io/oauth2/callback"; # callback url for the auth provider + redirectURL = "https://auth-tt.serokell.io/oauth2/callback"; # callback url for the auth provider email.domains = [ "serokell.io" ]; # only allow users with '@serokell.io' email address - extraConfig.whitelist-domain = [ "tt.serokell.io" "tt2.serokell.io" ]; # allowed domains to redirect to after authentication + extraConfig.whitelist-domain = [ "tt.serokell.io" "tt2.serokell.io" "auth-tt.serokell.io" ]; # allowed domains to redirect to after authentication cookie.domain = "serokell.io"; # domain to set cookie for after authentication - nginx.virtualHosts = [ "swampwalk2" ]; # vhosts to use the proxy for - + nginx = { + virtualHosts = { "swampwalk2" = {}; }; # vhosts to use the proxy for + domain = "auth-tt.serokell.io"; + }; # default cookie name '_oauth2_proxy' is used by jupiter for # all '.serokell.io' subdomains, use a different name for tt cookie.name = "_oauth2_proxy_tt"; }; - - users.users.oauth2_proxy.group = "oauth2_proxy"; - users.groups.oauth2_proxy = {}; + services.nginx.virtualHosts."auth-tt.serokell.io" = { + serverName = "auth-tt.serokell.io"; + enableACME = true; + forceSSL = true; + locations."/" = { + return = "404"; + }; + }; } diff --git a/terraform/alzirr.nix b/terraform/alzirr.nix index b2ae396..c217088 100644 --- a/terraform/alzirr.nix +++ b/terraform/alzirr.nix @@ -16,6 +16,12 @@ in { type = "CNAME"; records = ["alzirr.\${aws_route53_zone.gemini_serokell_team.name}"]; }; + auth-tt_serokell_io = { + zone_id = "\${data.aws_route53_zone.serokell_io.zone_id}"; + name = "auth-tt.serokell.io"; + type = "CNAME"; + records = ["alzirr.\${aws_route53_zone.gemini_serokell_team.name}"]; + }; } // mkAddressRecords [{ resource = "alzirr_gemini_serokell_team"; zone_id = "\${aws_route53_zone.gemini_serokell_team.zone_id}";