From 2160e73b2454e0cac05653d43ebda43b58fc81d2 Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Mon, 7 Oct 2024 02:01:06 +0000 Subject: [PATCH] Automatically update flake.lock to the latest version deploy-rs 3867348fa9 (2024-06-12) -> aa07eb0553 (2024-09-27) flake-utils b1d9ab7066 (2024-03-11) -> c1dfcf0841 (2024-09-17) nixpkgs fe065f84d7 (2024-07-01) -> 4fc18e4ca8 (2024-09-18) nixpkgs-unstable d413e712d5 (2024-09-15) -> 1a53b400e5 (2024-10-07) serokell-nix 0c102bb3a2 (2024-04-29) -> b1287098ad (2024-09-26) terranix-simple a20a78c431 (2023-09-20) -> f2fd41c433 (2024-09-27) tzbot 17219a06f8 (2024-05-07) -> 028d9f17fe (2024-09-03) --- flake.lock | 873 +++++++++++++++++++++++++++++++++++++++++++++-------- flake.nix | 8 +- 2 files changed, 748 insertions(+), 133 deletions(-) diff --git a/flake.lock b/flake.lock index 5fe41ff..4928525 100644 --- a/flake.lock +++ b/flake.lock @@ -48,6 +48,22 @@ "type": "github" } }, + "HTTP_4": { + "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": { @@ -161,6 +177,23 @@ "type": "github" } }, + "cabal-32_4": { + "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": { @@ -212,6 +245,23 @@ "type": "github" } }, + "cabal-34_4": { + "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": { @@ -263,6 +313,23 @@ "type": "github" } }, + "cabal-36_4": { + "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": { @@ -311,6 +378,22 @@ "type": "github" } }, + "cardano-shell_4": { + "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, @@ -333,11 +416,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1718194053, - "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=", + "lastModified": 1727447169, + "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=", "owner": "serokell", "repo": "deploy-rs", - "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a", + "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76", "type": "github" }, "original": { @@ -367,7 +450,7 @@ "deploy-rs_3": { "inputs": { "flake-compat": "flake-compat_8", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "utils": "utils_4" }, "locked": { @@ -385,7 +468,7 @@ }, "deploy-rs_4": { "inputs": { - "flake-compat": "flake-compat_12", + "flake-compat": "flake-compat_13", "nixpkgs": "nixpkgs_19", "utils": "utils_6" }, @@ -580,6 +663,23 @@ } }, "flake-compat_12": { + "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_13": { "flake": false, "locked": { "lastModified": 1668681692, @@ -595,7 +695,7 @@ "type": "github" } }, - "flake-compat_13": { + "flake-compat_14": { "flake": false, "locked": { "lastModified": 1673956053, @@ -610,7 +710,7 @@ "type": "indirect" } }, - "flake-compat_14": { + "flake-compat_15": { "flake": false, "locked": { "lastModified": 1672831974, @@ -627,7 +727,7 @@ "type": "github" } }, - "flake-compat_15": { + "flake-compat_16": { "flake": false, "locked": { "lastModified": 1696426674, @@ -774,11 +874,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -802,6 +902,24 @@ } }, "flake-utils_11": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_12": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -816,7 +934,7 @@ "type": "github" } }, - "flake-utils_12": { + "flake-utils_13": { "locked": { "lastModified": 1634851050, "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", @@ -831,7 +949,7 @@ "type": "github" } }, - "flake-utils_13": { + "flake-utils_14": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -1049,6 +1167,23 @@ "type": "github" } }, + "ghc-8.6.5-iohk_4": { + "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": { @@ -1068,7 +1203,44 @@ "url": "https://gitlab.haskell.org/ghc/ghc" } }, + "ghc98X": { + "flake": false, + "locked": { + "lastModified": 1696643148, + "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", + "ref": "ghc-9.8", + "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", + "revCount": 61642, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "ref": "ghc-9.8", + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, "ghc99": { + "flake": false, + "locked": { + "lastModified": 1701580282, + "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", + "ref": "refs/heads/master", + "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", + "revCount": 62197, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, + "ghc99_2": { "flake": false, "locked": { "lastModified": 1693974777, @@ -1160,7 +1332,7 @@ }, "gomod2nix_2": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "utils": "utils_5" }, "locked": { @@ -1210,6 +1382,22 @@ } }, "hackage_3": { + "flake": false, + "locked": { + "lastModified": 1706660549, + "narHash": "sha256-vSYdk5Z40Cr6AlOKZEsOto5gIsI/egsxoDRBpp6lmd8=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "a2751becae6189be230fe9d2582ea9464d79442e", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackage_4": { "flake": false, "locked": { "lastModified": 1695860572, @@ -1291,7 +1479,7 @@ "nixpkgs-2111": "nixpkgs-2111_2", "nixpkgs-2205": "nixpkgs-2205_2", "nixpkgs-2211": "nixpkgs-2211_2", - "nixpkgs-unstable": "nixpkgs-unstable_3", + "nixpkgs-unstable": "nixpkgs-unstable_2", "old-ghc-nix": "old-ghc-nix_2", "stackage": "stackage_2", "tullia": "tullia_2" @@ -1310,29 +1498,84 @@ } }, "haskell-nix_3": { + "inputs": { + "HTTP": "HTTP_4", + "cabal-32": "cabal-32_4", + "cabal-34": "cabal-34_4", + "cabal-36": "cabal-36_4", + "cardano-shell": "cardano-shell_4", + "flake-compat": "flake-compat_15", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_4", + "ghc980": "ghc980", + "ghc99": "ghc99_2", + "hackage": [ + "tzbot", + "hackage" + ], + "hls-1.10": "hls-1.10_2", + "hls-2.0": "hls-2.0_2", + "hls-2.2": "hls-2.2_2", + "hpc-coveralls": "hpc-coveralls_4", + "hydra": "hydra_4", + "iserv-proxy": "iserv-proxy_4", + "nixpkgs": [ + "tzbot", + "haskell-nix", + "nixpkgs-unstable" + ], + "nixpkgs-2003": "nixpkgs-2003_4", + "nixpkgs-2105": "nixpkgs-2105_4", + "nixpkgs-2111": "nixpkgs-2111_4", + "nixpkgs-2205": "nixpkgs-2205_4", + "nixpkgs-2211": "nixpkgs-2211_4", + "nixpkgs-2305": "nixpkgs-2305_2", + "nixpkgs-unstable": "nixpkgs-unstable_4", + "old-ghc-nix": "old-ghc-nix_4", + "stackage": [ + "tzbot", + "stackage" + ] + }, + "locked": { + "lastModified": 1695689411, + "narHash": "sha256-t2q1IyuigbRpDLsAPzquhsSI5O71c4k3RyzI/c/WZJY=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "8e42ccd7ed75cd8eeb4cfb47e8ac8dae549e96ae", + "type": "github" + }, + "original": { + "id": "haskell-nix", + "type": "indirect" + } + }, + "haskellNix": { "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", + "flake-compat": "flake-compat_12", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_3", - "ghc980": "ghc980", + "ghc98X": "ghc98X", "ghc99": "ghc99", - "hackage": [ - "tzbot", - "hackage" - ], + "hackage": "hackage_3", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", "hls-2.2": "hls-2.2", + "hls-2.3": "hls-2.3", + "hls-2.4": "hls-2.4", + "hls-2.5": "hls-2.5", + "hls-2.6": "hls-2.6", "hpc-coveralls": "hpc-coveralls_3", "hydra": "hydra_3", "iserv-proxy": "iserv-proxy_3", + "nix-tools-static": "nix-tools-static", "nixpkgs": [ - "tzbot", - "haskell-nix", + "serokell-nix", + "weeder-src", + "haskellNix", "nixpkgs-unstable" ], "nixpkgs-2003": "nixpkgs-2003_3", @@ -1341,24 +1584,23 @@ "nixpkgs-2205": "nixpkgs-2205_3", "nixpkgs-2211": "nixpkgs-2211_3", "nixpkgs-2305": "nixpkgs-2305", - "nixpkgs-unstable": "nixpkgs-unstable_4", + "nixpkgs-2311": "nixpkgs-2311", + "nixpkgs-unstable": "nixpkgs-unstable_3", "old-ghc-nix": "old-ghc-nix_3", - "stackage": [ - "tzbot", - "stackage" - ] + "stackage": "stackage_3" }, "locked": { - "lastModified": 1695689411, - "narHash": "sha256-t2q1IyuigbRpDLsAPzquhsSI5O71c4k3RyzI/c/WZJY=", + "lastModified": 1706662202, + "narHash": "sha256-gTGsgdlXXwcsSgQxQkxcv1iOS90m8Xr8ze5i5BnCbo0=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "8e42ccd7ed75cd8eeb4cfb47e8ac8dae549e96ae", + "rev": "7ea60f43d7f104bd5764c11d566ce726b6a681ab", "type": "github" }, "original": { - "id": "haskell-nix", - "type": "indirect" + "owner": "input-output-hk", + "repo": "haskell.nix", + "type": "github" } }, "hermetic": { @@ -1401,6 +1643,23 @@ "type": "github" } }, + "hls-1.10_2": { + "flake": false, + "locked": { + "lastModified": 1680000865, + "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "1.10.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-2.0": { "flake": false, "locked": { @@ -1418,6 +1677,23 @@ "type": "github" } }, + "hls-2.0_2": { + "flake": false, + "locked": { + "lastModified": 1687698105, + "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "783905f211ac63edf982dd1889c671653327e441", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.0.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-2.2": { "flake": false, "locked": { @@ -1435,6 +1711,91 @@ "type": "github" } }, + "hls-2.2_2": { + "flake": false, + "locked": { + "lastModified": 1693064058, + "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.2.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.3": { + "flake": false, + "locked": { + "lastModified": 1695910642, + "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.3.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.4": { + "flake": false, + "locked": { + "lastModified": 1699862708, + "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.4.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.5": { + "flake": false, + "locked": { + "lastModified": 1701080174, + "narHash": "sha256-fyiR9TaHGJIIR0UmcCb73Xv9TJq3ht2ioxQ2mT7kVdc=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "27f8c3d3892e38edaef5bea3870161815c4d014c", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.5.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.6": { + "flake": false, + "locked": { + "lastModified": 1705325287, + "narHash": "sha256-+P87oLdlPyMw8Mgoul7HMWdEvWP/fNlo8jyNtwME8E8=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "6e0b342fa0327e628610f2711f8c3e4eaaa08b1e", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.6.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -1483,6 +1844,22 @@ "type": "github" } }, + "hpc-coveralls_4": { + "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", @@ -1510,7 +1887,7 @@ }, "hydra_2": { "inputs": { - "nix": "nix_4", + "nix": "nix_3", "nixpkgs": [ "serokell-nix", "haskell-nix", @@ -1533,6 +1910,31 @@ } }, "hydra_3": { + "inputs": { + "nix": "nix_5", + "nixpkgs": [ + "serokell-nix", + "weeder-src", + "haskellNix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", + "owner": "NixOS", + "repo": "hydra", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, + "hydra_4": { "inputs": { "nix": "nix_6", "nixpkgs": [ @@ -1656,6 +2058,23 @@ "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" } }, + "iserv-proxy_4": { + "flake": false, + "locked": { + "lastModified": 1691634696, + "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", + "ref": "hkm/remote-iserv", + "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", + "revCount": 14, + "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" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -1707,11 +2126,11 @@ "lowdown-src_4": { "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": { @@ -1723,11 +2142,11 @@ "lowdown-src_5": { "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": { @@ -1933,6 +2352,23 @@ "type": "github" } }, + "nix-tools-static": { + "flake": false, + "locked": { + "lastModified": 1706266250, + "narHash": "sha256-9t+GRk3eO9muCtKdNAwBtNBZ5dH1xHcnS17WaQyftwA=", + "owner": "input-output-hk", + "repo": "haskell-nix-example", + "rev": "580cb6db546a7777dad3b9c0fa487a366c045c4e", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "nix", + "repo": "haskell-nix-example", + "type": "github" + } + }, "nix2container": { "inputs": { "flake-utils": "flake-utils_5", @@ -1955,7 +2391,7 @@ "nix2container_2": { "inputs": { "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1658567952, @@ -1990,31 +2426,10 @@ } }, "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", - "nixpkgs": "nixpkgs_13", - "nixpkgs-regression": "nixpkgs-regression_3" + "inputs": { + "lowdown-src": "lowdown-src_3", + "nixpkgs": "nixpkgs_12", + "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { "lastModified": 1661606874, @@ -2031,10 +2446,10 @@ "type": "github" } }, - "nix_5": { + "nix_4": { "inputs": { - "lowdown-src": "lowdown-src_5", - "nixpkgs": "nixpkgs_17" + "lowdown-src": "lowdown-src_4", + "nixpkgs": "nixpkgs_16" }, "locked": { "lastModified": 1633098935, @@ -2049,6 +2464,27 @@ "type": "indirect" } }, + "nix_5": { + "inputs": { + "lowdown-src": "lowdown-src_5", + "nixpkgs": "nixpkgs_17", + "nixpkgs-regression": "nixpkgs-regression_3" + }, + "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_6": { "inputs": { "lowdown-src": "lowdown-src_6", @@ -2213,6 +2649,22 @@ "type": "github" } }, + "nixpkgs-2003_4": { + "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, @@ -2261,6 +2713,22 @@ "type": "github" } }, + "nixpkgs-2105_4": { + "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, @@ -2309,6 +2777,22 @@ "type": "github" } }, + "nixpkgs-2111_4": { + "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, @@ -2357,6 +2841,22 @@ "type": "github" } }, + "nixpkgs-2205_4": { + "locked": { + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-2211": { "locked": { "lastModified": 1675730325, @@ -2405,7 +2905,39 @@ "type": "github" } }, + "nixpkgs-2211_4": { + "locked": { + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-2305": { + "locked": { + "lastModified": 1701362232, + "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2305_2": { "locked": { "lastModified": 1690680713, "narHash": "sha256-NXCWA8N+GfSQyoN7ZNiOgq/nDJKOp5/BHEpiZP8sUZw=", @@ -2421,6 +2953,22 @@ "type": "github" } }, + "nixpkgs-2311": { + "locked": { + "lastModified": 1701386440, + "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -2503,32 +3051,33 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1726430219, - "narHash": "sha256-LjRTuUjkvTvmnfSSBmXYMguYQE8JuAYLWyUtFDpR0Lg=", - "owner": "nixos", + "lastModified": 1675758091, + "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "d413e712d5340e38102108c49f5989fb86bdb117", + "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable_3": { "locked": { - "lastModified": 1675758091, - "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", + "lastModified": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", "type": "github" } }, @@ -2550,27 +3099,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1719840997, - "narHash": "sha256-Qcz4H+7u5xu+81el88at+8lGHyEZ7pNwk6nAcyzdkts=", + "lastModified": 1726646111, + "narHash": "sha256-/3AvN4QMz/tajuU5rA2MBecUQ51Qgo73KTQT+skS1uE=", "owner": "serokell", "repo": "nixpkgs", - "rev": "fe065f84d7faf5aec1ba29bfcc8b7993bf2dcf8a", + "rev": "4fc18e4ca848c9a5b402e48d4b30155965cfce60", "type": "github" }, "original": { @@ -2578,7 +3111,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1648219316, "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", @@ -2594,7 +3127,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -2610,7 +3143,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -2626,7 +3159,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -2641,7 +3174,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -2657,7 +3190,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_16": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -2672,6 +3205,22 @@ "type": "indirect" } }, + "nixpkgs_17": { + "locked": { + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_18": { "locked": { "lastModified": 1645433236, @@ -2935,6 +3484,23 @@ "type": "github" } }, + "old-ghc-nix_4": { + "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", @@ -2942,9 +3508,7 @@ "flake-compat": "flake-compat_2", "flake-utils": "flake-utils", "hermetic": "hermetic", - "nix": "nix_3", - "nixpkgs": "nixpkgs_11", - "nixpkgs-unstable": "nixpkgs-unstable_2", + "nixpkgs": "nixpkgs_10", "serokell-nix": "serokell-nix_2", "stevenblack-hosts": "stevenblack-hosts", "subspace": "subspace", @@ -2987,17 +3551,18 @@ "get-tested-src": "get-tested-src_2", "gitignore-nix": "gitignore-nix_2", "haskell-nix": "haskell-nix_2", - "nix": "nix_5", + "nix": "nix_4", "nixpkgs": [ "nixpkgs" - ] + ], + "weeder-src": "weeder-src" }, "locked": { - "lastModified": 1714382435, - "narHash": "sha256-9QRuDfgRS/6UVIgTZta/stl2tUShM0EE0ExRvscG+po=", + "lastModified": 1727347530, + "narHash": "sha256-qtyo8yCLC3zBGCD4b32aAAZTi4b0jZlDwSvvWl86n38=", "owner": "serokell", "repo": "serokell.nix", - "rev": "0c102bb3a29c4eda5192f704d2cd6c5ce141cff6", + "rev": "b1287098adee8f7517828fa00a64cb99e6e58a53", "type": "github" }, "original": { @@ -3038,6 +3603,22 @@ } }, "stackage_3": { + "flake": false, + "locked": { + "lastModified": 1706659779, + "narHash": "sha256-MfXSjpyFPUPpKuDAaRUNbeTPRQLxa88h7gVnitZ5YDk=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "d3f2896c19425d021387668dc51d031921b0c0de", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, + "stackage_4": { "flake": false, "locked": { "lastModified": 1695859746, @@ -3133,7 +3714,7 @@ ], "n2c": "n2c_2", "nixago": "nixago_2", - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_15", "nosys": "nosys_2", "yants": "yants_2" }, @@ -3170,7 +3751,7 @@ }, "subspace": { "inputs": { - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_12", "nixpkgs": "nixpkgs_18" }, "locked": { @@ -3217,11 +3798,26 @@ "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_12", + "flake-utils": "flake-utils_13", "nixpkgs": [ "nixpkgs" ], @@ -3265,11 +3861,11 @@ "vpcModule": "vpcModule" }, "locked": { - "lastModified": 1695195165, - "narHash": "sha256-Kni2w4Exs+rgj09NcmZy9NIpjFrgpX9ypfUPUYbvHHk=", + "lastModified": 1727430212, + "narHash": "sha256-ujxQHXqgRjbK3h6wNhcDNa2bJsDrRHS8GkSJTx1mPhQ=", "ref": "refs/heads/main", - "rev": "a20a78c4315e4e82d5c3e54ea27ec902e07627e8", - "revCount": 22, + "rev": "f2fd41c43316f15ec3ebfa253cb6c0bd962e0bac", + "revCount": 24, "type": "git", "url": "ssh://git@github.com/serokell/terranix-simple" }, @@ -3348,22 +3944,22 @@ "tzbot": { "inputs": { "deploy-rs": "deploy-rs_4", - "flake-compat": "flake-compat_13", - "flake-utils": "flake-utils_13", - "hackage": "hackage_3", + "flake-compat": "flake-compat_14", + "flake-utils": "flake-utils_14", + "hackage": "hackage_4", "haskell-nix": "haskell-nix_3", "nixpkgs": "nixpkgs_21", "serokell-nix": [ "serokell-nix" ], - "stackage": "stackage_3" + "stackage": "stackage_4" }, "locked": { - "lastModified": 1715071125, - "narHash": "sha256-+MSFYYihw9mfGWOiHSmSQDHSZ4sVt1hO9lzv9kAL1co=", + "lastModified": 1725347241, + "narHash": "sha256-KoQ89uzkrZGtc8Z4FWJZyox4lYEbJbX0Y4LY2uHDaBY=", "owner": "serokell", "repo": "tzbot", - "rev": "17219a06f8b58c985d96a2301da430de8f5dbcd5", + "rev": "028d9f17fe1aa056ad131e180a682680383fed46", "type": "github" }, "original": { @@ -3467,7 +4063,7 @@ }, "vault-secrets": { "inputs": { - "flake-compat": "flake-compat_15", + "flake-compat": "flake-compat_16", "nixpkgs": [ "nixpkgs" ] @@ -3502,6 +4098,31 @@ "type": "github" } }, + "weeder-src": { + "inputs": { + "flake-utils": "flake-utils_11", + "haskellNix": "haskellNix", + "nixpkgs": [ + "serokell-nix", + "weeder-src", + "haskellNix", + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1708614127, + "narHash": "sha256-p3CDTt3CB6XeXrNi17gCyrFUVe5WVcyT4peq1e5vSb8=", + "owner": "ocharles", + "repo": "weeder", + "rev": "2a75a61782457d99bdcf70a8df8ce1c5df0b1db8", + "type": "github" + }, + "original": { + "owner": "ocharles", + "repo": "weeder", + "type": "github" + } + }, "yants": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 2223179..71d6365 100644 --- a/flake.nix +++ b/flake.nix @@ -6,14 +6,12 @@ }; inputs = { - nix.url = "github:nixos/nix/2.10-maintenance"; flake-compat.flake = false; hermetic.url = "github:serokell/hermetic"; stevenblack-hosts = { url = "github:StevenBlack/hosts/3.7.1"; flake = false; }; - nixpkgs-unstable.url = "github:nixos/nixpkgs"; composition-c4.url = "github:fossar/composition-c4"; subspace = { url = "github:serokell/subspace"; @@ -38,7 +36,7 @@ terranix.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nix, nixpkgs, serokell-nix, deploy-rs, flake-utils, vault-secrets + outputs = { self, nixpkgs, serokell-nix, deploy-rs, flake-utils, vault-secrets , composition-c4, terranix, terranix-simple, ... }@inputs: let inherit (nixpkgs.lib) nixosSystem filterAttrs const recursiveUpdate; @@ -49,9 +47,6 @@ vault-secrets.overlays.default composition-c4.overlays.default terranix-simple.overlay - (self: prev: { - xray = inputs.nixpkgs-unstable.legacyPackages.${self.system}.xray; - }) ]; servers = mapAttrs (path: _: import (./servers + "/${path}")) @@ -127,7 +122,6 @@ pkgs.vault (pkgs.vault-push-approle-envs self) (pkgs.vault-push-approles self) - nix.packages.${system}.nix pkgs.awscli ]; };