From ef46751bc3903aded66f06cfdb2675ec9cf64903 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Tue, 18 Nov 2025 21:47:46 -0600 Subject: [PATCH 1/6] bump: cardano-parts -> next-2025-11-19 --- flake.lock | 1024 ++++++++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 4 +- 2 files changed, 1000 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 14ff1bcb..855a155b 100644 --- a/flake.lock +++ b/flake.lock @@ -17,6 +17,23 @@ "type": "github" } }, + "CHaP_2": { + "flake": false, + "locked": { + "lastModified": 1763036723, + "narHash": "sha256-1cPd4Ji72LJVNkMH7UQj/iI8nXRGiURAu6Eynod+nvM=", + "owner": "intersectmbo", + "repo": "cardano-haskell-packages", + "rev": "b9bc5ff7a64bbbc8bd794ce191e05e01551a91f1", + "type": "github" + }, + "original": { + "owner": "intersectmbo", + "ref": "repo", + "repo": "cardano-haskell-packages", + "type": "github" + } + }, "HTTP": { "flake": false, "locked": { @@ -33,6 +50,22 @@ "type": "github" } }, + "HTTP_2": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, "auth-keys-hub": { "inputs": { "flake-parts": [ @@ -150,6 +183,23 @@ "type": "github" } }, + "blst_4": { + "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": { @@ -167,6 +217,23 @@ "type": "github" } }, + "cabal-32_2": { + "flake": false, + "locked": { + "lastModified": 1603716527, + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "owner": "haskell", + "repo": "cabal", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.2", + "repo": "cabal", + "type": "github" + } + }, "cabal-34": { "flake": false, "locked": { @@ -184,6 +251,23 @@ "type": "github" } }, + "cabal-34_2": { + "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": { @@ -201,6 +285,23 @@ "type": "github" } }, + "cabal-36_2": { + "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" + } + }, "capkgs": { "locked": { "lastModified": 1763153457, @@ -216,6 +317,34 @@ "type": "github" } }, + "cardano-automation": { + "inputs": { + "flake-utils": "flake-utils_2", + "haskellNix": [ + "cardano-parts", + "cardano-node-10-5-2", + "haskellNix" + ], + "nixpkgs": [ + "cardano-parts", + "cardano-node-10-5-2", + "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-schema": { "flake": false, "locked": { @@ -299,6 +428,41 @@ "type": "github" } }, + "cardano-node-10-5-2": { + "inputs": { + "CHaP": "CHaP_2", + "cardano-automation": "cardano-automation", + "customConfig": "customConfig", + "em": "em", + "empty-flake": "empty-flake", + "flake-compat": "flake-compat_2", + "hackageNix": "hackageNix", + "haskellNix": "haskellNix_2", + "incl": "incl_2", + "iohkNix": "iohkNix_2", + "nixpkgs": [ + "cardano-parts", + "cardano-node-10-5-2", + "haskellNix", + "nixpkgs-unstable" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1763482419, + "narHash": "sha256-06e1RpS46HR2UtNmJq0l0jPr5QptofSFwouBDKKDDZw=", + "owner": "IntersectMBO", + "repo": "cardano-node", + "rev": "a288f6504606979852667bb0f352aaf3b2b8d2d5", + "type": "github" + }, + "original": { + "owner": "IntersectMBO", + "ref": "mw/release/10.5", + "repo": "cardano-node", + "type": "github" + } + }, "cardano-node-pparams-api": { "inputs": { "CHaP": "CHaP", @@ -388,6 +552,7 @@ "cardano-db-sync-service": "cardano-db-sync-service", "cardano-db-sync-service-ng": "cardano-db-sync-service-ng", "cardano-metadata-service": "cardano-metadata-service", + "cardano-node-10-5-2": "cardano-node-10-5-2", "cardano-node-service": "cardano-node-service", "cardano-node-service-ng": "cardano-node-service-ng", "cardano-ogmios-service": "cardano-ogmios-service", @@ -401,9 +566,9 @@ "inputs-check": "inputs-check", "iohk-nix": "iohk-nix", "iohk-nix-ng": "iohk-nix-ng", - "nix": "nix_2", - "nixpkgs": "nixpkgs_7", - "nixpkgs-unstable": "nixpkgs-unstable_2", + "nix": "nix_3", + "nixpkgs": "nixpkgs_8", + "nixpkgs-unstable": "nixpkgs-unstable_3", "opentofu-registry": "opentofu-registry", "process-compose-flake": "process-compose-flake", "services-flake": "services-flake", @@ -412,16 +577,16 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1763521373, - "narHash": "sha256-0wnw19zgKH8qa7M1XBh61LZiU7a2VXVtW9t0rXfL/pI=", + "lastModified": 1763527874, + "narHash": "sha256-qMPPoIhNoyVlGO1RQQ2UODd2qJqHOr4X/BarhEWJA+g=", "owner": "input-output-hk", "repo": "cardano-parts", - "rev": "953f9b66b4eade69d0169f06c064f8d38fe734ab", + "rev": "9a8efc11a3cb14ddca825e846bd4955473ba93de", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "v2025-11-18", + "ref": "next-2025-11-19", "repo": "cardano-parts", "type": "github" } @@ -442,6 +607,22 @@ "type": "github" } }, + "cardano-shell_2": { + "flake": false, + "locked": { + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "type": "github" + } + }, "cardano-submit-api-service": { "flake": false, "locked": { @@ -529,8 +710,8 @@ }, "colmena": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_3", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "cardano-parts", @@ -552,6 +733,52 @@ "type": "github" } }, + "customConfig": { + "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" + } + }, + "em": { + "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, + "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": { @@ -570,6 +797,40 @@ } }, "flake-compat_2": { + "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_3": { + "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_4": { "flake": false, "locked": { "lastModified": 1650374568, @@ -585,7 +846,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1733328505, @@ -679,6 +940,21 @@ } }, "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" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -710,6 +986,60 @@ "type": "github" } }, + "ghc-8.6.5-iohk_2": { + "flake": false, + "locked": { + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", + "type": "github" + } + }, + "ghc910X": { + "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": { + "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": [ @@ -761,6 +1091,23 @@ "type": "github" } }, + "hackageNix": { + "flake": false, + "locked": { + "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" + } + }, "haskellNix": { "inputs": { "HTTP": "HTTP", @@ -815,6 +1162,65 @@ "type": "github" } }, + "haskellNix_2": { + "inputs": { + "HTTP": "HTTP_2", + "cabal-32": "cabal-32_2", + "cabal-34": "cabal-34_2", + "cabal-36": "cabal-36_2", + "cardano-shell": "cardano-shell_2", + "flake-compat": "flake-compat_3", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", + "ghc910X": "ghc910X", + "ghc911": "ghc911", + "hackage": [ + "cardano-parts", + "cardano-node-10-5-2", + "hackageNix" + ], + "hls-1.10": "hls-1.10_2", + "hls-2.0": "hls-2.0_2", + "hls-2.2": "hls-2.2_2", + "hls-2.3": "hls-2.3_2", + "hls-2.4": "hls-2.4_2", + "hls-2.5": "hls-2.5_2", + "hls-2.6": "hls-2.6_2", + "hls-2.7": "hls-2.7_2", + "hls-2.8": "hls-2.8_2", + "hpc-coveralls": "hpc-coveralls_2", + "hydra": "hydra_2", + "iserv-proxy": "iserv-proxy_2", + "nixpkgs": [ + "cardano-parts", + "cardano-node-10-5-2", + "nixpkgs" + ], + "nixpkgs-2003": "nixpkgs-2003_2", + "nixpkgs-2105": "nixpkgs-2105_2", + "nixpkgs-2111": "nixpkgs-2111_2", + "nixpkgs-2205": "nixpkgs-2205_2", + "nixpkgs-2211": "nixpkgs-2211_2", + "nixpkgs-2305": "nixpkgs-2305_2", + "nixpkgs-2311": "nixpkgs-2311_2", + "nixpkgs-unstable": "nixpkgs-unstable_2", + "old-ghc-nix": "old-ghc-nix_2", + "stackage": "stackage_2" + }, + "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" + } + }, "hls-1.10": { "flake": false, "locked": { @@ -832,6 +1238,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": { @@ -849,6 +1272,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": { @@ -866,6 +1306,23 @@ "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": { @@ -883,6 +1340,23 @@ "type": "github" } }, + "hls-2.3_2": { + "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": { @@ -900,6 +1374,23 @@ "type": "github" } }, + "hls-2.4_2": { + "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": { @@ -917,6 +1408,23 @@ "type": "github" } }, + "hls-2.5_2": { + "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": { @@ -934,6 +1442,23 @@ "type": "github" } }, + "hls-2.6_2": { + "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": { @@ -951,6 +1476,23 @@ "type": "github" } }, + "hls-2.7_2": { + "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": { @@ -968,6 +1510,23 @@ "type": "github" } }, + "hls-2.8_2": { + "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": { @@ -1001,6 +1560,22 @@ "type": "github" } }, + "hpc-coveralls_2": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "type": "github" + } + }, "hydra": { "inputs": { "nix": "nix", @@ -1025,6 +1600,31 @@ "type": "indirect" } }, + "hydra_2": { + "inputs": { + "nix": "nix_2", + "nixpkgs": [ + "cardano-parts", + "cardano-node-10-5-2", + "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" @@ -1043,6 +1643,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" + } + }, "inclusive": { "inputs": { "stdlib": "stdlib" @@ -1088,10 +1706,10 @@ }, "iohk-nix": { "inputs": { - "blst": "blst_2", - "nixpkgs": "nixpkgs_4", - "secp256k1": "secp256k1_2", - "sodium": "sodium_2" + "blst": "blst_3", + "nixpkgs": "nixpkgs_5", + "secp256k1": "secp256k1_3", + "sodium": "sodium_3" }, "locked": { "lastModified": 1751421193, @@ -1109,10 +1727,10 @@ }, "iohk-nix-ng": { "inputs": { - "blst": "blst_3", - "nixpkgs": "nixpkgs_5", - "secp256k1": "secp256k1_3", - "sodium": "sodium_3" + "blst": "blst_4", + "nixpkgs": "nixpkgs_6", + "secp256k1": "secp256k1_4", + "sodium": "sodium_4" }, "locked": { "lastModified": 1762970280, @@ -1149,6 +1767,31 @@ "type": "github" } }, + "iohkNix_2": { + "inputs": { + "blst": "blst_2", + "nixpkgs": [ + "cardano-parts", + "cardano-node-10-5-2", + "nixpkgs" + ], + "secp256k1": "secp256k1_2", + "sodium": "sodium_2" + }, + "locked": { + "lastModified": 1750025513, + "narHash": "sha256-WUNoYIZvU9moc5ccwJcF22r+bUJXO5dWoRyLPs8bJic=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "f63aa2a49720526900fb5943db4123b5b8dcc534", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, "iserv-proxy": { "flake": false, "locked": { @@ -1166,6 +1809,23 @@ "type": "github" } }, + "iserv-proxy_2": { + "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": { @@ -1182,6 +1842,22 @@ "type": "github" } }, + "lowdown-src_2": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -1225,14 +1901,35 @@ "type": "github" } }, - "nix_2": { + "nix_2": { + "inputs": { + "lowdown-src": "lowdown-src_2", + "nixpkgs": "nixpkgs_4", + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", + "owner": "NixOS", + "repo": "nix", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.11.0", + "repo": "nix", + "type": "github" + } + }, + "nix_3": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_3", "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression_2" + "nixpkgs-regression": "nixpkgs-regression_3" }, "locked": { "lastModified": 1751027644, @@ -1264,6 +1961,21 @@ "type": "github" } }, + "nixlib_2": { + "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" + } + }, "nixpkgs": { "locked": { "lastModified": 1657693803, @@ -1296,6 +2008,22 @@ "type": "github" } }, + "nixpkgs-2003_2": { + "locked": { + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-2105": { "locked": { "lastModified": 1659914493, @@ -1312,6 +2040,22 @@ "type": "github" } }, + "nixpkgs-2105_2": { + "locked": { + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-2111": { "locked": { "lastModified": 1659446231, @@ -1328,6 +2072,22 @@ "type": "github" } }, + "nixpkgs-2111_2": { + "locked": { + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-2205": { "locked": { "lastModified": 1685573264, @@ -1344,6 +2104,22 @@ "type": "github" } }, + "nixpkgs-2205_2": { + "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, @@ -1360,6 +2136,22 @@ "type": "github" } }, + "nixpkgs-2211_2": { + "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-23-11": { "locked": { "lastModified": 1717159533, @@ -1392,6 +2184,22 @@ "type": "github" } }, + "nixpkgs-2305_2": { + "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, @@ -1408,6 +2216,22 @@ "type": "github" } }, + "nixpkgs-2311_2": { + "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": 1720122915, @@ -1489,6 +2313,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": 1720181791, @@ -1506,6 +2346,22 @@ } }, "nixpkgs-unstable_2": { + "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-unstable_3": { "locked": { "lastModified": 1748248602, "narHash": "sha256-LanRAm0IRpL36KpCKSknEwkBFvTLc9mDHKeAmfTrHwg=", @@ -1554,6 +2410,22 @@ } }, "nixpkgs_4": { + "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_5": { "locked": { "lastModified": 1751071626, "narHash": "sha256-/uHE/AD2qGq4QLigWAnBHiVvpVXB04XAfrOtw8JMv+Y=", @@ -1569,7 +2441,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1751071626, "narHash": "sha256-/uHE/AD2qGq4QLigWAnBHiVvpVXB04XAfrOtw8JMv+Y=", @@ -1585,7 +2457,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1747179050, "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", @@ -1601,7 +2473,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1748162331, "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", @@ -1634,6 +2506,23 @@ "type": "github" } }, + "old-ghc-nix_2": { + "flake": false, + "locked": { + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", + "owner": "angerman", + "repo": "old-ghc-nix", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "type": "github" + }, + "original": { + "owner": "angerman", + "ref": "master", + "repo": "old-ghc-nix", + "type": "github" + } + }, "opentofu-registry": { "flake": false, "locked": { @@ -1734,6 +2623,23 @@ "type": "github" } }, + "secp256k1_4": { + "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" + } + }, "services-flake": { "locked": { "lastModified": 1705690208, @@ -1800,6 +2706,23 @@ "type": "github" } }, + "sodium_4": { + "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" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -1853,6 +2776,22 @@ "type": "github" } }, + "stackage_2": { + "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" + } + }, "stdlib": { "locked": { "lastModified": 1590026685, @@ -1898,6 +2837,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" + } + }, "terranix": { "inputs": { "flake-parts": [ @@ -1908,7 +2862,7 @@ "cardano-parts", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1747386897, @@ -1944,6 +2898,24 @@ "repo": "treefmt-nix", "type": "github" } + }, + "utils": { + "inputs": { + "systems": "systems_2" + }, + "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e6be2c78..e07ab58a 100644 --- a/flake.nix +++ b/flake.nix @@ -5,8 +5,8 @@ nixpkgs.follows = "cardano-parts/nixpkgs"; nixpkgs-unstable.follows = "cardano-parts/nixpkgs-unstable"; flake-parts.follows = "cardano-parts/flake-parts"; - cardano-parts.url = "github:input-output-hk/cardano-parts/v2025-11-18"; - # cardano-parts.url = "path:/home/jlotoski/work/iohk/cardano-parts-wt/v2025-11-18"; + cardano-parts.url = "github:input-output-hk/cardano-parts/next-2025-11-19"; + # cardano-parts.url = "path:/home/jlotoski/work/iohk/cardano-parts-wt/next-2025-11-19"; # Local pins for additional customization: # cardanoTest.url = "github:IntersectMBO/cardano-node/10.5.1"; From fb2a4c830ad21d9885ec37e8b2cfe1bc1f65804f Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Wed, 19 Nov 2025 11:05:16 -0600 Subject: [PATCH 2/6] cleanup: preview test machines --- flake.lock | 6 ++--- flake/colmena.nix | 59 ++--------------------------------------------- 2 files changed, 5 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 855a155b..e0285120 100644 --- a/flake.lock +++ b/flake.lock @@ -577,11 +577,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1763527874, - "narHash": "sha256-qMPPoIhNoyVlGO1RQQ2UODd2qJqHOr4X/BarhEWJA+g=", + "lastModified": 1763570485, + "narHash": "sha256-CleqxP0qC5Km3KpSptlwiI9r8PG3x1CwKY8v8JVpyBo=", "owner": "input-output-hk", "repo": "cardano-parts", - "rev": "9a8efc11a3cb14ddca825e846bd4955473ba93de", + "rev": "c762877a7d807165215f2b48805145be3f987ac6", "type": "github" }, "original": { diff --git a/flake/colmena.nix b/flake/colmena.nix index f1fb4127..05749930 100644 --- a/flake/colmena.nix +++ b/flake/colmena.nix @@ -37,7 +37,7 @@ in r6a-xlarge.aws.instance.instance_type = "r6a.xlarge"; # t3a-micro.aws.instance.instance_type = "t3a.micro"; # t3a-small.aws.instance.instance_type = "t3a.small"; - # t3-medium.aws.instance.instance_type = "t3.medium"; + t3-medium.aws.instance.instance_type = "t3.medium"; t3a-medium.aws.instance.instance_type = "t3a.medium"; t3a-large.aws.instance.instance_type = "t3a.large"; # t3a-xlarge.aws.instance.instance_type = "t3a.xlarge"; @@ -824,62 +824,7 @@ in preview1-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node hiConn rel previewRelMig tcpTxOpt];}; preview1-dbsync-a-1 = {imports = [eu-central-1 r6a-large (ebs 250) (group "preview1") dbsync-pre smash previewSmash];}; preview1-faucet-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node faucet previewFaucet];}; - - # Smallest d variant for testing - - # We are going to investigate these 4 versions of the node: - # A: 10.5.1 (tag 10.5.1 , https://github.com/IntersectMBO/cardano-node/tree/10.5.1, https://github.com/IntersectMBO/cardano-node/commit/ca1ec278070baf4481564a6ba7b4a5b9e3d9f366) - # B: 10.6 integration branch (for V2 inmemory) (tip of Ana's branch, https://github.com/IntersectMBO/cardano-node/commit/9a132bb72045e9462f0612e5df5af07c7206635a) - # C: 10.6 with patches (https://github.com/IntersectMBO/cardano-node/commit/1ac429175dd4ebb391e633900a514ea145355475) - # D : 10.6 with traces (and patches) (https://github.com/IntersectMBO/cardano-node/commit/93437a0fb34161f7b6e07334f0760ed670d28b02) - # With new tracing, syncing from Genesis, we will run - # preview1-test-a-1 - Also adding a 10.6 LMDB with patches ledger replay from genesis only (chain is already in sync). - # preview1-test-a-2 - 10.5.1 LMDB, full chain replay - # preview1-test-a-3 - 10.6 InMemory (ana/10.6-final-integration-mix branch) - # preview1-test-a-4 - 10.6 LMDB with patches, full chain replay - # preview1-test-a-5 - 10.6 InMemory with patches, full chain replay - # preview1-test-a-6 - 10.6 LMDB with patches, full chain replay, and "space-type" and eventlog profiling - # preview1-test-a-7 - 10.6 LMDB with patches and new traces, full chain replay - # - # ----------------------- - # - ### Round 2 2025-11-05 - # preview1-test-a-1 - 10.6 LMDB with patches, ledger replay from genesis only (chain is already in sync), with -hi profiling - # preview1-test-a-2 - 10.5.1 LMDB, full chain replay, with -hi profiling - # preview1-test-a-3 - 10.6 InMemory (ana/10.6-final-integration-mix branch), full chain replay, with -hi profiling - # preview1-test-a-4 - 10.6 LMDB with patches, full chain replay, with -hi profiling - # preview1-test-a-5 - 10.6 InMemory with patches, full chain replay, with -hi profiling - # preview1-test-a-6 - 10.6 LMDB js/bang, full chain replay - # preview1-test-a-7 - 10.6 LMDB js/bang, full chain replay, with -hi profiling - # - # ----------------------- - # - ### Round 3 2025-11-06 - # - # - We've already run LMDB bang once, so: - # - repeat 2x more for 3 LMDB bang genesis re-syncs total - # - run 3x for 3 LMDB strict genesis re-syncs total - # - run 1x for 1 InMem bang genesis re-sync - # - run 1x for 1 InMem strict genesis re-sync - # - # preview1-test-a-1 - 10.6 LMDB bang - # preview1-test-a-2 - 10.6 LMDB bang - # preview1-test-a-3 - 10.6 LMDB strict - # preview1-test-a-4 - 10.6 LMDB strict - # preview1-test-a-5 - 10.6 LMDB strict - # preview1-test-a-6 - 10.6 InMemory bang - # preview1-test-a-7 - 10.6 InMemory strict - - # Prior config of preview1-test-a-1 to return to when testing rounds are over - # preview1-test-a-1 = {imports = [eu-central-1 m5ad-xlarge (ebs 80) (nodeRamPct 70) (group "preview1") node-pre bp mithrilSignerDisable tcpTxOpt];}; - preview1-test-a-1 = {imports = [eu-central-1 m5ad-xlarge (ebs 80) (nodeRamPct 70) (group "preview1") node-pre lmdb];}; - preview1-test-a-2 = {imports = [eu-central-1 m5ad-xlarge (ebs 80) (nodeRamPct 70) (group "preview1") node-pre lmdb];}; - preview1-test-a-3 = {imports = [eu-central-1 m5ad-xlarge (ebs 80) (nodeRamPct 70) (group "preview1") node-pre lmdb];}; - preview1-test-a-4 = {imports = [eu-central-1 m5ad-xlarge (ebs 80) (nodeRamPct 70) (group "preview1") node-pre];}; - preview1-test-a-5 = {imports = [eu-central-1 m5ad-xlarge (ebs 80) (nodeRamPct 70) (group "preview1") node-pre];}; - preview1-test-a-6 = {imports = [eu-central-1 m5ad-xlarge (ebs 80) (nodeRamPct 70) (group "preview1") node-pre];}; - preview1-test-a-7 = {imports = [eu-central-1 m5ad-xlarge (ebs 80) (nodeRamPct 70) (group "preview1") node-pre];}; # ----------------------- @@ -920,7 +865,7 @@ in misc1-metadata-a-1 = {imports = [eu-central-1 t3a-large (ebs 80) (group "misc1") metadata nixosModules.cardano-ipfs];}; misc1-webserver-a-1 = {imports = [eu-central-1 t3a-medium (ebs 80) (group "misc1") webserver (varnishRamPct 50)];}; misc1-wg-a-1 = {imports = [eu-central-1 t3a-medium (ebs 80) (group "misc1") nixosModules.wg-r2-tunnel];}; - misc1-wg-b-1 = {imports = [eu-north-1 t3a-medium (ebs 80) (group "misc1") nixosModules.wg-r2-tunnel];}; + misc1-wg-b-1 = {imports = [eu-north-1 t3-medium (ebs 80) (group "misc1") nixosModules.wg-r2-tunnel];}; misc1-matomo-a-1 = {imports = [eu-central-1 t3a-medium (ebs 80) (group "misc1") nixosModules.matomo];}; # --------------------------------------------------------------------------------------------------------- From b0607b59e0aea3f359ff946ac5c5143f8444bb3d Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Wed, 19 Nov 2025 11:36:54 -0600 Subject: [PATCH 3/6] stop: wg instances for hydra build farm tunnel --- flake/colmena.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake/colmena.nix b/flake/colmena.nix index 05749930..78c94545 100644 --- a/flake/colmena.nix +++ b/flake/colmena.nix @@ -864,8 +864,8 @@ in # Misc misc1-metadata-a-1 = {imports = [eu-central-1 t3a-large (ebs 80) (group "misc1") metadata nixosModules.cardano-ipfs];}; misc1-webserver-a-1 = {imports = [eu-central-1 t3a-medium (ebs 80) (group "misc1") webserver (varnishRamPct 50)];}; - misc1-wg-a-1 = {imports = [eu-central-1 t3a-medium (ebs 80) (group "misc1") nixosModules.wg-r2-tunnel];}; - misc1-wg-b-1 = {imports = [eu-north-1 t3-medium (ebs 80) (group "misc1") nixosModules.wg-r2-tunnel];}; + misc1-wg-a-1 = {imports = [eu-central-1 t3a-medium (ebs 80) (group "misc1") nixosModules.wg-r2-tunnel disableAlertCount];}; + misc1-wg-b-1 = {imports = [eu-north-1 t3-medium (ebs 80) (group "misc1") nixosModules.wg-r2-tunnel disableAlertCount];}; misc1-matomo-a-1 = {imports = [eu-central-1 t3a-medium (ebs 80) (group "misc1") nixosModules.matomo];}; # --------------------------------------------------------------------------------------------------------- From 87ab5b4873ee9a5d4a176656e0ed825172a8f039 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Wed, 19 Nov 2025 12:07:37 -0600 Subject: [PATCH 4/6] dbsync: update to 10.5.2 candidate --- flake/colmena.nix | 55 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/flake/colmena.nix b/flake/colmena.nix index 78c94545..8b247b9a 100644 --- a/flake/colmena.nix +++ b/flake/colmena.nix @@ -252,29 +252,11 @@ in }; rel = {imports = [inputs.cardano-parts.nixosModules.role-relay topoRel];}; - # dbsync = { - # imports = [ - # config.flake.cardano-parts.cluster.groups.default.meta.cardano-node-service - # config.flake.cardano-parts.cluster.groups.default.meta.cardano-tracer-service - # config.flake.cardano-parts.cluster.groups.default.meta.cardano-db-sync-service - # inputs.cardano-parts.nixosModules.profile-cardano-db-sync - # inputs.cardano-parts.nixosModules.profile-cardano-node-group - # inputs.cardano-parts.nixosModules.profile-cardano-custom-metrics - # inputs.cardano-parts.nixosModules.profile-cardano-postgres - # { - # services.cardano-node.shareNodeSocket = true; - # services.cardano-postgres.enablePsqlrc = true; - # } - # bperfNoPublish - # ]; - # }; - - # While new tracing PRs are WIP, the new node service is required - dbsync-pre = { + dbsync = { imports = [ - config.flake.cardano-parts.cluster.groups.default.meta.cardano-node-service-ng - config.flake.cardano-parts.cluster.groups.default.meta.cardano-tracer-service-ng - config.flake.cardano-parts.cluster.groups.default.meta.cardano-db-sync-service-ng + config.flake.cardano-parts.cluster.groups.default.meta.cardano-node-service + config.flake.cardano-parts.cluster.groups.default.meta.cardano-tracer-service + config.flake.cardano-parts.cluster.groups.default.meta.cardano-db-sync-service inputs.cardano-parts.nixosModules.profile-cardano-db-sync inputs.cardano-parts.nixosModules.profile-cardano-node-group inputs.cardano-parts.nixosModules.profile-cardano-custom-metrics @@ -283,11 +265,28 @@ in services.cardano-node.shareNodeSocket = true; services.cardano-postgres.enablePsqlrc = true; } - - pre + bperfNoPublish ]; }; + # dbsync-pre = { + # imports = [ + # config.flake.cardano-parts.cluster.groups.default.meta.cardano-node-service-ng + # config.flake.cardano-parts.cluster.groups.default.meta.cardano-tracer-service-ng + # config.flake.cardano-parts.cluster.groups.default.meta.cardano-db-sync-service-ng + # inputs.cardano-parts.nixosModules.profile-cardano-db-sync + # inputs.cardano-parts.nixosModules.profile-cardano-node-group + # inputs.cardano-parts.nixosModules.profile-cardano-custom-metrics + # inputs.cardano-parts.nixosModules.profile-cardano-postgres + # { + # services.cardano-node.shareNodeSocket = true; + # services.cardano-postgres.enablePsqlrc = true; + # } + + # pre + # ]; + # }; + # ogmios = { # imports = [ # config.flake.cardano-parts.cluster.groups.default.meta.cardano-ogmios-service @@ -801,7 +800,7 @@ in preprod1-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node hiConn rel preprodRelMig mithrilRelay (declMSigner "preprod1-bp-a-1")];}; preprod1-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node hiConn rel preprodRelMig];}; preprod1-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node hiConn rel preprodRelMig tcpTxOpt];}; - preprod1-dbsync-a-1 = {imports = [eu-central-1 r6a-xlarge (ebs 200) (group "preprod1") dbsync-pre smash preprodSmash];}; + preprod1-dbsync-a-1 = {imports = [eu-central-1 r6a-xlarge (ebs 200) (group "preprod1") dbsync smash preprodSmash];}; preprod1-faucet-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod1") node faucet preprodFaucet];}; preprod2-bp-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preprod2") node bp legacyT mithrilRelease (declMRel "preprod2-rel-b-1")];}; @@ -822,7 +821,7 @@ in preview1-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node hiConn rel previewRelMig mithrilRelay (declMSigner "preview1-bp-a-1")];}; preview1-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node hiConn rel previewRelMig];}; preview1-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node hiConn rel previewRelMig tcpTxOpt];}; - preview1-dbsync-a-1 = {imports = [eu-central-1 r6a-large (ebs 250) (group "preview1") dbsync-pre smash previewSmash];}; + preview1-dbsync-a-1 = {imports = [eu-central-1 r6a-large (ebs 250) (group "preview1") dbsync smash previewSmash];}; preview1-faucet-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node faucet previewFaucet];}; preview1-test-a-1 = {imports = [eu-central-1 m5ad-xlarge (ebs 80) (nodeRamPct 70) (group "preview1") node-pre lmdb];}; @@ -845,8 +844,8 @@ in # Rel-a-{2,3} lmdb and mdb fault tests # Rel-a-4 addnl current release tests # Dbsync-a-2 is kept in stopped state unless actively needed for testing and excluded from the machine count alert - mainnet1-dbsync-a-1 = {imports = [eu-central-1 r5-2xlarge (ebs 1000) (group "mainnet1") dbsync-pre dbsyncPub (openFwTcp 5432) {services.cardano-db-sync.nodeRamAvailableMiB = 20480;}];}; - mainnet1-dbsync-a-2 = {imports = [eu-central-1 r5-2xlarge (ebs 1000) (group "mainnet1") dbsync-pre disableAlertCount];}; + mainnet1-dbsync-a-1 = {imports = [eu-central-1 r5-2xlarge (ebs 1000) (group "mainnet1") dbsync dbsyncPub (openFwTcp 5432) {services.cardano-db-sync.nodeRamAvailableMiB = 20480;}];}; + mainnet1-dbsync-a-2 = {imports = [eu-central-1 r5-2xlarge (ebs 1000) (group "mainnet1") dbsync disableAlertCount];}; # mainnet1-rel-a-1 = {imports = [eu-central-1 m5a-2xlarge (ebs 300) (group "mainnet1") node nodeGhc963 (openFwTcp 3001) bp gcLogging];}; # mainnet1-rel-a-1 = {imports = [eu-central-1 m5a-2xlarge (ebs 300) (group "mainnet1") node nodeGhc963 (openFwTcp 3001)];}; From 816ebddf26d3810527f63ff750a4a31f8068ba2c Mon Sep 17 00:00:00 2001 From: david amick Date: Wed, 19 Nov 2025 10:27:56 -0800 Subject: [PATCH 5/6] Convert mainnet1-rel-a-1 to 10.5.2 candidate --- flake/colmena.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake/colmena.nix b/flake/colmena.nix index 8b247b9a..85f84036 100644 --- a/flake/colmena.nix +++ b/flake/colmena.nix @@ -850,7 +850,7 @@ in # mainnet1-rel-a-1 = {imports = [eu-central-1 m5a-2xlarge (ebs 300) (group "mainnet1") node nodeGhc963 (openFwTcp 3001) bp gcLogging];}; # mainnet1-rel-a-1 = {imports = [eu-central-1 m5a-2xlarge (ebs 300) (group "mainnet1") node nodeGhc963 (openFwTcp 3001)];}; # mainnet1-rel-a-1 = {imports = [eu-central-1 m5a-2xlarge (ebs 300) (group "mainnet1") node (openFwTcp 3001)];}; - mainnet1-rel-a-1 = {imports = [eu-central-1 r5-xlarge (ebs 400) (group "mainnet1") node-pre bp mithrilSignerDisable];}; + mainnet1-rel-a-1 = {imports = [eu-central-1 r5-xlarge (ebs 400) (group "mainnet1") node bp mithrilSignerDisable];}; # Also keep the lmdb and extra debug mainnet node in stopped state for now # mainnet1-rel-a-2 = {imports = [eu-central-1 m5ad-large (ebs 300) (group "mainnet1") node-pre lmdb ram8gib (openFwTcp 3001)];}; From f79bcdc1e4f62dda8f1071d72faaf4310fa1fe72 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Fri, 21 Nov 2025 01:29:21 -0600 Subject: [PATCH 6/6] bump: cardano-parts for node 10.5.2 --- flake.lock | 1195 ++++++++++++++++++++++++++++++++++++++++----- flake.nix | 4 + flake/colmena.nix | 218 ++++++++- 3 files changed, 1288 insertions(+), 129 deletions(-) diff --git a/flake.lock b/flake.lock index e0285120..c0ddb345 100644 --- a/flake.lock +++ b/flake.lock @@ -1,6 +1,23 @@ { "nodes": { "CHaP": { + "flake": false, + "locked": { + "lastModified": 1763670101, + "narHash": "sha256-3S6OSnW0Nn+YBVmuV0XnYQRAuS3i0F9lRdH4KQiN1uI=", + "owner": "intersectmbo", + "repo": "cardano-haskell-packages", + "rev": "d341a38325d5d65cde10fa92af125b226c51615f", + "type": "github" + }, + "original": { + "owner": "intersectmbo", + "ref": "repo", + "repo": "cardano-haskell-packages", + "type": "github" + } + }, + "CHaP_2": { "flake": false, "locked": { "lastModified": 1727364445, @@ -17,7 +34,7 @@ "type": "github" } }, - "CHaP_2": { + "CHaP_3": { "flake": false, "locked": { "lastModified": 1763036723, @@ -66,6 +83,22 @@ "type": "github" } }, + "HTTP_3": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, "auth-keys-hub": { "inputs": { "flake-parts": [ @@ -115,7 +148,7 @@ "blockperf": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1758832274, @@ -133,6 +166,23 @@ } }, "blst": { + "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" + } + }, + "blst_2": { "flake": false, "locked": { "lastModified": 1691598027, @@ -149,7 +199,7 @@ "type": "github" } }, - "blst_2": { + "blst_3": { "flake": false, "locked": { "lastModified": 1739372843, @@ -166,7 +216,7 @@ "type": "github" } }, - "blst_3": { + "blst_4": { "flake": false, "locked": { "lastModified": 1739372843, @@ -183,7 +233,7 @@ "type": "github" } }, - "blst_4": { + "blst_5": { "flake": false, "locked": { "lastModified": 1739372843, @@ -234,6 +284,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": { @@ -268,6 +335,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": { @@ -302,13 +386,30 @@ "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" + } + }, "capkgs": { "locked": { - "lastModified": 1763153457, - "narHash": "sha256-2orZuWq9ewAs8RT+kvSeqcbTul4mGaxLCFHYRIUvLvA=", + "lastModified": 1763687272, + "narHash": "sha256-wSM70yMIgfdODgigf/RG/yFNSjI/wa77TVGOjXmUrbU=", "owner": "input-output-hk", "repo": "capkgs", - "rev": "4146aa28984f63ef9cd8fbda904ce345958e23f9", + "rev": "d7536af2c9afe5bac1e28273374a38c045a45d67", "type": "github" }, "original": { @@ -319,7 +420,33 @@ }, "cardano-automation": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", + "haskellNix": [ + "cardano-node-10-5-2", + "haskellNix" + ], + "nixpkgs": [ + "cardano-node-10-5-2", + "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-automation_2": { + "inputs": { + "flake-utils": "flake-utils_3", "haskellNix": [ "cardano-parts", "cardano-node-10-5-2", @@ -430,24 +557,58 @@ }, "cardano-node-10-5-2": { "inputs": { - "CHaP": "CHaP_2", + "CHaP": "CHaP", "cardano-automation": "cardano-automation", "customConfig": "customConfig", "em": "em", "empty-flake": "empty-flake", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "hackageNix": "hackageNix", - "haskellNix": "haskellNix_2", - "incl": "incl_2", - "iohkNix": "iohkNix_2", + "haskellNix": "haskellNix", + "incl": "incl", + "iohkNix": "iohkNix", "nixpkgs": [ - "cardano-parts", "cardano-node-10-5-2", "haskellNix", "nixpkgs-unstable" ], "utils": "utils" }, + "locked": { + "lastModified": 1763670639, + "narHash": "sha256-QLTO6gIilimqzDtrnTNFJaABja1iuSslWzYRkLZH+Ug=", + "owner": "IntersectMBO", + "repo": "cardano-node", + "rev": "1a0d2e65beb5e4dde5cb33f7fabeeec6f0e14a60", + "type": "github" + }, + "original": { + "owner": "IntersectMBO", + "ref": "sl/10.5.1-chap-update", + "repo": "cardano-node", + "type": "github" + } + }, + "cardano-node-10-5-2_2": { + "inputs": { + "CHaP": "CHaP_3", + "cardano-automation": "cardano-automation_2", + "customConfig": "customConfig_2", + "em": "em_2", + "empty-flake": "empty-flake_2", + "flake-compat": "flake-compat_4", + "hackageNix": "hackageNix_2", + "haskellNix": "haskellNix_3", + "incl": "incl_3", + "iohkNix": "iohkNix_3", + "nixpkgs": [ + "cardano-parts", + "cardano-node-10-5-2", + "haskellNix", + "nixpkgs-unstable" + ], + "utils": "utils_2" + }, "locked": { "lastModified": 1763482419, "narHash": "sha256-06e1RpS46HR2UtNmJq0l0jPr5QptofSFwouBDKKDDZw=", @@ -465,11 +626,11 @@ }, "cardano-node-pparams-api": { "inputs": { - "CHaP": "CHaP", - "flake-utils": "flake-utils", - "haskellNix": "haskellNix", - "incl": "incl", - "iohkNix": "iohkNix", + "CHaP": "CHaP_2", + "flake-utils": "flake-utils_2", + "haskellNix": "haskellNix_2", + "incl": "incl_2", + "iohkNix": "iohkNix_2", "nixpkgs": [ "cardano-node-pparams-api", "haskellNix", @@ -552,7 +713,7 @@ "cardano-db-sync-service": "cardano-db-sync-service", "cardano-db-sync-service-ng": "cardano-db-sync-service-ng", "cardano-metadata-service": "cardano-metadata-service", - "cardano-node-10-5-2": "cardano-node-10-5-2", + "cardano-node-10-5-2": "cardano-node-10-5-2_2", "cardano-node-service": "cardano-node-service", "cardano-node-service-ng": "cardano-node-service-ng", "cardano-ogmios-service": "cardano-ogmios-service", @@ -566,9 +727,9 @@ "inputs-check": "inputs-check", "iohk-nix": "iohk-nix", "iohk-nix-ng": "iohk-nix-ng", - "nix": "nix_3", - "nixpkgs": "nixpkgs_8", - "nixpkgs-unstable": "nixpkgs-unstable_3", + "nix": "nix_4", + "nixpkgs": "nixpkgs_9", + "nixpkgs-unstable": "nixpkgs-unstable_4", "opentofu-registry": "opentofu-registry", "process-compose-flake": "process-compose-flake", "services-flake": "services-flake", @@ -577,11 +738,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1763570485, - "narHash": "sha256-CleqxP0qC5Km3KpSptlwiI9r8PG3x1CwKY8v8JVpyBo=", + "lastModified": 1763709913, + "narHash": "sha256-pQZEDAYcDjH2VmNmdlUZmmdfrPoHrXr6QHnbSFdu/+0=", "owner": "input-output-hk", "repo": "cardano-parts", - "rev": "c762877a7d807165215f2b48805145be3f987ac6", + "rev": "1b73773127f91dd1e88fae0e3bd9cd8834262e1c", "type": "github" }, "original": { @@ -623,6 +784,22 @@ "type": "github" } }, + "cardano-shell_3": { + "flake": false, + "locked": { + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "type": "github" + } + }, "cardano-submit-api-service": { "flake": false, "locked": { @@ -710,8 +887,8 @@ }, "colmena": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_4", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "cardano-parts", @@ -748,6 +925,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" + } + }, "em": { "flake": false, "locked": { @@ -764,6 +956,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, @@ -779,24 +987,22 @@ "type": "github" } }, - "flake-compat": { - "flake": false, + "empty-flake_2": { "locked": { - "lastModified": 1672831974, - "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "lastModified": 1630400035, + "narHash": "sha256-MWaVOCzuFwp09wZIW9iHq5wWen5C69I940N1swZLEQ0=", "owner": "input-output-hk", - "repo": "flake-compat", - "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", + "repo": "empty-flake", + "rev": "2040a05b67bf9a669ce17eca56beb14b4206a99a", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "hkm/gitlab-fix", - "repo": "flake-compat", + "repo": "empty-flake", "type": "github" } }, - "flake-compat_2": { + "flake-compat": { "flake": false, "locked": { "lastModified": 1647532380, @@ -813,7 +1019,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1672831974, @@ -830,28 +1036,79 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "owner": "input-output-hk", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "input-output-hk", + "ref": "hkm/gitlab-fix", "repo": "flake-compat", "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", + "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_5": { + "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_6": { + "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_7": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", "repo": "flake-compat", "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" @@ -921,8 +1178,23 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1681378341, @@ -939,7 +1211,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -954,7 +1226,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -1003,6 +1275,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": { @@ -1022,6 +1311,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": { @@ -1040,6 +1348,24 @@ "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": [ @@ -1108,6 +1434,23 @@ "type": "github" } }, + "hackageNix_2": { + "flake": false, + "locked": { + "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" + } + }, "haskellNix": { "inputs": { "HTTP": "HTTP", @@ -1115,9 +1458,14 @@ "cabal-34": "cabal-34", "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "hackage": "hackage", + "ghc910X": "ghc910X", + "ghc911": "ghc911", + "hackage": [ + "cardano-node-10-5-2", + "hackageNix" + ], "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", "hls-2.2": "hls-2.2", @@ -1127,14 +1475,12 @@ "hls-2.6": "hls-2.6", "hls-2.7": "hls-2.7", "hls-2.8": "hls-2.8", - "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", "nixpkgs": [ - "cardano-node-pparams-api", - "haskellNix", - "nixpkgs-unstable" + "cardano-node-10-5-2", + "nixpkgs" ], "nixpkgs-2003": "nixpkgs-2003", "nixpkgs-2105": "nixpkgs-2105", @@ -1143,22 +1489,22 @@ "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2311": "nixpkgs-2311", - "nixpkgs-2405": "nixpkgs-2405", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1727830257, - "narHash": "sha256-MWSPrlbnki4181gdUPiEf/skLi1K+k/CEATxDBfrJo8=", + "lastModified": 1718797200, + "narHash": "sha256-ueFxTuZrQ3ZT/Fj5sSeUWlqKa4+OkUU1xW0E+q/XTfw=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "e1b4513aedd0b3055b34171c60a4cc6fe898b318", + "rev": "cb139fa956158397aa398186bb32dd26f7318784", "type": "github" }, "original": { "owner": "input-output-hk", "repo": "haskell.nix", + "rev": "cb139fa956158397aa398186bb32dd26f7318784", "type": "github" } }, @@ -1171,13 +1517,7 @@ "cardano-shell": "cardano-shell_2", "flake-compat": "flake-compat_3", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", - "ghc910X": "ghc910X", - "ghc911": "ghc911", - "hackage": [ - "cardano-parts", - "cardano-node-10-5-2", - "hackageNix" - ], + "hackage": "hackage", "hls-1.10": "hls-1.10_2", "hls-2.0": "hls-2.0_2", "hls-2.2": "hls-2.2_2", @@ -1187,13 +1527,14 @@ "hls-2.6": "hls-2.6_2", "hls-2.7": "hls-2.7_2", "hls-2.8": "hls-2.8_2", + "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls_2", "hydra": "hydra_2", "iserv-proxy": "iserv-proxy_2", "nixpkgs": [ - "cardano-parts", - "cardano-node-10-5-2", - "nixpkgs" + "cardano-node-pparams-api", + "haskellNix", + "nixpkgs-unstable" ], "nixpkgs-2003": "nixpkgs-2003_2", "nixpkgs-2105": "nixpkgs-2105_2", @@ -1202,10 +1543,69 @@ "nixpkgs-2211": "nixpkgs-2211_2", "nixpkgs-2305": "nixpkgs-2305_2", "nixpkgs-2311": "nixpkgs-2311_2", + "nixpkgs-2405": "nixpkgs-2405", "nixpkgs-unstable": "nixpkgs-unstable_2", "old-ghc-nix": "old-ghc-nix_2", "stackage": "stackage_2" }, + "locked": { + "lastModified": 1727830257, + "narHash": "sha256-MWSPrlbnki4181gdUPiEf/skLi1K+k/CEATxDBfrJo8=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "e1b4513aedd0b3055b34171c60a4cc6fe898b318", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "haskell.nix", + "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_5", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_3", + "ghc910X": "ghc910X_2", + "ghc911": "ghc911_2", + "hackage": [ + "cardano-parts", + "cardano-node-10-5-2", + "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-parts", + "cardano-node-10-5-2", + "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=", @@ -1255,6 +1655,23 @@ "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": { @@ -1289,6 +1706,23 @@ "type": "github" } }, + "hls-2.0_3": { + "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": { @@ -1323,6 +1757,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": { @@ -1357,6 +1808,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": { @@ -1386,12 +1854,46 @@ }, "original": { "owner": "haskell", - "ref": "2.4.0.1", + "ref": "2.4.0.1", + "repo": "haskell-language-server", + "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": { + "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.5": { + "hls-2.5_2": { "flake": false, "locked": { "lastModified": 1701080174, @@ -1408,7 +1910,7 @@ "type": "github" } }, - "hls-2.5_2": { + "hls-2.5_3": { "flake": false, "locked": { "lastModified": 1701080174, @@ -1459,6 +1961,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": { @@ -1493,6 +2012,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": { @@ -1527,6 +2063,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": { @@ -1576,11 +2129,27 @@ "type": "github" } }, + "hpc-coveralls_3": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "type": "github" + } + }, "hydra": { "inputs": { "nix": "nix", "nixpkgs": [ - "cardano-node-pparams-api", + "cardano-node-10-5-2", "haskellNix", "hydra", "nix", @@ -1603,6 +2172,30 @@ "hydra_2": { "inputs": { "nix": "nix_2", + "nixpkgs": [ + "cardano-node-pparams-api", + "haskellNix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", + "owner": "NixOS", + "repo": "hydra", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, + "hydra_3": { + "inputs": { + "nix": "nix_3", "nixpkgs": [ "cardano-parts", "cardano-node-10-5-2", @@ -1661,6 +2254,24 @@ "type": "github" } }, + "incl_3": { + "inputs": { + "nixlib": "nixlib_3" + }, + "locked": { + "lastModified": 1693483555, + "narHash": "sha256-Beq4WhSeH3jRTZgC1XopTSU10yLpK1nmMcnGoXO0XYo=", + "owner": "divnix", + "repo": "incl", + "rev": "526751ad3d1e23b07944b14e3f6b7a5948d3007b", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, "inclusive": { "inputs": { "stdlib": "stdlib" @@ -1706,10 +2317,10 @@ }, "iohk-nix": { "inputs": { - "blst": "blst_3", - "nixpkgs": "nixpkgs_5", - "secp256k1": "secp256k1_3", - "sodium": "sodium_3" + "blst": "blst_4", + "nixpkgs": "nixpkgs_6", + "secp256k1": "secp256k1_4", + "sodium": "sodium_4" }, "locked": { "lastModified": 1751421193, @@ -1727,10 +2338,10 @@ }, "iohk-nix-ng": { "inputs": { - "blst": "blst_4", - "nixpkgs": "nixpkgs_6", - "secp256k1": "secp256k1_4", - "sodium": "sodium_4" + "blst": "blst_5", + "nixpkgs": "nixpkgs_7", + "secp256k1": "secp256k1_5", + "sodium": "sodium_5" }, "locked": { "lastModified": 1762970280, @@ -1749,10 +2360,34 @@ "iohkNix": { "inputs": { "blst": "blst", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "cardano-node-10-5-2", + "nixpkgs" + ], "secp256k1": "secp256k1", "sodium": "sodium" }, + "locked": { + "lastModified": 1750025513, + "narHash": "sha256-WUNoYIZvU9moc5ccwJcF22r+bUJXO5dWoRyLPs8bJic=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "f63aa2a49720526900fb5943db4123b5b8dcc534", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohkNix_2": { + "inputs": { + "blst": "blst_2", + "nixpkgs": "nixpkgs_3", + "secp256k1": "secp256k1_2", + "sodium": "sodium_2" + }, "locked": { "lastModified": 1721825987, "narHash": "sha256-PPcma4tjozwXJAWf+YtHUQUulmxwulVlwSQzKItx/n8=", @@ -1767,16 +2402,16 @@ "type": "github" } }, - "iohkNix_2": { + "iohkNix_3": { "inputs": { - "blst": "blst_2", + "blst": "blst_3", "nixpkgs": [ "cardano-parts", "cardano-node-10-5-2", "nixpkgs" ], - "secp256k1": "secp256k1_2", - "sodium": "sodium_2" + "secp256k1": "secp256k1_3", + "sodium": "sodium_3" }, "locked": { "lastModified": 1750025513, @@ -1826,6 +2461,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": { @@ -1858,6 +2510,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", @@ -1904,7 +2572,7 @@ "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -1924,12 +2592,33 @@ }, "nix_3": { "inputs": { - "flake-compat": "flake-compat_5", + "lowdown-src": "lowdown-src_3", + "nixpkgs": "nixpkgs_5", + "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_4": { + "inputs": { + "flake-compat": "flake-compat_7", "flake-parts": "flake-parts_3", "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression_3" + "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { "lastModified": 1751027644, @@ -1976,6 +2665,21 @@ "type": "github" } }, + "nixlib_3": { + "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" + } + }, "nixpkgs": { "locked": { "lastModified": 1657693803, @@ -1987,12 +2691,44 @@ }, "original": { "owner": "NixOS", - "ref": "nixos-22.05-small", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2003": { + "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-2003_2": { + "locked": { + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2003": { + "nixpkgs-2003_3": { "locked": { "lastModified": 1620055814, "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", @@ -2008,23 +2744,23 @@ "type": "github" } }, - "nixpkgs-2003_2": { + "nixpkgs-2105": { "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", + "ref": "nixpkgs-21.05-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2105": { + "nixpkgs-2105_2": { "locked": { "lastModified": 1659914493, "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", @@ -2040,7 +2776,7 @@ "type": "github" } }, - "nixpkgs-2105_2": { + "nixpkgs-2105_3": { "locked": { "lastModified": 1659914493, "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", @@ -2088,6 +2824,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, @@ -2120,6 +2872,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, @@ -2152,6 +2920,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-23-11": { "locked": { "lastModified": 1717159533, @@ -2169,6 +2953,22 @@ } }, "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": 1705033721, "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", @@ -2184,7 +2984,7 @@ "type": "github" } }, - "nixpkgs-2305_2": { + "nixpkgs-2305_3": { "locked": { "lastModified": 1701362232, "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", @@ -2201,6 +3001,22 @@ } }, "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-2311_2": { "locked": { "lastModified": 1719957072, "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", @@ -2216,7 +3032,7 @@ "type": "github" } }, - "nixpkgs-2311_2": { + "nixpkgs-2311_3": { "locked": { "lastModified": 1701386440, "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", @@ -2329,7 +3145,39 @@ "type": "github" } }, + "nixpkgs-regression_4": { + "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": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", + "type": "github" + } + }, + "nixpkgs-unstable_2": { "locked": { "lastModified": 1720181791, "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", @@ -2345,7 +3193,7 @@ "type": "github" } }, - "nixpkgs-unstable_2": { + "nixpkgs-unstable_3": { "locked": { "lastModified": 1694822471, "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", @@ -2361,7 +3209,7 @@ "type": "github" } }, - "nixpkgs-unstable_3": { + "nixpkgs-unstable_4": { "locked": { "lastModified": 1748248602, "narHash": "sha256-LanRAm0IRpL36KpCKSknEwkBFvTLc9mDHKeAmfTrHwg=", @@ -2378,6 +3226,22 @@ } }, "nixpkgs_2": { + "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_3": { "locked": { "lastModified": 1684171562, "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", @@ -2393,7 +3257,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1705458851, "narHash": "sha256-uQvEhiv33Zj/Pv364dTvnpPwFSptRZgVedDzoM+HqVg=", @@ -2409,7 +3273,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -2425,7 +3289,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1751071626, "narHash": "sha256-/uHE/AD2qGq4QLigWAnBHiVvpVXB04XAfrOtw8JMv+Y=", @@ -2441,7 +3305,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1751071626, "narHash": "sha256-/uHE/AD2qGq4QLigWAnBHiVvpVXB04XAfrOtw8JMv+Y=", @@ -2457,7 +3321,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1747179050, "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", @@ -2473,7 +3337,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1748162331, "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", @@ -2523,6 +3387,23 @@ "type": "github" } }, + "old-ghc-nix_3": { + "flake": false, + "locked": { + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", + "owner": "angerman", + "repo": "old-ghc-nix", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "type": "github" + }, + "original": { + "owner": "angerman", + "ref": "master", + "repo": "old-ghc-nix", + "type": "github" + } + }, "opentofu-registry": { "flake": false, "locked": { @@ -2556,6 +3437,7 @@ }, "root": { "inputs": { + "cardano-node-10-5-2": "cardano-node-10-5-2", "cardano-node-pparams-api": "cardano-node-pparams-api", "cardano-parts": "cardano-parts", "flake-parts": [ @@ -2640,6 +3522,23 @@ "type": "github" } }, + "secp256k1_5": { + "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" + } + }, "services-flake": { "locked": { "lastModified": 1705690208, @@ -2723,6 +3622,23 @@ "type": "github" } }, + "sodium_5": { + "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" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -2761,6 +3677,22 @@ } }, "stackage": { + "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" + } + }, + "stackage_2": { "flake": false, "locked": { "lastModified": 1727827866, @@ -2776,7 +3708,7 @@ "type": "github" } }, - "stackage_2": { + "stackage_3": { "flake": false, "locked": { "lastModified": 1718756571, @@ -2852,6 +3784,21 @@ "type": "github" } }, + "systems_4": { + "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": { "flake-parts": [ @@ -2862,7 +3809,7 @@ "cardano-parts", "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1747386897, @@ -2901,7 +3848,25 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" + }, + "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_2": { + "inputs": { + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index e07ab58a..441dba75 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,10 @@ # cardano-parts.url = "path:/home/jlotoski/work/iohk/cardano-parts-wt/next-2025-11-19"; # Local pins for additional customization: + cardano-node-10-5-2.url = "github:IntersectMBO/cardano-node/sl/10.5.1-chap-update"; + # cardano-10-1-4.url = "github:IntersectMBO/cardano-node/10.1.4"; + # cardano-parts-v2025-01-17.url = "github:input-output-hk/cardano-parts/v2025-01-17"; + # cardanoTest.url = "github:IntersectMBO/cardano-node/10.5.1"; # cardanoTest.url = "github:IntersectMBO/cardano-node/ana/10.6-final-integration-mix"; # cardanoTest.url = "path:/home/jlotoski/work/iohk/cardano-node-wt/ana/10.6-final-integration-mix"; diff --git a/flake/colmena.nix b/flake/colmena.nix index 85f84036..c03ceedd 100644 --- a/flake/colmena.nix +++ b/flake/colmena.nix @@ -116,6 +116,29 @@ in ]; }; + # node-10-5-2 = { + # imports = [ + # # Base cardano-node and tracer service + # config.flake.cardano-parts.cluster.groups.default.meta.cardano-node-service + # config.flake.cardano-parts.cluster.groups.default.meta.cardano-tracer-service + # # Config for cardano-node group deployments + # inputs.cardano-parts.nixosModules.profile-cardano-node-group + # inputs.cardano-parts.nixosModules.profile-cardano-custom-metrics + # bperfNoPublish + # { + # cardano-parts.perNode = { + # pkgs = { + # inherit + # (inputs.cardano-node-10-5-2.packages.x86_64-linux) + # cardano-cli + # cardano-node + # ; + # }; + # }; + # } + # ]; + # }; + # node-lsm-test = { # imports = [ # # Base cardano-node service @@ -142,6 +165,31 @@ in # ]; # }; + # Old node: + # node-10-1-4 = { + # imports = [ + # # Base cardano-node service + # "${inputs.cardano-10-1-4}/nix/nixos/cardano-node-service.nix" + # "${inputs.cardano-parts-v2025-01-17}/flake/nixosModules/profile-cardano-node-group.nix" + + # # config.flake.cardano-parts.cluster.groups.default.meta.cardano-node-service + + # # Config for cardano-node group deployments + # { + # cardano-parts.perNode = { + # lib.cardanoLib = config.flake.cardano-parts.pkgs.special.cardanoLibCustom inputs.cardano-parts-v2025-01-17.inputs.iohk-nix "x86_64-linux"; + # pkgs = { + # inherit + # (inputs.cardano-node-10-1-4.packages.x86_64-linux) + # cardano-cli + # cardano-node + # ; + # }; + # }; + # } + # ]; + # }; + # Include blockPerf by default with no upstream push to CF -- only push prom metrics bperfNoPublish = { imports = [ @@ -609,6 +657,47 @@ in }; }; + prevMod = { + services.cardano-node-topology.extraProducers = [ + { + address = "preview1.volcyada.com"; + port = 6004; + } + { + address = "tn-preview.psilobyte.io"; + port = 4201; + } + # BBHMN + { + address = "74.122.122.121"; + port = 6200; + } + { + address = "relay01.preview.junglestakepool.com"; + port = 3001; + } + { + address = "hida.duckdns.org"; + port = 3000; + } + ]; + services.cardano-node = { + extraNodeConfig.ConsensusMode = "PraosMode"; + peerSnapshotFile = null; + bootstrapPeers = [ + { + address = "preview1.volcyada.com"; + port = 6004; + } + { + address = "preview-node.play.dev.cardano.org"; + port = 3001; + } + ]; + useLedgerAfterSlot = mkForce 97042000; + }; + }; + # disableP2p = { # services.cardano-node = { # useNewTopology = false; @@ -818,24 +907,125 @@ in # Preview, one-third on release tag, two-thirds on pre-release tag preview1-bp-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node bp mithrilRelease (declMRel "preview1-rel-a-1")];}; # preview1-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node rel maxVerbosity previewRelMig mithrilRelay (declMSigner "preview1-bp-a-1")];}; - preview1-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node hiConn rel previewRelMig mithrilRelay (declMSigner "preview1-bp-a-1")];}; - preview1-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node hiConn rel previewRelMig];}; - preview1-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node hiConn rel previewRelMig tcpTxOpt];}; - preview1-dbsync-a-1 = {imports = [eu-central-1 r6a-large (ebs 250) (group "preview1") dbsync smash previewSmash];}; - preview1-faucet-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node faucet previewFaucet];}; - preview1-test-a-1 = {imports = [eu-central-1 m5ad-xlarge (ebs 80) (nodeRamPct 70) (group "preview1") node-pre lmdb];}; + preview1-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node hiConn rel previewRelMig mithrilRelay (declMSigner "preview1-bp-a-1") prevMod];}; + preview1-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node hiConn rel previewRelMig prevMod];}; + preview1-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview1") node hiConn rel previewRelMig tcpTxOpt prevMod];}; + preview1-dbsync-a-1 = { + imports = [ + eu-central-1 + r6a-large + (ebs 250) + (group "preview1") + dbsync + smash + previewSmash + { + services.cardano-node = { + extraNodeConfig.ConsensusMode = "PraosMode"; + peerSnapshotFile = null; + bootstrapPeers = [ + { + address = "preview1.volcyada.com"; + port = 6004; + } + { + address = "preview-node.play.dev.cardano.org"; + port = 3001; + } + ]; + useLedgerAfterSlot = mkForce 97042000; + }; + } + ]; + }; + preview1-faucet-a-1 = { + imports = [ + eu-central-1 + r6a-large + (ebs 80) + (nodeRamPct 70) + (group "preview1") + node + faucet + previewFaucet + { + services.cardano-node = { + extraNodeConfig.ConsensusMode = "PraosMode"; + peerSnapshotFile = null; + bootstrapPeers = [ + { + address = "preview1.volcyada.com"; + port = 6004; + } + { + address = "preview-node.play.dev.cardano.org"; + port = 3001; + } + ]; + useLedgerAfterSlot = mkForce 97042000; + }; + } + ]; + }; + preview1-test-a-1 = { + imports = [ + eu-central-1 + m5ad-xlarge + (ebs 80) + (nodeRamPct 70) + (group "preview1") + node + { + services.cardano-node = { + extraNodeConfig.ConsensusMode = "PraosMode"; + peerSnapshotFile = null; + bootstrapPeers = [ + { + address = "preview1.volcyada.com"; + port = 6004; + } + { + address = "preview-node.play.dev.cardano.org"; + port = 3001; + } + ]; + useLedgerAfterSlot = mkForce 97042000; + }; + } + ]; + }; + # preview1-test-a-1 = { + # imports = [ + # eu-central-1 + # m5ad-xlarge + # (ebs 80) + # (group "preview1") + + # # "${inputs.cardano-10-1-4}/nix/nixos/cardano-node-service.nix" + # # config.flake.cardano-parts.cluster.groups.default.meta.cardano-node-service + # # { + # # services.cardano-node = { + # # enable = true; + # # environment = "preview"; + # # package = inputs.cardano-10-1-4.packages.x86_64-linux.cardano-node; + # # hostAddr = "0.0.0.0"; + # # useLegacyTracing = false; + # # }; + # # } + # ]; + # }; # ----------------------- - preview2-bp-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node-pre bp legacyT mithrilRelease (declMRel "preview2-rel-b-1")];}; - preview2-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node-pre hiConn rel legacyT previewRelMig];}; - preview2-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node-pre hiConn rel previewRelMig mithrilRelay (declMSigner "preview2-bp-b-1")];}; - preview2-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node-pre hiConn rel previewRelMig tcpTxOpt];}; + preview2-bp-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node bp legacyT mithrilRelease (declMRel "preview2-rel-b-1")];}; + preview2-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node hiConn rel legacyT previewRelMig prevMod];}; + preview2-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node hiConn rel previewRelMig mithrilRelay (declMSigner "preview2-bp-b-1") prevMod];}; + preview2-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview2") node hiConn rel previewRelMig tcpTxOpt prevMod];}; - preview3-bp-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node-pre bp mithrilRelease (declMRel "preview3-rel-c-1")];}; - preview3-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node-pre hiConn rel previewRelMig];}; - preview3-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node-pre hiConn rel previewRelMig];}; - preview3-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node-pre hiConn rel previewRelMig mithrilRelay (declMSigner "preview3-bp-c-1") tcpTxOpt];}; + preview3-bp-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node bp mithrilRelease (declMRel "preview3-rel-c-1")];}; + preview3-rel-a-1 = {imports = [eu-central-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node hiConn rel previewRelMig prevMod];}; + preview3-rel-b-1 = {imports = [eu-west-1 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node hiConn rel previewRelMig prevMod];}; + preview3-rel-c-1 = {imports = [us-east-2 r6a-large (ebs 80) (nodeRamPct 70) (group "preview3") node hiConn rel previewRelMig mithrilRelay (declMSigner "preview3-bp-c-1") tcpTxOpt];}; # --------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------