From 7c2ffdaf61b52b97c5c7a996467e023d404c282b Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 5 May 2025 12:04:25 +0200 Subject: [PATCH 1/9] Update `cardano-node` flake input to 10.3.1 Re-generate the entire lockfile (updating also other non locked inputs) --- flake.lock | 870 +++++------------------------------------------------ flake.nix | 2 +- 2 files changed, 78 insertions(+), 794 deletions(-) diff --git a/flake.lock b/flake.lock index c795fa8..2830422 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ "CHaP_2": { "flake": false, "locked": { - "lastModified": 1735857786, - "narHash": "sha256-X6Fp2uU++62rgaH4J1pIN5AalfV7f9rM5dmFaByMWqU=", + "lastModified": 1744135613, + "narHash": "sha256-ifKgooWGq45UYjweO0dOBE1rLBvf7tq/Co1Ob/8E8O0=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "b9eaf0bbe60ccf64b7afc969b79f9820a4534bcf", + "rev": "143757ad1f38ddd9698696bd2e6c8ebb84eb2adf", "type": "github" }, "original": { @@ -66,36 +66,6 @@ "type": "github" } }, - "blank": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "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" - } - }, "blockfrost": { "inputs": { "nixpkgs": "nixpkgs" @@ -135,16 +105,16 @@ "blst_2": { "flake": false, "locked": { - "lastModified": 1691598027, - "narHash": "sha256-oqljy+ZXJAXEB/fJtmB8rlAr4UXM+Z2OkDa20gpILNA=", + "lastModified": 1739372843, + "narHash": "sha256-IlbNMLBjs/dvGogcdbWQIL+3qwy7EXJbIDpo4xBd4bY=", "owner": "supranational", "repo": "blst", - "rev": "3dd0f804b1819e5d03fb22ca2e6fac105932043a", + "rev": "8c7db7fe8d2ce6e76dc398ebd4d475c0ec564355", "type": "github" }, "original": { "owner": "supranational", - "ref": "v0.3.11", + "ref": "v0.3.14", "repo": "blst", "type": "github" } @@ -251,21 +221,6 @@ "type": "github" } }, - "call-flake": { - "locked": { - "lastModified": 1687380775, - "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", - "owner": "divnix", - "repo": "call-flake", - "rev": "74061f6c241227cd05e79b702db9a300a2e4131a", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "call-flake", - "type": "github" - } - }, "cardano-automation": { "inputs": { "flake-utils": "flake-utils", @@ -276,15 +231,14 @@ "nixpkgs": [ "cardano-node", "nixpkgs" - ], - "tullia": "tullia" + ] }, "locked": { - "lastModified": 1679408951, - "narHash": "sha256-xM78upkrXjRu/739V/IxFrA9m+6rvgOiolt4ReKLAog=", + "lastModified": 1741965132, + "narHash": "sha256-SjNEfsLa+2FKS4GlszaH0fO/QGJbooNFMYU1GVdJToo=", "owner": "input-output-hk", "repo": "cardano-automation", - "rev": "628f135d243d4a9e388c187e4c6179246038ee72", + "rev": "78d16a837d74a72822041ee1b970daa73ac83b9e", "type": "github" }, "original": { @@ -324,7 +278,7 @@ }, "cardano-mainnet-mirror": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1642701714, @@ -349,34 +303,29 @@ "customConfig": "customConfig", "em": "em", "empty-flake": "empty-flake", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "hackageNix": "hackageNix_2", "haskellNix": "haskellNix_2", - "hostNixpkgs": [ - "cardano-node", - "nixpkgs" - ], + "incl": "incl", "iohkNix": "iohkNix_2", "nixpkgs": [ "cardano-node", "haskellNix", "nixpkgs-unstable" ], - "ops-lib": "ops-lib", - "std": "std_2", - "utils": "utils_3" + "utils": "utils_2" }, "locked": { - "lastModified": 1736202991, - "narHash": "sha256-Oys38YkpSpB48/H2NseP9kTWXm92a7kjAZtdnorcIEY=", + "lastModified": 1744738758, + "narHash": "sha256-XIuwW/D6uZ9BVxMUElZa8XyXWllMvDP96fTJ0vdXVL8=", "owner": "intersectmbo", "repo": "cardano-node", - "rev": "1f63dbf2ab39e0b32bf6901dc203866d3e37de08", + "rev": "b3f237b75e64f4d8142af95b053e2828221d707f", "type": "github" }, "original": { "owner": "intersectmbo", - "ref": "10.1.4", + "ref": "10.3.1", "repo": "cardano-node", "type": "github" } @@ -415,11 +364,11 @@ }, "crane": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1746291859, + "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", "type": "github" }, "original": { @@ -446,11 +395,11 @@ "devour-flake": { "flake": false, "locked": { - "lastModified": 1726283167, - "narHash": "sha256-Cvc84VzvvdmehafnaIPfdPylNWJcDmv79QQh/MH/4Qk=", + "lastModified": 1738639461, + "narHash": "sha256-R7MHvTh5fskzxNLBe9bher+GQBZ8ZHjz75CPQG3fSRI=", "owner": "srid", "repo": "devour-flake", - "rev": "9b96d31a55be119df8496ec5b7369823deec8a1c", + "rev": "9fe4db872c107ea217c13b24527b68d9e4a4c01b", "type": "github" }, "original": { @@ -461,27 +410,16 @@ }, "devshell": { "inputs": { - "flake-utils": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "flake-utils" - ], "nixpkgs": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", "nixpkgs" ] }, "locked": { - "lastModified": 1663445644, - "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "lastModified": 1741473158, + "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", "owner": "numtide", "repo": "devshell", - "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", "type": "github" }, "original": { @@ -490,90 +428,6 @@ "type": "github" } }, - "devshell_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "dmerge": { - "inputs": { - "nixlib": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "nixpkgs" - ], - "yants": [ - "cardano-node", - "cardano-automation", - "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": { - "haumea": [ - "cardano-node", - "std", - "haumea" - ], - "nixlib": [ - "cardano-node", - "std", - "lib" - ], - "yants": [ - "cardano-node", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1686862774, - "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=", - "owner": "divnix", - "repo": "dmerge", - "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96", - "type": "github" - }, - "original": { - "owner": "divnix", - "ref": "0.2.1", - "repo": "dmerge", - "type": "github" - } - }, "em": { "flake": false, "locked": { @@ -640,22 +494,6 @@ } }, "flake-compat_3": { - "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_4": { "flake": false, "locked": { "lastModified": 1647532380, @@ -672,7 +510,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1672831974, @@ -689,7 +527,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -710,11 +548,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -753,51 +591,6 @@ "type": "github" } }, - "flake-utils_2": { - "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_3": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "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" - } - }, "ghc-8.6.5-iohk": { "flake": false, "locked": { @@ -890,25 +683,6 @@ "type": "github" } }, - "gomod2nix": { - "inputs": { - "nixpkgs": "nixpkgs_3", - "utils": "utils_2" - }, - "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" - } - }, "hackageNix": { "flake": false, "locked": { @@ -928,15 +702,16 @@ "hackageNix_2": { "flake": false, "locked": { - "lastModified": 1729039425, - "narHash": "sha256-sIglYcw8Dacj4n0bRlUWo+NLkDMcVi6vtmKvUyG+ZrQ=", + "lastModified": 1743639862, + "narHash": "sha256-/8gnbtlgJ4mO0c8GGOdaiKg7nQF1NqFQUAt6d+pBpMI=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "6dc43e5e01f113ce151056a8f94bce7bb2f13eb9", + "rev": "6857f977e2167e0b75b6f56c50347fa234a67e94", "type": "github" }, "original": { "owner": "input-output-hk", + "ref": "for-stackage", "repo": "hackage.nix", "type": "github" } @@ -1005,7 +780,7 @@ "cabal-34": "cabal-34_2", "cabal-36": "cabal-36_2", "cardano-shell": "cardano-shell_2", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", "ghc910X": "ghc910X", "ghc911": "ghc911", @@ -1055,29 +830,6 @@ "type": "github" } }, - "haumea": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1685133229, - "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", - "owner": "nix-community", - "repo": "haumea", - "rev": "34dd58385092a23018748b50f9b23de6266dffc2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v0.2.2", - "repo": "haumea", - "type": "github" - } - }, "hercules-ci-effects": { "inputs": { "flake-parts": [ @@ -1507,18 +1259,14 @@ }, "incl": { "inputs": { - "nixlib": [ - "cardano-node", - "std", - "lib" - ] + "nixlib": "nixlib" }, "locked": { - "lastModified": 1669263024, - "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", + "lastModified": 1693483555, + "narHash": "sha256-Beq4WhSeH3jRTZgC1XopTSU10yLpK1nmMcnGoXO0XYo=", "owner": "divnix", "repo": "incl", - "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", + "rev": "526751ad3d1e23b07944b14e3f6b7a5948d3007b", "type": "github" }, "original": { @@ -1562,11 +1310,11 @@ "sodium": "sodium_2" }, "locked": { - "lastModified": 1728687575, - "narHash": "sha256-38uD8SqT557eh5yyRYuthKm1yTtiWzAN0FH7L/01QKM=", + "lastModified": 1744130217, + "narHash": "sha256-Lql0s3Occ6gKLvjcqTPK6vW4l1jwNn/UV7uaVpB/jTg=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "86c2bd46e8a08f62ea38ffe77cb4e9c337b42217", + "rev": "dd47887a0482bfb1399c9da77175933876d0f4ab", "type": "github" }, "original": { @@ -1609,21 +1357,6 @@ "type": "github" } }, - "lib": { - "locked": { - "lastModified": 1694306727, - "narHash": "sha256-26fkTOJOI65NOTNKFvtcJF9mzzf/kK9swHzfYt1Dl6Q=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "c30b6a84c0b84ec7aecbe74466033facc9ed103f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "lowdown-src": { "flake": false, "locked": { @@ -1656,47 +1389,6 @@ "type": "github" } }, - "mdbook-kroki-preprocessor": { - "flake": false, - "locked": { - "lastModified": 1661755005, - "narHash": "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw=", - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "rev": "93adb5716d035829efed27f65f2f0833a7d3e76f", - "type": "github" - }, - "original": { - "owner": "JoelCourtney", - "repo": "mdbook-kroki-preprocessor", - "type": "github" - } - }, - "n2c": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "cardano-node", - "cardano-automation", - "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", @@ -1718,67 +1410,10 @@ "type": "github" } }, - "nix-nomad": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": [ - "cardano-node", - "cardano-automation", - "tullia", - "nix2container", - "flake-utils" - ], - "gomod2nix": "gomod2nix", - "nixpkgs": [ - "cardano-node", - "cardano-automation", - "tullia", - "nixpkgs" - ], - "nixpkgs-lib": [ - "cardano-node", - "cardano-automation", - "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" - } - }, - "nix2container": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1658567952, - "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_4", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -1796,41 +1431,18 @@ "type": "github" } }, - "nixago": { - "inputs": { - "flake-utils": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "flake-utils" - ], - "nixago-exts": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "blank" - ], - "nixpkgs": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "nixpkgs" - ] - }, + "nixlib": { "locked": { - "lastModified": 1661824785, - "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "lastModified": 1667696192, + "narHash": "sha256-hOdbIhnpWvtmVynKcsj10nxz9WROjZja+1wRAJ/C9+s=", "owner": "nix-community", - "repo": "nixago", - "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "repo": "nixpkgs.lib", + "rev": "babd9cd2ca6e413372ed59fbb1ecc3c3a5fd3e5b", "type": "github" }, "original": { "owner": "nix-community", - "repo": "nixago", + "repo": "nixpkgs.lib", "type": "github" } }, @@ -2092,14 +1704,17 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-regression": { @@ -2183,53 +1798,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "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_6": { "locked": { "lastModified": 1642336556, "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", @@ -2243,7 +1811,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_4": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -2259,29 +1827,13 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1708343346, - "narHash": "sha256-qlzHvterVRzS8fS0ophQpkh0rqw0abijHEOAKm0HmV0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9312b935a538684049cb668885e60f15547d4c5f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { + "nixpkgs_5": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -2291,21 +1843,6 @@ "type": "github" } }, - "nosys": { - "locked": { - "lastModified": 1668010795, - "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", - "owner": "divnix", - "repo": "nosys", - "rev": "feade0141487801c71ff55623b421ed535dbdefa", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "nosys", - "type": "github" - } - }, "old-ghc-nix": { "flake": false, "locked": { @@ -2340,28 +1877,12 @@ "type": "github" } }, - "ops-lib": { - "flake": false, - "locked": { - "lastModified": 1713366514, - "narHash": "sha256-0hNlv+grFTE+TeXIbxSY97QoEEaUupOKMusZ4PesdrQ=", - "owner": "input-output-hk", - "repo": "ops-lib", - "rev": "19d83fa8eab1c0b7765f736eb4e8569d84d3e39d", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "ops-lib", - "type": "github" - } - }, "oura": { "inputs": { "crane": [ "crane" ], - "utils": "utils_4" + "utils": "utils_3" }, "locked": { "lastModified": 1729716427, @@ -2378,70 +1899,20 @@ "type": "github" } }, - "paisano": { - "inputs": { - "call-flake": "call-flake", - "nixpkgs": [ - "cardano-node", - "std", - "nixpkgs" - ], - "nosys": "nosys", - "yants": [ - "cardano-node", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1708640854, - "narHash": "sha256-EpcAmvIS4ErqhXtVEfd2GPpU/E/s8CCRSfYzk6FZ/fY=", - "owner": "paisano-nix", - "repo": "core", - "rev": "adcf742bc9463c08764ca9e6955bd5e7dcf3a3fe", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "ref": "0.2.0", - "repo": "core", - "type": "github" - } - }, - "paisano-tui": { - "flake": false, - "locked": { - "lastModified": 1708637035, - "narHash": "sha256-R19YURSK+MY/Rw6FZnojQS9zuDh+OoTAyngQAjjoubc=", - "owner": "paisano-nix", - "repo": "tui", - "rev": "231761b260587a64817e4ffae3afc15defaa15db", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "ref": "v0.5.0", - "repo": "tui", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": [ - "nixpkgs" ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -2457,11 +1928,11 @@ "cardano-node": "cardano-node", "crane": "crane", "devour-flake": "devour-flake", - "devshell": "devshell_2", + "devshell": "devshell", "flake-parts": "flake-parts", "flake-root": "flake-root", "hercules-ci-effects": "hercules-ci-effects", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_5", "oura": "oura", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "treefmt-nix": "treefmt-nix" @@ -2567,107 +2038,6 @@ "type": "github" } }, - "std": { - "inputs": { - "blank": "blank", - "devshell": "devshell", - "dmerge": "dmerge", - "flake-utils": "flake-utils_3", - "makes": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "blank" - ], - "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor", - "microvm": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "blank" - ], - "n2c": "n2c", - "nixago": "nixago", - "nixpkgs": "nixpkgs_5", - "yants": "yants" - }, - "locked": { - "lastModified": 1665513321, - "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", - "owner": "divnix", - "repo": "std", - "rev": "94a90eedb9cfc115b12ae8f6622d9904788559e4", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, - "std_2": { - "inputs": { - "arion": [ - "cardano-node", - "std", - "blank" - ], - "blank": "blank_2", - "devshell": [ - "cardano-node", - "std", - "blank" - ], - "dmerge": "dmerge_2", - "haumea": "haumea", - "incl": "incl", - "lib": "lib", - "makes": [ - "cardano-node", - "std", - "blank" - ], - "microvm": [ - "cardano-node", - "std", - "blank" - ], - "n2c": [ - "cardano-node", - "std", - "blank" - ], - "nixago": [ - "cardano-node", - "std", - "blank" - ], - "nixpkgs": "nixpkgs_8", - "paisano": "paisano", - "paisano-tui": "paisano-tui", - "terranix": [ - "cardano-node", - "std", - "blank" - ], - "yants": "yants_2" - }, - "locked": { - "lastModified": 1715201063, - "narHash": "sha256-LcLYV5CDhIiJs3MfxGZFKsXPR4PtfnY4toZ75GM+2Pw=", - "owner": "divnix", - "repo": "std", - "rev": "b6924a7d37a46fc1dda8efe405040e27ecf1bbd6", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -2705,11 +2075,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1746216483, + "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", "type": "github" }, "original": { @@ -2718,31 +2088,6 @@ "type": "github" } }, - "tullia": { - "inputs": { - "nix-nomad": "nix-nomad", - "nix2container": "nix2container", - "nixpkgs": [ - "cardano-node", - "cardano-automation", - "nixpkgs" - ], - "std": "std" - }, - "locked": { - "lastModified": 1668711738, - "narHash": "sha256-CBjky16o9pqsGE1bWu6nRlRajgSXMEk+yaFQLibqXcE=", - "owner": "input-output-hk", - "repo": "tullia", - "rev": "ead1f515c251f0e060060ef0e2356a51d3dfe4b0", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "tullia", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems" @@ -2762,21 +2107,6 @@ } }, "utils_2": { - "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_3": { "inputs": { "systems": "systems_2" }, @@ -2794,7 +2124,7 @@ "type": "github" } }, - "utils_4": { + "utils_3": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -2808,52 +2138,6 @@ "repo": "flake-utils", "type": "github" } - }, - "yants": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "cardano-automation", - "tullia", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660507851, - "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", - "owner": "divnix", - "repo": "yants", - "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } - }, - "yants_2": { - "inputs": { - "nixpkgs": [ - "cardano-node", - "std", - "lib" - ] - }, - "locked": { - "lastModified": 1686863218, - "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", - "owner": "divnix", - "repo": "yants", - "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 083ec2f..05bd64e 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ # Services cardano-node = { - url = "github:intersectmbo/cardano-node/10.1.4"; + url = "github:intersectmbo/cardano-node/10.3.1"; }; cardano-db-sync = { url = "github:intersectmbo/cardano-db-sync/13.6.0.1"; From a3f65671fd1a4ce572930f0ba0107ff0f55588c5 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 27 Jun 2025 13:59:29 +0200 Subject: [PATCH 2/9] Bump inputs --- flake.lock | 1129 +++++++++++++++++++++++++++++++++++++++++++++++----- flake.nix | 18 +- 2 files changed, 1041 insertions(+), 106 deletions(-) diff --git a/flake.lock b/flake.lock index 2830422..55be294 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,28 @@ "CHaP_2": { "flake": false, "locked": { - "lastModified": 1744135613, - "narHash": "sha256-ifKgooWGq45UYjweO0dOBE1rLBvf7tq/Co1Ob/8E8O0=", + "lastModified": 1745944473, + "narHash": "sha256-zKJE6viU6JKUGlesde00In7VrALXv+lC6r/1QiQBB4s=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "143757ad1f38ddd9698696bd2e6c8ebb84eb2adf", + "rev": "60bade9ab7b16121307e12a0fb9aefb2e245faef", + "type": "github" + }, + "original": { + "owner": "intersectmbo", + "ref": "repo", + "repo": "cardano-haskell-packages", + "type": "github" + } + }, + "CHaP_3": { + "flake": false, + "locked": { + "lastModified": 1745944473, + "narHash": "sha256-zKJE6viU6JKUGlesde00In7VrALXv+lC6r/1QiQBB4s=", + "owner": "intersectmbo", + "repo": "cardano-haskell-packages", + "rev": "60bade9ab7b16121307e12a0fb9aefb2e245faef", "type": "github" }, "original": { @@ -66,21 +83,37 @@ "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" + } + }, "blockfrost": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1737368354, - "narHash": "sha256-zDqNLiaF3A4/rkMTL2sJWyyPVBB9kwezsfzTmkIBN14=", + "lastModified": 1749464997, + "narHash": "sha256-9FFC13FH7LeT2izPrYgCgDpj2vhxGwIpuGMKNQlBZXU=", "owner": "blockfrost", "repo": "blockfrost-backend-ryo", - "rev": "a49be24384279c916e86dbd9be267ab259bed596", + "rev": "7400007a369d34bbdb88ae1b576b89b4bb528b7f", "type": "github" }, "original": { "owner": "blockfrost", - "ref": "v3.1.0", + "ref": "v4.1.2", "repo": "blockfrost-backend-ryo", "type": "github" } @@ -119,6 +152,23 @@ "type": "github" } }, + "blst_3": { + "flake": false, + "locked": { + "lastModified": 1739372843, + "narHash": "sha256-IlbNMLBjs/dvGogcdbWQIL+3qwy7EXJbIDpo4xBd4bY=", + "owner": "supranational", + "repo": "blst", + "rev": "8c7db7fe8d2ce6e76dc398ebd4d475c0ec564355", + "type": "github" + }, + "original": { + "owner": "supranational", + "ref": "v0.3.14", + "repo": "blst", + "type": "github" + } + }, "cabal-32": { "flake": false, "locked": { @@ -153,6 +203,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": { @@ -187,6 +254,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": { @@ -221,6 +305,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-automation": { "inputs": { "flake-utils": "flake-utils", @@ -247,6 +348,32 @@ "type": "github" } }, + "cardano-automation_2": { + "inputs": { + "flake-utils": "flake-utils_2", + "haskellNix": [ + "cardano-node-nixos-module-fixed", + "haskellNix" + ], + "nixpkgs": [ + "cardano-node-nixos-module-fixed", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741965132, + "narHash": "sha256-SjNEfsLa+2FKS4GlszaH0fO/QGJbooNFMYU1GVdJToo=", + "owner": "input-output-hk", + "repo": "cardano-automation", + "rev": "78d16a837d74a72822041ee1b970daa73ac83b9e", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-automation", + "type": "github" + } + }, "cardano-db-sync": { "inputs": { "CHaP": "CHaP", @@ -262,44 +389,24 @@ "utils": "utils" }, "locked": { - "lastModified": 1731069075, - "narHash": "sha256-EESfv4KVXjYokTMQLwJGkhOq6gskiXCjF3rfDNDaeXQ=", + "lastModified": 1732233848, + "narHash": "sha256-UU42L0i8LW9BzhsNJTlWwKdH0nIzbYlOjDmr893RcHo=", "owner": "intersectmbo", "repo": "cardano-db-sync", - "rev": "5b131e97210cf603a3aca5ddca7d1420f9cabeec", + "rev": "944e53232ad5f5f87ed97634d2e4e08496db7a1c", "type": "github" }, "original": { "owner": "intersectmbo", - "ref": "13.6.0.1", + "ref": "13.6.0.2", "repo": "cardano-db-sync", "type": "github" } }, - "cardano-mainnet-mirror": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1642701714, - "narHash": "sha256-SR3luE+ePX6U193EKE/KSEuVzWAW0YsyPYDC4hOvALs=", - "owner": "input-output-hk", - "repo": "cardano-mainnet-mirror", - "rev": "819488be9eabbba6aaa7c931559bc584d8071e3d", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "nix", - "repo": "cardano-mainnet-mirror", - "type": "github" - } - }, "cardano-node": { "inputs": { "CHaP": "CHaP_2", "cardano-automation": "cardano-automation", - "cardano-mainnet-mirror": "cardano-mainnet-mirror", "customConfig": "customConfig", "em": "em", "empty-flake": "empty-flake", @@ -316,17 +423,51 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1744738758, - "narHash": "sha256-XIuwW/D6uZ9BVxMUElZa8XyXWllMvDP96fTJ0vdXVL8=", + "lastModified": 1745954148, + "narHash": "sha256-Moth/2BOCWDdgXrOX6fv2rykqe4zR9POjC+g4dlUqqc=", + "owner": "intersectmbo", + "repo": "cardano-node", + "rev": "420c94fbb075146c6ec7fba78c5b0482fafe72dd", + "type": "github" + }, + "original": { + "owner": "intersectmbo", + "ref": "10.4.1", + "repo": "cardano-node", + "type": "github" + } + }, + "cardano-node-nixos-module-fixed": { + "inputs": { + "CHaP": "CHaP_3", + "cardano-automation": "cardano-automation_2", + "customConfig": "customConfig_2", + "em": "em_2", + "empty-flake": "empty-flake_2", + "flake-compat": "flake-compat_5", + "hackageNix": "hackageNix_3", + "haskellNix": "haskellNix_3", + "incl": "incl_2", + "iohkNix": "iohkNix_3", + "nixpkgs": [ + "cardano-node-nixos-module-fixed", + "haskellNix", + "nixpkgs-unstable" + ], + "utils": "utils_3" + }, + "locked": { + "lastModified": 1746434594, + "narHash": "sha256-Ke8lyW2EGc/MK2OX0v6peAs0VsBJh1Ce+jfjaNSMiAc=", "owner": "intersectmbo", "repo": "cardano-node", - "rev": "b3f237b75e64f4d8142af95b053e2828221d707f", + "rev": "40192a627d56d4c467cd88c0ceac50e83cccb0a7", "type": "github" }, "original": { "owner": "intersectmbo", - "ref": "10.3.1", "repo": "cardano-node", + "rev": "40192a627d56d4c467cd88c0ceac50e83cccb0a7", "type": "github" } }, @@ -362,13 +503,29 @@ "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" + } + }, "crane": { "locked": { - "lastModified": 1746291859, - "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", + "lastModified": 1750266157, + "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", "owner": "ipetkov", "repo": "crane", - "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", + "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", "type": "github" }, "original": { @@ -392,6 +549,21 @@ "type": "github" } }, + "customConfig_2": { + "locked": { + "lastModified": 1630400035, + "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", + "owner": "input-output-hk", + "repo": "empty-flake", + "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "empty-flake", + "type": "github" + } + }, "devour-flake": { "flake": false, "locked": { @@ -444,6 +616,22 @@ "type": "github" } }, + "em_2": { + "flake": false, + "locked": { + "lastModified": 1685015066, + "narHash": "sha256-etAdEoYhtvjTw1ITh28WPNfwvvb5t/fpwCP6s7odSiQ=", + "owner": "deepfire", + "repo": "em", + "rev": "af69bb5c2ac2161434d8fea45f920f8f359587ce", + "type": "github" + }, + "original": { + "owner": "deepfire", + "repo": "em", + "type": "github" + } + }, "empty-flake": { "locked": { "lastModified": 1630400035, @@ -459,6 +647,21 @@ "type": "github" } }, + "empty-flake_2": { + "locked": { + "lastModified": 1630400035, + "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", + "owner": "input-output-hk", + "repo": "empty-flake", + "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "empty-flake", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -528,6 +731,40 @@ } }, "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1647532380, + "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "7da118186435255a30b5ffeabba9629c344c0bec", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "fixes", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { + "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_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -548,11 +785,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -591,6 +828,21 @@ "type": "github" } }, + "flake-utils_2": { + "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" + } + }, "ghc-8.6.5-iohk": { "flake": false, "locked": { @@ -625,6 +877,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" + } + }, "ghc910X": { "flake": false, "locked": { @@ -644,6 +913,25 @@ "url": "https://gitlab.haskell.org/ghc/ghc" } }, + "ghc910X_2": { + "flake": false, + "locked": { + "lastModified": 1714520650, + "narHash": "sha256-4uz6RA1hRr0RheGNDM49a/B3jszqNNU8iHIow4mSyso=", + "ref": "ghc-9.10", + "rev": "2c6375b9a804ac7fca1e82eb6fcfc8594c67c5f5", + "revCount": 62663, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "ref": "ghc-9.10", + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, "ghc911": { "flake": false, "locked": { @@ -662,10 +950,50 @@ "url": "https://gitlab.haskell.org/ghc/ghc" } }, + "ghc911_2": { + "flake": false, + "locked": { + "lastModified": 1714817013, + "narHash": "sha256-m2je4UvWfkgepMeUIiXHMwE6W+iVfUY38VDGkMzjCcc=", + "ref": "refs/heads/master", + "rev": "fc24c5cf6c62ca9e3c8d236656e139676df65034", + "revCount": 62816, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, + "git-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat_7", + "gitignore": "gitignore", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ - "pre-commit-hooks-nix", + "git-hooks-nix", "nixpkgs" ] }, @@ -702,11 +1030,28 @@ "hackageNix_2": { "flake": false, "locked": { - "lastModified": 1743639862, - "narHash": "sha256-/8gnbtlgJ4mO0c8GGOdaiKg7nQF1NqFQUAt6d+pBpMI=", + "lastModified": 1745281520, + "narHash": "sha256-dk/70Cmjx8fGSURcAHQnowETeAOElzDxn0wH/P4DUWA=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "4c98778277c642e326b3cb7c2c9cbb9163b9ffbd", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "for-stackage", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackageNix_3": { + "flake": false, + "locked": { + "lastModified": 1745281520, + "narHash": "sha256-dk/70Cmjx8fGSURcAHQnowETeAOElzDxn0wH/P4DUWA=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "6857f977e2167e0b75b6f56c50347fa234a67e94", + "rev": "4c98778277c642e326b3cb7c2c9cbb9163b9ffbd", "type": "github" }, "original": { @@ -830,6 +1175,63 @@ "type": "github" } }, + "haskellNix_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_6", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_3", + "ghc910X": "ghc910X_2", + "ghc911": "ghc911_2", + "hackage": [ + "cardano-node-nixos-module-fixed", + "hackageNix" + ], + "hls-1.10": "hls-1.10_3", + "hls-2.0": "hls-2.0_3", + "hls-2.2": "hls-2.2_3", + "hls-2.3": "hls-2.3_3", + "hls-2.4": "hls-2.4_3", + "hls-2.5": "hls-2.5_3", + "hls-2.6": "hls-2.6_3", + "hls-2.7": "hls-2.7_3", + "hls-2.8": "hls-2.8_3", + "hpc-coveralls": "hpc-coveralls_3", + "hydra": "hydra_3", + "iserv-proxy": "iserv-proxy_3", + "nixpkgs": [ + "cardano-node-nixos-module-fixed", + "nixpkgs" + ], + "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_3", + "nixpkgs-2311": "nixpkgs-2311_3", + "nixpkgs-unstable": "nixpkgs-unstable_3", + "old-ghc-nix": "old-ghc-nix_3", + "stackage": "stackage_3" + }, + "locked": { + "lastModified": 1718797200, + "narHash": "sha256-ueFxTuZrQ3ZT/Fj5sSeUWlqKa4+OkUU1xW0E+q/XTfw=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "cb139fa956158397aa398186bb32dd26f7318784", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "cb139fa956158397aa398186bb32dd26f7318784", + "type": "github" + } + }, "hercules-ci-effects": { "inputs": { "flake-parts": [ @@ -871,24 +1273,58 @@ "type": "github" } }, - "hls-1.10_2": { + "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-1.10_3": { + "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": { - "lastModified": 1680000865, - "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", + "lastModified": 1687698105, + "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", "owner": "haskell", "repo": "haskell-language-server", - "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", + "rev": "783905f211ac63edf982dd1889c671653327e441", "type": "github" }, "original": { "owner": "haskell", - "ref": "1.10.0.0", + "ref": "2.0.0.1", "repo": "haskell-language-server", "type": "github" } }, - "hls-2.0": { + "hls-2.0_2": { "flake": false, "locked": { "lastModified": 1687698105, @@ -905,7 +1341,7 @@ "type": "github" } }, - "hls-2.0_2": { + "hls-2.0_3": { "flake": false, "locked": { "lastModified": 1687698105, @@ -956,6 +1392,23 @@ "type": "github" } }, + "hls-2.2_3": { + "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": { @@ -990,6 +1443,23 @@ "type": "github" } }, + "hls-2.3_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": { @@ -1024,6 +1494,23 @@ "type": "github" } }, + "hls-2.4_3": { + "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": { @@ -1058,6 +1545,23 @@ "type": "github" } }, + "hls-2.5_3": { + "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": { @@ -1092,6 +1596,23 @@ "type": "github" } }, + "hls-2.6_3": { + "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" + } + }, "hls-2.7": { "flake": false, "locked": { @@ -1126,6 +1647,23 @@ "type": "github" } }, + "hls-2.7_3": { + "flake": false, + "locked": { + "lastModified": 1708965829, + "narHash": "sha256-LfJ+TBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu+Jf+M=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "50322b0a4aefb27adc5ec42f5055aaa8f8e38001", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.7.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-2.8": { "flake": false, "locked": { @@ -1160,6 +1698,23 @@ "type": "github" } }, + "hls-2.8_3": { + "flake": false, + "locked": { + "lastModified": 1715153580, + "narHash": "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "dd1be1beb16700de59e0d6801957290bcf956a0a", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.8.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-2.9": { "flake": false, "locked": { @@ -1209,6 +1764,22 @@ "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", @@ -1257,6 +1828,30 @@ "type": "indirect" } }, + "hydra_3": { + "inputs": { + "nix": "nix_3", + "nixpkgs": [ + "cardano-node-nixos-module-fixed", + "haskellNix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", + "owner": "NixOS", + "repo": "hydra", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, "incl": { "inputs": { "nixlib": "nixlib" @@ -1275,6 +1870,24 @@ "type": "github" } }, + "incl_2": { + "inputs": { + "nixlib": "nixlib_2" + }, + "locked": { + "lastModified": 1693483555, + "narHash": "sha256-Beq4WhSeH3jRTZgC1XopTSU10yLpK1nmMcnGoXO0XYo=", + "owner": "divnix", + "repo": "incl", + "rev": "526751ad3d1e23b07944b14e3f6b7a5948d3007b", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, "iohkNix": { "inputs": { "blst": "blst", @@ -1310,11 +1923,35 @@ "sodium": "sodium_2" }, "locked": { - "lastModified": 1744130217, - "narHash": "sha256-Lql0s3Occ6gKLvjcqTPK6vW4l1jwNn/UV7uaVpB/jTg=", + "lastModified": 1745582862, + "narHash": "sha256-dMoJ6yHcRvUcB66nofzfAtmVxnDg8oPW3wiVtimXT/o=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "5c16fdfc45deda7a4ccf964b6dfa1c3cab72f1f7", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohkNix_3": { + "inputs": { + "blst": "blst_3", + "nixpkgs": [ + "cardano-node-nixos-module-fixed", + "nixpkgs" + ], + "secp256k1": "secp256k1_3", + "sodium": "sodium_3" + }, + "locked": { + "lastModified": 1745582862, + "narHash": "sha256-dMoJ6yHcRvUcB66nofzfAtmVxnDg8oPW3wiVtimXT/o=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "dd47887a0482bfb1399c9da77175933876d0f4ab", + "rev": "5c16fdfc45deda7a4ccf964b6dfa1c3cab72f1f7", "type": "github" }, "original": { @@ -1357,6 +1994,23 @@ "type": "github" } }, + "iserv-proxy_3": { + "flake": false, + "locked": { + "lastModified": 1717479972, + "narHash": "sha256-7vE3RQycHI1YT9LHJ1/fUaeln2vIpYm6Mmn8FTpYeVo=", + "owner": "stable-haskell", + "repo": "iserv-proxy", + "rev": "2ed34002247213fc435d0062350b91bab920626e", + "type": "github" + }, + "original": { + "owner": "stable-haskell", + "ref": "iserv-syms", + "repo": "iserv-proxy", + "type": "github" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -1389,6 +2043,22 @@ "type": "github" } }, + "lowdown-src_3": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -1413,7 +2083,7 @@ "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -1431,7 +2101,43 @@ "type": "github" } }, - "nixlib": { + "nix_3": { + "inputs": { + "lowdown-src": "lowdown-src_3", + "nixpkgs": "nixpkgs_4", + "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" + } + }, + "nixlib": { + "locked": { + "lastModified": 1667696192, + "narHash": "sha256-hOdbIhnpWvtmVynKcsj10nxz9WROjZja+1wRAJ/C9+s=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "babd9cd2ca6e413372ed59fbb1ecc3c3a5fd3e5b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixlib_2": { "locked": { "lastModified": 1667696192, "narHash": "sha256-hOdbIhnpWvtmVynKcsj10nxz9WROjZja+1wRAJ/C9+s=", @@ -1494,6 +2200,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, @@ -1526,6 +2248,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, @@ -1558,6 +2296,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": 1685573264, @@ -1590,6 +2344,22 @@ "type": "github" } }, + "nixpkgs-2205_3": { + "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": 1688392541, @@ -1622,6 +2392,22 @@ "type": "github" } }, + "nixpkgs-2211_3": { + "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": 1705033721, @@ -1654,6 +2440,22 @@ "type": "github" } }, + "nixpkgs-2305_3": { + "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-2311": { "locked": { "lastModified": 1719957072, @@ -1686,6 +2488,22 @@ "type": "github" } }, + "nixpkgs-2311_3": { + "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-2405": { "locked": { "lastModified": 1726447378, @@ -1704,11 +2522,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1743296961, - "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -1749,6 +2567,22 @@ "type": "github" } }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1726583932, @@ -1781,6 +2615,22 @@ "type": "github" } }, + "nixpkgs-unstable_3": { + "locked": { + "lastModified": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1657693803, @@ -1799,16 +2649,18 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1642336556, - "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_4": { @@ -1829,11 +2681,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { @@ -1877,64 +2729,60 @@ "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" + } + }, "oura": { "inputs": { "crane": [ "crane" ], - "utils": "utils_3" + "utils": "utils_4" }, "locked": { - "lastModified": 1729716427, - "narHash": "sha256-gZhY/Xh63VLsiGzfpwoKSSmTJwguiRfOjPry+cD5pmM=", + "lastModified": 1750697545, + "narHash": "sha256-M41AcSWxY9tQLkY8+aFo3xvjVo9YaKdnkHhXcc0BqU0=", "owner": "txpipe", "repo": "oura", - "rev": "c6bfc5ab66a82cc6a59de5d3a3d3f01f5543b961", + "rev": "0ea451908aa02e15443d8e40b956094bd0fa22b0", "type": "github" }, "original": { "owner": "txpipe", - "ref": "v1.9.2", + "ref": "v1.9.4", "repo": "oura", "type": "github" } }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": "flake-compat_5", - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "blockfrost": "blockfrost", "cardano-db-sync": "cardano-db-sync", "cardano-node": "cardano-node", + "cardano-node-nixos-module-fixed": "cardano-node-nixos-module-fixed", "crane": "crane", "devour-flake": "devour-flake", "devshell": "devshell", "flake-parts": "flake-parts", "flake-root": "flake-root", + "git-hooks-nix": "git-hooks-nix", "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": "nixpkgs_5", "oura": "oura", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", "treefmt-nix": "treefmt-nix" } }, @@ -1972,6 +2820,23 @@ "type": "github" } }, + "secp256k1_3": { + "flake": false, + "locked": { + "lastModified": 1683999695, + "narHash": "sha256-9nJJVENMXjXEJZzw8DHzin1DkFkF8h9m/c6PuM7Uk4s=", + "owner": "bitcoin-core", + "repo": "secp256k1", + "rev": "acf5c55ae6a94e5ca847e07def40427547876101", + "type": "github" + }, + "original": { + "owner": "bitcoin-core", + "ref": "v0.3.2", + "repo": "secp256k1", + "type": "github" + } + }, "sodium": { "flake": false, "locked": { @@ -2006,6 +2871,23 @@ "type": "github" } }, + "sodium_3": { + "flake": false, + "locked": { + "lastModified": 1675156279, + "narHash": "sha256-0uRcN5gvMwO7MCXVYnoqG/OmeBFi8qRVnDWJLnBb9+Y=", + "owner": "input-output-hk", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", + "type": "github" + } + }, "stackage": { "flake": false, "locked": { @@ -2038,6 +2920,22 @@ "type": "github" } }, + "stackage_3": { + "flake": false, + "locked": { + "lastModified": 1718756571, + "narHash": "sha256-8rL8viTbuE9/yV1of6SWp2tHmhVMD2UmkOfmN5KDbKg=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "027672fb6fd45828b0e623c8152572d4058429ad", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -2068,6 +2966,21 @@ "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" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -2075,11 +2988,11 @@ ] }, "locked": { - "lastModified": 1746216483, - "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "lastModified": 1750931469, + "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", "type": "github" }, "original": { @@ -2125,6 +3038,24 @@ } }, "utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_4": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", diff --git a/flake.nix b/flake.nix index 05bd64e..2a80de2 100644 --- a/flake.nix +++ b/flake.nix @@ -7,16 +7,21 @@ # Services cardano-node = { - url = "github:intersectmbo/cardano-node/10.3.1"; + url = "github:intersectmbo/cardano-node/10.4.1"; + }; + # TODO remove this input once this PR is part of a release + # https://github.com/IntersectMBO/cardano-node/pull/6207 + cardano-node-nixos-module-fixed = { + url = "github:intersectmbo/cardano-node/40192a627d56d4c467cd88c0ceac50e83cccb0a7"; }; cardano-db-sync = { - url = "github:intersectmbo/cardano-db-sync/13.6.0.1"; + url = "github:intersectmbo/cardano-db-sync/13.6.0.2"; }; blockfrost = { - url = "github:blockfrost/blockfrost-backend-ryo/v3.1.0"; + url = "github:blockfrost/blockfrost-backend-ryo/v4.1.2"; }; oura = { - url = "github:txpipe/oura/v1.9.2"; + url = "github:txpipe/oura/v1.9.4"; inputs.crane.follows = "crane"; }; crane = { @@ -44,10 +49,9 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; }; - pre-commit-hooks-nix = { - url = "github:cachix/pre-commit-hooks.nix"; + git-hooks-nix = { + url = "github:cachix/git-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs-stable.follows = "nixpkgs"; }; treefmt-nix = { url = "github:numtide/treefmt-nix"; From c70d0b549ead5c51251a2f43d206556f1bb398ae Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 27 Jun 2025 14:00:03 +0200 Subject: [PATCH 3/9] Rename `pre-commit-hooks-nix` to `git-hooks-nix` --- docs/development/develop.md | 2 +- shell/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/development/develop.md b/docs/development/develop.md index cbca5e3..6b661af 100644 --- a/docs/development/develop.md +++ b/docs/development/develop.md @@ -31,7 +31,7 @@ $ nix develop [tools] fmt - format the source tree - update-pre-commit-hooks - update git pre-commit hooks + update-git-hooks - update git hooks ``` A `.envrc` file is also provided, using [direnv](https://direnv.net/) and [nix-direnv](https://github.com/nix-community/nix-direnv) is suggested. diff --git a/shell/default.nix b/shell/default.nix index 1fcdbd0..1a2f43c 100644 --- a/shell/default.nix +++ b/shell/default.nix @@ -2,7 +2,7 @@ { imports = [ inputs.devshell.flakeModule - inputs.pre-commit-hooks-nix.flakeModule + inputs.git-hooks-nix.flakeModule ]; perSystem = From 742061c123b8a9874028bd77fb2a8a0c6e0cd116 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 27 Jun 2025 14:00:33 +0200 Subject: [PATCH 4/9] Temporary use `cardano-node`'s NixOS module from `master` --- modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default.nix b/modules/default.nix index 59b7eaf..2e2677a 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -19,7 +19,7 @@ }; node = { imports = [ - inputs.cardano-node.nixosModules.cardano-node + inputs.cardano-node-nixos-module-fixed.nixosModules.cardano-node ./node.nix ]; }; From a52998e78f7f5da67f5ef549a9f9f21d450360b2 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 27 Jun 2025 14:01:01 +0200 Subject: [PATCH 5/9] Add mimssing `TraceOptions` (needed by newest `cardano-node`'s versions) --- modules/fixtures/test-node/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/fixtures/test-node/config.json b/modules/fixtures/test-node/config.json index a70b964..5397c90 100644 --- a/modules/fixtures/test-node/config.json +++ b/modules/fixtures/test-node/config.json @@ -65,6 +65,7 @@ "TraceTxInbound": false, "TraceTxOutbound": false, "TraceTxSubmissionProtocol": false, + "TraceOptions": {}, "options": { "mapBackends": { From c4f4e7f1a136ede35572d185d59be48e4b5097f1 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 27 Jun 2025 14:02:02 +0200 Subject: [PATCH 6/9] Change the network magic for the private testnet to 2 Otherwise now the NixOS refuses to evaluate. TODO probably this is a bug and should be investigaed an potentially addressed upstream --- modules/fixtures/test-node/genesis-byron.json | 2 +- modules/fixtures/test-node/genesis-shelley.json | 2 +- modules/private-testnet-node.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/fixtures/test-node/genesis-byron.json b/modules/fixtures/test-node/genesis-byron.json index 24c4d2e..5e00564 100644 --- a/modules/fixtures/test-node/genesis-byron.json +++ b/modules/fixtures/test-node/genesis-byron.json @@ -1,7 +1,7 @@ { "protocolConsts": { "k": 2160, - "protocolMagic": 42 + "protocolMagic": 2 }, "startTime": 1657186415, "blockVersionData": { diff --git a/modules/fixtures/test-node/genesis-shelley.json b/modules/fixtures/test-node/genesis-shelley.json index 153223b..b532b17 100644 --- a/modules/fixtures/test-node/genesis-shelley.json +++ b/modules/fixtures/test-node/genesis-shelley.json @@ -10,7 +10,7 @@ "maxKESEvolutions": 60, "maxLovelaceSupply": 2000000000000, "networkId": "Testnet", - "networkMagic": 42, + "networkMagic": 2, "protocolParams": { "a0": 0.0, "decentralisationParam": 0, diff --git a/modules/private-testnet-node.nix b/modules/private-testnet-node.nix index 1392087..68246cf 100644 --- a/modules/private-testnet-node.nix +++ b/modules/private-testnet-node.nix @@ -139,10 +139,10 @@ in }; config = lib.mkIf cfg.enable { - # Set the `cardano.network` option to `private` which has network magic 42. + # Set the `cardano.network` option to `preview` which has network magic 2. # In particular, this matches the `networkMagic` value in # `./fixtures/test-node/genesis-shelley.json` - cardano.network = lib.mkForce "private"; + cardano.network = lib.mkForce "preview"; # Create a directory of the test node's config files # We don't just link the Cardano node directly to the files in From 9818a47e35450ed4ce28ca72b264e540031372dc Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 27 Jun 2025 14:03:12 +0200 Subject: [PATCH 7/9] Fix the docs render script --- docs/render.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/render.nix b/docs/render.nix index 1d91c94..ffa9f32 100644 --- a/docs/render.nix +++ b/docs/render.nix @@ -140,14 +140,14 @@ in ... }: let - inherit (pkgs) stdenv mkdocs python312Packages; + inherit (pkgs) stdenv mkdocs python3Packages; my-mkdocs = pkgs.runCommand "my-mkdocs" { buildInputs = [ mkdocs - python312Packages.mkdocs-material + python3Packages.mkdocs-material ]; } '' From f02cd811aea5591aeeb2698da0729ba608f98662 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 27 Jun 2025 14:03:27 +0200 Subject: [PATCH 8/9] Add comment explaining why setting `services.cardano-node.network` in docs generation --- docs/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/default.nix b/docs/default.nix index 152b5f0..e77e9a6 100644 --- a/docs/default.nix +++ b/docs/default.nix @@ -33,7 +33,11 @@ anchor = "services.cardano-node"; modules = [ config.flake.nixosModules.node - { services.cardano-node.environment = "mainnet"; } + { + # we need to set this value otherwise the evaluation fails + # it's not shown in the docs (we show only types, default values, descriptions, etc...) + services.cardano-node.environment = "mainnet"; + } ]; namespaces = [ "services.cardano-node" ]; } From 10e9dde0b192f5c007ddd9fa232b9b7448216609 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 27 Jun 2025 14:16:01 +0200 Subject: [PATCH 9/9] Format --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2a80de2..88f0c2d 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ cardano-node = { url = "github:intersectmbo/cardano-node/10.4.1"; }; - # TODO remove this input once this PR is part of a release + # TODO remove this input once this PR is part of a release # https://github.com/IntersectMBO/cardano-node/pull/6207 cardano-node-nixos-module-fixed = { url = "github:intersectmbo/cardano-node/40192a627d56d4c467cd88c0ceac50e83cccb0a7";