From e0b390ca191ab230d31f713521d4728f19ace613 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Tue, 18 Nov 2025 21:43:20 -0600 Subject: [PATCH 1/6] bump: cardano-node-10-5-2 pin --- flake.lock | 1113 ++++++++++++++++++++++++++++++++++++++++++++++++---- flake.nix | 4 +- 2 files changed, 1041 insertions(+), 76 deletions(-) diff --git a/flake.lock b/flake.lock index 679443d..927f36f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,38 @@ { "nodes": { + "CHaP": { + "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": { + "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": [ @@ -97,6 +130,74 @@ "type": "github" } }, + "blst_3": { + "flake": false, + "locked": { + "lastModified": 1739372843, + "narHash": "sha256-IlbNMLBjs/dvGogcdbWQIL+3qwy7EXJbIDpo4xBd4bY=", + "owner": "supranational", + "repo": "blst", + "rev": "8c7db7fe8d2ce6e76dc398ebd4d475c0ec564355", + "type": "github" + }, + "original": { + "owner": "supranational", + "ref": "v0.3.14", + "repo": "blst", + "type": "github" + } + }, + "cabal-32": { + "flake": false, + "locked": { + "lastModified": 1603716527, + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "owner": "haskell", + "repo": "cabal", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.2", + "repo": "cabal", + "type": "github" + } + }, + "cabal-34": { + "flake": false, + "locked": { + "lastModified": 1645834128, + "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", + "owner": "haskell", + "repo": "cabal", + "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, + "cabal-36": { + "flake": false, + "locked": { + "lastModified": 1669081697, + "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", + "owner": "haskell", + "repo": "cabal", + "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, "capkgs": { "locked": { "lastModified": 1763153457, @@ -112,6 +213,32 @@ "type": "github" } }, + "cardano-automation": { + "inputs": { + "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-db-sync-schema": { "flake": false, "locked": { @@ -195,6 +322,40 @@ "type": "github" } }, + "cardano-node-10-5-2": { + "inputs": { + "CHaP": "CHaP", + "cardano-automation": "cardano-automation", + "customConfig": "customConfig", + "em": "em", + "empty-flake": "empty-flake", + "flake-compat": "flake-compat", + "hackageNix": "hackageNix", + "haskellNix": "haskellNix", + "incl": "incl", + "iohkNix": "iohkNix", + "nixpkgs": [ + "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-service": { "flake": false, "locked": { @@ -246,6 +407,22 @@ "type": "github" } }, + "cardano-shell": { + "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": { @@ -333,8 +510,8 @@ }, "colmena": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nixpkgs" @@ -355,7 +532,87 @@ "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": { + "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_2": { + "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_3": { "flake": false, "locked": { "lastModified": 1650374568, @@ -371,7 +628,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1733328505, @@ -445,6 +702,21 @@ } }, "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": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -459,6 +731,60 @@ "type": "github" } }, + "ghc-8.6.5-iohk": { + "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": [ @@ -490,114 +816,453 @@ "type": "github" } }, - "inclusive": { - "inputs": { - "stdlib": "stdlib" - }, + "hackageNix": { + "flake": false, "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "lastModified": 1745281520, + "narHash": "sha256-dk/70Cmjx8fGSURcAHQnowETeAOElzDxn0wH/P4DUWA=", "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "repo": "hackage.nix", + "rev": "4c98778277c642e326b3cb7c2c9cbb9163b9ffbd", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "nix-inclusive", + "ref": "for-stackage", + "repo": "hackage.nix", "type": "github" } }, - "inputs-check": { + "haskellNix": { "inputs": { - "flake-parts": [ - "flake-parts" + "HTTP": "HTTP", + "cabal-32": "cabal-32", + "cabal-34": "cabal-34", + "cabal-36": "cabal-36", + "cardano-shell": "cardano-shell", + "flake-compat": "flake-compat_2", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", + "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", + "hls-2.3": "hls-2.3", + "hls-2.4": "hls-2.4", + "hls-2.5": "hls-2.5", + "hls-2.6": "hls-2.6", + "hls-2.7": "hls-2.7", + "hls-2.8": "hls-2.8", + "hpc-coveralls": "hpc-coveralls", + "hydra": "hydra", + "iserv-proxy": "iserv-proxy", "nixpkgs": [ + "cardano-node-10-5-2", "nixpkgs" - ] + ], + "nixpkgs-2003": "nixpkgs-2003", + "nixpkgs-2105": "nixpkgs-2105", + "nixpkgs-2111": "nixpkgs-2111", + "nixpkgs-2205": "nixpkgs-2205", + "nixpkgs-2211": "nixpkgs-2211", + "nixpkgs-2305": "nixpkgs-2305", + "nixpkgs-2311": "nixpkgs-2311", + "nixpkgs-unstable": "nixpkgs-unstable", + "old-ghc-nix": "old-ghc-nix", + "stackage": "stackage" }, "locked": { - "lastModified": 1741904425, - "narHash": "sha256-s/M0Pa+4pm64BZT4nfsQMTNUZcsvvdfBhvEM5BrxaTQ=", + "lastModified": 1718797200, + "narHash": "sha256-ueFxTuZrQ3ZT/Fj5sSeUWlqKa4+OkUU1xW0E+q/XTfw=", "owner": "input-output-hk", - "repo": "inputs-check", - "rev": "54a0f366a6ab2c17a9cf3b97aa4e0b96083373e1", + "repo": "haskell.nix", + "rev": "cb139fa956158397aa398186bb32dd26f7318784", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "inputs-check", + "repo": "haskell.nix", + "rev": "cb139fa956158397aa398186bb32dd26f7318784", "type": "github" } }, - "iohk-nix": { - "inputs": { - "blst": "blst", - "nixpkgs": "nixpkgs_2", - "secp256k1": "secp256k1", - "sodium": "sodium" - }, + "hls-1.10": { + "flake": false, "locked": { - "lastModified": 1751421193, - "narHash": "sha256-rklXDo12dfukaSqcEyiYbze3ffRtTl2/WAAQCWfkGiw=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "64ca6f4c0c6db283e2ec457c775bce75173fb319", + "lastModified": 1680000865, + "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "haskell", + "ref": "1.10.0.0", + "repo": "haskell-language-server", "type": "github" } }, - "iohk-nix-ng": { - "inputs": { - "blst": "blst_2", - "nixpkgs": "nixpkgs_3", - "secp256k1": "secp256k1_2", - "sodium": "sodium_2" - }, + "hls-2.0": { + "flake": false, "locked": { - "lastModified": 1762970280, - "narHash": "sha256-1OZsxij29cBXBFK2NtexgBXbkt2a2sqnRq1HB8RejxE=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "a704b93ea51ee1a8a7e456659e0b28ddba280a95", + "lastModified": 1687698105, + "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "783905f211ac63edf982dd1889c671653327e441", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", + "owner": "haskell", + "ref": "2.0.0.1", + "repo": "haskell-language-server", "type": "github" } }, - "nix": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_3", - "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs_4", - "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression" - }, + "hls-2.2": { + "flake": false, "locked": { - "lastModified": 1751027644, - "narHash": "sha256-f3ar0uez/+tc+PFtOTyjo7Vfa2xsLxl6K3vZt2Bs4so=", - "owner": "nixos", - "repo": "nix", - "rev": "8f6c5d088ad49df471168b769ae44f4ea0b915f3", + "lastModified": 1693064058, + "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85", "type": "github" }, "original": { - "owner": "nixos", - "ref": "2.29-maintenance", - "repo": "nix", + "owner": "haskell", + "ref": "2.2.0.0", + "repo": "haskell-language-server", "type": "github" } }, - "nix-github-actions": { + "hls-2.3": { + "flake": false, + "locked": { + "lastModified": 1695910642, + "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.3.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.4": { + "flake": false, + "locked": { + "lastModified": 1699862708, + "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.4.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.5": { + "flake": false, + "locked": { + "lastModified": 1701080174, + "narHash": "sha256-fyiR9TaHGJIIR0UmcCb73Xv9TJq3ht2ioxQ2mT7kVdc=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "27f8c3d3892e38edaef5bea3870161815c4d014c", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.5.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.6": { + "flake": false, + "locked": { + "lastModified": 1705325287, + "narHash": "sha256-+P87oLdlPyMw8Mgoul7HMWdEvWP/fNlo8jyNtwME8E8=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "6e0b342fa0327e628610f2711f8c3e4eaaa08b1e", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.6.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.7": { + "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": { + "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" + } + }, + "hpc-coveralls": { + "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-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" + }, + "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" + }, + "locked": { + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", + "owner": "input-output-hk", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "nix-inclusive", + "type": "github" + } + }, + "inputs-check": { + "inputs": { + "flake-parts": [ + "flake-parts" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741904425, + "narHash": "sha256-s/M0Pa+4pm64BZT4nfsQMTNUZcsvvdfBhvEM5BrxaTQ=", + "owner": "input-output-hk", + "repo": "inputs-check", + "rev": "54a0f366a6ab2c17a9cf3b97aa4e0b96083373e1", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "inputs-check", + "type": "github" + } + }, + "iohk-nix": { + "inputs": { + "blst": "blst_2", + "nixpkgs": "nixpkgs_3", + "secp256k1": "secp256k1_2", + "sodium": "sodium_2" + }, + "locked": { + "lastModified": 1751421193, + "narHash": "sha256-rklXDo12dfukaSqcEyiYbze3ffRtTl2/WAAQCWfkGiw=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "64ca6f4c0c6db283e2ec457c775bce75173fb319", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohk-nix-ng": { + "inputs": { + "blst": "blst_3", + "nixpkgs": "nixpkgs_4", + "secp256k1": "secp256k1_3", + "sodium": "sodium_3" + }, + "locked": { + "lastModified": 1762970280, + "narHash": "sha256-1OZsxij29cBXBFK2NtexgBXbkt2a2sqnRq1HB8RejxE=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "a704b93ea51ee1a8a7e456659e0b28ddba280a95", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, + "iohkNix": { + "inputs": { + "blst": "blst", + "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" + } + }, + "iserv-proxy": { + "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": { + "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", + "nixpkgs": "nixpkgs_2", + "nixpkgs-regression": "nixpkgs-regression" + }, + "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-github-actions": { "inputs": { "nixpkgs": [ "colmena", @@ -618,6 +1283,45 @@ "type": "github" } }, + "nix_2": { + "inputs": { + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_3", + "git-hooks-nix": "git-hooks-nix", + "nixpkgs": "nixpkgs_5", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1751027644, + "narHash": "sha256-f3ar0uez/+tc+PFtOTyjo7Vfa2xsLxl6K3vZt2Bs4so=", + "owner": "nixos", + "repo": "nix", + "rev": "8f6c5d088ad49df471168b769ae44f4ea0b915f3", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "2.29-maintenance", + "repo": "nix", + "type": "github" + } + }, + "nixlib": { + "locked": { + "lastModified": 1667696192, + "narHash": "sha256-hOdbIhnpWvtmVynKcsj10nxz9WROjZja+1wRAJ/C9+s=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "babd9cd2ca6e413372ed59fbb1ecc3c3a5fd3e5b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1705458851, @@ -634,6 +1338,86 @@ "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-2105": { + "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, + "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, + "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, + "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, @@ -650,6 +1434,38 @@ "type": "github" } }, + "nixpkgs-2305": { + "locked": { + "lastModified": 1701362232, + "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-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-lib": { "locked": { "dir": "lib", @@ -699,7 +1515,39 @@ "type": "github" } }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-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": 1748248602, "narHash": "sha256-LanRAm0IRpL36KpCKSknEwkBFvTLc9mDHKeAmfTrHwg=", @@ -716,6 +1564,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": 1751071626, "narHash": "sha256-/uHE/AD2qGq4QLigWAnBHiVvpVXB04XAfrOtw8JMv+Y=", @@ -731,7 +1595,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1751071626, "narHash": "sha256-/uHE/AD2qGq4QLigWAnBHiVvpVXB04XAfrOtw8JMv+Y=", @@ -747,7 +1611,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1747179050, "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", @@ -763,7 +1627,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1748162331, "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", @@ -779,6 +1643,23 @@ "type": "github" } }, + "old-ghc-nix": { + "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": { @@ -821,6 +1702,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", @@ -834,9 +1716,9 @@ "inputs-check": "inputs-check", "iohk-nix": "iohk-nix", "iohk-nix-ng": "iohk-nix-ng", - "nix": "nix", - "nixpkgs": "nixpkgs_5", - "nixpkgs-unstable": "nixpkgs-unstable", + "nix": "nix_2", + "nixpkgs": "nixpkgs_6", + "nixpkgs-unstable": "nixpkgs-unstable_2", "opentofu-registry": "opentofu-registry", "process-compose-flake": "process-compose-flake", "services-flake": "services-flake", @@ -879,6 +1761,23 @@ "type": "github" } }, + "secp256k1_3": { + "flake": false, + "locked": { + "lastModified": 1683999695, + "narHash": "sha256-9nJJVENMXjXEJZzw8DHzin1DkFkF8h9m/c6PuM7Uk4s=", + "owner": "bitcoin-core", + "repo": "secp256k1", + "rev": "acf5c55ae6a94e5ca847e07def40427547876101", + "type": "github" + }, + "original": { + "owner": "bitcoin-core", + "ref": "v0.3.2", + "repo": "secp256k1", + "type": "github" + } + }, "services-flake": { "locked": { "lastModified": 1705690208, @@ -928,6 +1827,23 @@ "type": "github" } }, + "sodium_3": { + "flake": false, + "locked": { + "lastModified": 1675156279, + "narHash": "sha256-0uRcN5gvMwO7MCXVYnoqG/OmeBFi8qRVnDWJLnBb9+Y=", + "owner": "input-output-hk", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -964,6 +1880,22 @@ "type": "github" } }, + "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" + } + }, "stdlib": { "locked": { "lastModified": 1590026685, @@ -994,6 +1926,21 @@ "type": "github" } }, + "systems_2": { + "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": [ @@ -1002,7 +1949,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1747386897, @@ -1037,6 +1984,24 @@ "repo": "treefmt-nix", "type": "github" } + }, + "utils": { + "inputs": { + "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1715539..d49945f 100644 --- a/flake.nix +++ b/flake.nix @@ -66,8 +66,8 @@ # Until blockperf detail fix is merged to master upstream blockperf.url = "github:johnalotoski/blockperf/jl/fix-detail"; - # Until cardano-node 10.6.0 is tagged - # cardano-node-10-6-0.url = "github:IntersectMBO/cardano-node"; + # Until cardano-node 10.5.2 is tagged + cardano-node-10-5-2.url = "github:IntersectMBO/cardano-node/mw/release/10.5"; # For tmp local testing pins # cardano-faucet.url = "github:input-output-hk/cardano-faucet/jl/node-9.2"; From 9a8efc11a3cb14ddca825e846bd4955473ba93de Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Tue, 18 Nov 2025 22:47:26 -0600 Subject: [PATCH 2/6] pkgs: update node release to 10.5.2 commit candidate --- flakeModules/pkgs.nix | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/flakeModules/pkgs.nix b/flakeModules/pkgs.nix index 0e98eef..6eb799a 100644 --- a/flakeModules/pkgs.nix +++ b/flakeModules/pkgs.nix @@ -480,7 +480,8 @@ in (mkPkg "blockperf" localFlake.inputs.blockperf.packages.x86_64-linux.blockperf) (mkPkg "cardano-address" caPkgs."\"cardano-addresses:exe:cardano-address\"-IntersectMBO-cardano-addresses-4-0-0-3749045") - (mkPkg "cardano-cli" (caPkgs."cardano-cli-${node-release}" // {version = "10.11.0.0";})) + # (mkPkg "cardano-cli" (caPkgs."cardano-cli-${node-release}" // {version = "10.11.0.0";})) + (mkPkg "cardano-cli" (localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-cli // {version = "10.11.0.0";})) (mkPkg "cardano-cli-ng" (caPkgs."cardano-cli-${node-pre-release}" // {version = "10.13.1.0";})) # (mkPkg "cardano-cli-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-cli) (mkPkg "cardano-db-sync" caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-${dbsync-release}") @@ -494,20 +495,24 @@ in (mkPkg "cardano-faucet" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d") (mkPkg "cardano-faucet-ng" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d") - (mkPkg "cardano-node" (caPkgs."cardano-node-${node-release}" // {version = "10.5.1";})) + # (mkPkg "cardano-node" (caPkgs."cardano-node-${node-release}" // {version = "10.5.1";})) + (mkPkg "cardano-node" (localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-node // {version = "10.5.2";})) (mkPkg "cardano-node-ng" (caPkgs."cardano-node-${node-pre-release}" // {version = "10.6.0";})) # (mkPkg "cardano-node-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-node) (mkPkg "cardano-ogmios" caPkgs.ogmios-input-output-hk-cardano-ogmios-v6-11-2-df5971a) (mkPkg "cardano-signer" caPkgs.cardano-signer-johnalotoski-cardano-signer-v1-29-0-2ef95e1) (mkPkg "cardano-smash" caPkgs."cardano-smash-server-no-basic-auth-${dbsync-release}") (mkPkg "cardano-smash-ng" caPkgs."cardano-smash-server-no-basic-auth-${dbsync-pre-release}") - (mkPkg "cardano-submit-api" caPkgs."cardano-submit-api-${node-release}") + # (mkPkg "cardano-submit-api" caPkgs."cardano-submit-api-${node-release}") + (mkPkg "cardano-submit-api" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-submit-api) (mkPkg "cardano-submit-api-ng" caPkgs."cardano-submit-api-${node-pre-release}") # (mkPkg "cardano-submit-api-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-submit-api) - (mkPkg "cardano-testnet" caPkgs."cardano-testnet-${node-release}") + # (mkPkg "cardano-testnet" caPkgs."cardano-testnet-${node-release}") + (mkPkg "cardano-testnet" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-testnet) (mkPkg "cardano-testnet-ng" caPkgs."cardano-testnet-${node-pre-release}") # (mkPkg "cardano-testnet-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-testnet) - (mkPkg "cardano-tracer" caPkgs."cardano-tracer-${node-release}") + # (mkPkg "cardano-tracer" caPkgs."cardano-tracer-${node-release}") + (mkPkg "cardano-tracer" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-tracer) (mkPkg "cardano-tracer-ng" caPkgs."cardano-tracer-${node-pre-release}") # (mkPkg "cardano-tracer-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-tracer) (mkPkg "cardano-wallet" (caPkgs.cardano-wallet-cardano-foundation-cardano-wallet-v2025-03-31-1649791 @@ -517,13 +522,16 @@ in })) (mkPkg "cc-sign" caPkgs."cc-sign-${credential-manager-release}") (mkPkg "colmena" localFlake.inputs.colmena.packages.${system}.colmena) - (mkPkg "db-analyser" caPkgs."db-analyser-${node-release}") + # (mkPkg "db-analyser" caPkgs."db-analyser-${node-release}") + (mkPkg "db-analyser" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.db-analyser) (mkPkg "db-analyser-ng" caPkgs."db-analyser-${node-pre-release}") # (mkPkg "db-analyser-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.db-analyser) - (mkPkg "db-synthesizer" caPkgs."db-synthesizer-${node-release}") + # (mkPkg "db-synthesizer" caPkgs."db-synthesizer-${node-release}") + (mkPkg "db-synthesizer" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.db-synthesizer) (mkPkg "db-synthesizer-ng" caPkgs."db-synthesizer-${node-pre-release}") # (mkPkg "db-synthesizer-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.db-synthesizer) - (mkPkg "db-truncater" caPkgs."db-truncater-${node-release}") + # (mkPkg "db-truncater" caPkgs."db-truncater-${node-release}") + (mkPkg "db-truncater" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.db-truncater) (mkPkg "db-truncater-ng" caPkgs."db-truncater-${node-pre-release}") # (mkPkg "db-truncater-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.db-truncater) (mkPkg "isd" caPkgs.isd-isd-project-isd-v0-5-1-51d52a2) @@ -537,7 +545,8 @@ in (mkPkg "mithril-signer" (recursiveUpdate caPkgs."mithril-signer-${mithril-release}" {meta.mainProgram = "mithril-signer";})) (mkPkg "mithril-signer-ng" (recursiveUpdate caPkgs."mithril-signer-${mithril-pre-release}" {meta.mainProgram = "mithril-signer";})) (mkPkg "orchestrator-cli" caPkgs."orchestrator-cli-${credential-manager-release}") - (mkPkg "snapshot-converter" caPkgs."snapshot-converter-${node-release}") + # (mkPkg "snapshot-converter" caPkgs."snapshot-converter-${node-release}") + (mkPkg "snapshot-converter" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.snapshot-converter) (mkPkg "snapshot-converter-ng" caPkgs."snapshot-converter-${node-pre-release}") # (mkPkg "snapshot-converter-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.snapshot-converter) (mkPkg "token-metadata-creator" (recursiveUpdate caPkgs."token-metadata-creator-${metadata-server-release}" {meta.mainProgram = "token-metadata-creator";})) From c762877a7d807165215f2b48805145be3f987ac6 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Wed, 19 Nov 2025 10:35:01 -0600 Subject: [PATCH 3/6] pkgs: refactor to clean up capkgs vs localFlake reference switching --- flakeModules/pkgs.nix | 96 ++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 57 deletions(-) diff --git a/flakeModules/pkgs.nix b/flakeModules/pkgs.nix index 6eb799a..7778a01 100644 --- a/flakeModules/pkgs.nix +++ b/flakeModules/pkgs.nix @@ -460,80 +460,64 @@ in }; pkgsSubmodule = let + inherit (localFlake.inputs.blockperf.packages.x86_64-linux) blockperf; + # blockperf = caPkgs.blockperf-cardano-foundation-blockperf-main-d757f38; + credential-manager-release = "IntersectMBO-credential-manager-0-1-5-0-ba221bd"; dbsync-release = "input-output-hk-cardano-db-sync-13-6-0-5-cb61094"; dbsync-pre-release = "input-output-hk-cardano-db-sync-13-6-0-5-cb61094"; + + faucet = caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d"; + # faucet = localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet"; + + faucet-ng = caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d"; + # faucet-ng = localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet"; + metadata-server-release = "input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d"; mithril-release = "input-output-hk-mithril-2543-1-hotfix-5d5571e"; mithril-pre-release = "input-output-hk-mithril-unstable-59bf453"; - node-release = "input-output-hk-cardano-node-10-5-1-ca1ec27"; - node-pre-release = "input-output-hk-cardano-node-10-6-0-f5ac0eb"; + + # node-release = pkg: caPkgs."${pkg}-input-output-hk-cardano-node-10-5-1-ca1ec27"; + node-release = pkg: localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.${pkg}; + + node-pre-release = pkg: caPkgs."${pkg}-input-output-hk-cardano-node-10-6-0-f5ac0eb"; + # node-pre-release = pkg: localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.${pkg}; in submodule { options = foldl' recursiveUpdate {} [ - # TODO: Fix the missing meta/version info upstream - (mkPkg "bech32" caPkgs."bech32-${node-release}") + (mkPkg "bech32" (node-release "bech32")) (mkPkg "blockfrost-platform" caPkgs.default-blockfrost-blockfrost-platform-0-0-2-e06029b) - - # Until blockperf detail fix is merged to master upstream - # (mkPkg "blockperf" caPkgs.blockperf-cardano-foundation-blockperf-main-d757f38) - (mkPkg "blockperf" localFlake.inputs.blockperf.packages.x86_64-linux.blockperf) - + (mkPkg "blockperf" blockperf) (mkPkg "cardano-address" caPkgs."\"cardano-addresses:exe:cardano-address\"-IntersectMBO-cardano-addresses-4-0-0-3749045") - # (mkPkg "cardano-cli" (caPkgs."cardano-cli-${node-release}" // {version = "10.11.0.0";})) - (mkPkg "cardano-cli" (localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-cli // {version = "10.11.0.0";})) - (mkPkg "cardano-cli-ng" (caPkgs."cardano-cli-${node-pre-release}" // {version = "10.13.1.0";})) - # (mkPkg "cardano-cli-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-cli) + (mkPkg "cardano-cli" ((node-release "cardano-cli") // {version = "10.11.0.0";})) + (mkPkg "cardano-cli-ng" ((node-pre-release "cardano-cli") // {version = "10.13.1.0";})) (mkPkg "cardano-db-sync" caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-${dbsync-release}") (mkPkg "cardano-db-sync-ng" caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-${dbsync-pre-release}") (mkPkg "cardano-db-tool" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-${dbsync-release}") (mkPkg "cardano-db-tool-ng" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-${dbsync-pre-release}") - - # For tmp local faucet testing: - # (mkPkg "cardano-faucet" localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet") - # (mkPkg "cardano-faucet-ng" localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet") - (mkPkg "cardano-faucet" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d") - (mkPkg "cardano-faucet-ng" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d") - - # (mkPkg "cardano-node" (caPkgs."cardano-node-${node-release}" // {version = "10.5.1";})) - (mkPkg "cardano-node" (localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-node // {version = "10.5.2";})) - (mkPkg "cardano-node-ng" (caPkgs."cardano-node-${node-pre-release}" // {version = "10.6.0";})) - # (mkPkg "cardano-node-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-node) + (mkPkg "cardano-faucet" faucet) + (mkPkg "cardano-faucet-ng" faucet-ng) + (mkPkg "cardano-node" ((node-release "cardano-node") // {version = "10.5.2";})) + (mkPkg "cardano-node-ng" ((node-pre-release "cardano-node") // {version = "10.6.0";})) (mkPkg "cardano-ogmios" caPkgs.ogmios-input-output-hk-cardano-ogmios-v6-11-2-df5971a) (mkPkg "cardano-signer" caPkgs.cardano-signer-johnalotoski-cardano-signer-v1-29-0-2ef95e1) (mkPkg "cardano-smash" caPkgs."cardano-smash-server-no-basic-auth-${dbsync-release}") (mkPkg "cardano-smash-ng" caPkgs."cardano-smash-server-no-basic-auth-${dbsync-pre-release}") - # (mkPkg "cardano-submit-api" caPkgs."cardano-submit-api-${node-release}") - (mkPkg "cardano-submit-api" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-submit-api) - (mkPkg "cardano-submit-api-ng" caPkgs."cardano-submit-api-${node-pre-release}") - # (mkPkg "cardano-submit-api-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-submit-api) - # (mkPkg "cardano-testnet" caPkgs."cardano-testnet-${node-release}") - (mkPkg "cardano-testnet" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-testnet) - (mkPkg "cardano-testnet-ng" caPkgs."cardano-testnet-${node-pre-release}") - # (mkPkg "cardano-testnet-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-testnet) - # (mkPkg "cardano-tracer" caPkgs."cardano-tracer-${node-release}") - (mkPkg "cardano-tracer" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-tracer) - (mkPkg "cardano-tracer-ng" caPkgs."cardano-tracer-${node-pre-release}") - # (mkPkg "cardano-tracer-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-tracer) - (mkPkg "cardano-wallet" (caPkgs.cardano-wallet-cardano-foundation-cardano-wallet-v2025-03-31-1649791 - // { - pname = "cardano-wallet"; - meta.description = "HTTP server and command-line for managing UTxOs and HD wallets in Cardano."; - })) + (mkPkg "cardano-submit-api" (node-release "cardano-submit-api")) + (mkPkg "cardano-submit-api-ng" (node-pre-release "cardano-submit-api")) + (mkPkg "cardano-testnet" (node-release "cardano-testnet")) + (mkPkg "cardano-testnet-ng" (node-pre-release "cardano-testnet")) + (mkPkg "cardano-tracer" (node-release "cardano-tracer")) + (mkPkg "cardano-tracer-ng" (node-pre-release "cardano-tracer")) + (mkPkg "cardano-wallet" caPkgs.cardano-wallet-cardano-foundation-cardano-wallet-v2025-03-31-1649791) (mkPkg "cc-sign" caPkgs."cc-sign-${credential-manager-release}") (mkPkg "colmena" localFlake.inputs.colmena.packages.${system}.colmena) - # (mkPkg "db-analyser" caPkgs."db-analyser-${node-release}") - (mkPkg "db-analyser" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.db-analyser) - (mkPkg "db-analyser-ng" caPkgs."db-analyser-${node-pre-release}") - # (mkPkg "db-analyser-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.db-analyser) - # (mkPkg "db-synthesizer" caPkgs."db-synthesizer-${node-release}") - (mkPkg "db-synthesizer" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.db-synthesizer) - (mkPkg "db-synthesizer-ng" caPkgs."db-synthesizer-${node-pre-release}") - # (mkPkg "db-synthesizer-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.db-synthesizer) - # (mkPkg "db-truncater" caPkgs."db-truncater-${node-release}") - (mkPkg "db-truncater" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.db-truncater) - (mkPkg "db-truncater-ng" caPkgs."db-truncater-${node-pre-release}") - # (mkPkg "db-truncater-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.db-truncater) + (mkPkg "db-analyser" (node-release "db-analyser")) + (mkPkg "db-analyser-ng" (node-pre-release "db-analyser")) + (mkPkg "db-synthesizer" (node-release "db-synthesizer")) + (mkPkg "db-synthesizer-ng" (node-pre-release "db-synthesizer")) + (mkPkg "db-truncater" (node-release "db-truncater")) + (mkPkg "db-truncater-ng" (node-pre-release "db-truncater")) (mkPkg "isd" caPkgs.isd-isd-project-isd-v0-5-1-51d52a2) (mkPkg "process-compose" caPkgs.process-compose-F1bonacc1-process-compose-v1-46-0-6a1799e) (mkPkg "metadata-server" caPkgs."metadata-server-${metadata-server-release}") @@ -545,10 +529,8 @@ in (mkPkg "mithril-signer" (recursiveUpdate caPkgs."mithril-signer-${mithril-release}" {meta.mainProgram = "mithril-signer";})) (mkPkg "mithril-signer-ng" (recursiveUpdate caPkgs."mithril-signer-${mithril-pre-release}" {meta.mainProgram = "mithril-signer";})) (mkPkg "orchestrator-cli" caPkgs."orchestrator-cli-${credential-manager-release}") - # (mkPkg "snapshot-converter" caPkgs."snapshot-converter-${node-release}") - (mkPkg "snapshot-converter" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.snapshot-converter) - (mkPkg "snapshot-converter-ng" caPkgs."snapshot-converter-${node-pre-release}") - # (mkPkg "snapshot-converter-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.snapshot-converter) + (mkPkg "snapshot-converter" (node-release "snapshot-converter")) + (mkPkg "snapshot-converter-ng" (node-pre-release "snapshot-converter")) (mkPkg "token-metadata-creator" (recursiveUpdate caPkgs."token-metadata-creator-${metadata-server-release}" {meta.mainProgram = "token-metadata-creator";})) (mkPkg "tx-bundle" caPkgs."tx-bundle-${credential-manager-release}") ]; From 1b73773127f91dd1e88fae0e3bd9cd8834262e1c Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Fri, 21 Nov 2025 01:25:13 -0600 Subject: [PATCH 4/6] bump: capkgs for node 10.5.2, update pkgs --- flake.lock | 6 +++--- flakeModules/pkgs.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 927f36f..7822409 100644 --- a/flake.lock +++ b/flake.lock @@ -200,11 +200,11 @@ }, "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": { diff --git a/flakeModules/pkgs.nix b/flakeModules/pkgs.nix index 7778a01..fa527cb 100644 --- a/flakeModules/pkgs.nix +++ b/flakeModules/pkgs.nix @@ -475,10 +475,10 @@ in metadata-server-release = "input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d"; mithril-release = "input-output-hk-mithril-2543-1-hotfix-5d5571e"; - mithril-pre-release = "input-output-hk-mithril-unstable-59bf453"; + mithril-pre-release = "input-output-hk-mithril-unstable-2943337"; - # node-release = pkg: caPkgs."${pkg}-input-output-hk-cardano-node-10-5-1-ca1ec27"; - node-release = pkg: localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.${pkg}; + node-release = pkg: caPkgs."${pkg}-input-output-hk-cardano-node-10-5-2-1ec98e9"; + # node-release = pkg: localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.${pkg}; node-pre-release = pkg: caPkgs."${pkg}-input-output-hk-cardano-node-10-6-0-f5ac0eb"; # node-pre-release = pkg: localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.${pkg}; From 2807324ed1c794787aa80151bd677160b7781018 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Sat, 22 Nov 2025 02:52:30 -0600 Subject: [PATCH 5/6] imp: add missing pkgs flakeModule opt header --- flake.lock | 1125 +++-------------------------------------- flake.nix | 9 +- flakeModules/pkgs.nix | 3 +- 3 files changed, 86 insertions(+), 1051 deletions(-) diff --git a/flake.lock b/flake.lock index 7822409..4d0304c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,38 +1,5 @@ { "nodes": { - "CHaP": { - "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": { - "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": [ @@ -130,81 +97,13 @@ "type": "github" } }, - "blst_3": { - "flake": false, - "locked": { - "lastModified": 1739372843, - "narHash": "sha256-IlbNMLBjs/dvGogcdbWQIL+3qwy7EXJbIDpo4xBd4bY=", - "owner": "supranational", - "repo": "blst", - "rev": "8c7db7fe8d2ce6e76dc398ebd4d475c0ec564355", - "type": "github" - }, - "original": { - "owner": "supranational", - "ref": "v0.3.14", - "repo": "blst", - "type": "github" - } - }, - "cabal-32": { - "flake": false, - "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", - "owner": "haskell", - "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.2", - "repo": "cabal", - "type": "github" - } - }, - "cabal-34": { - "flake": false, - "locked": { - "lastModified": 1645834128, - "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", - "owner": "haskell", - "repo": "cabal", - "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", - "type": "github" - } - }, - "cabal-36": { - "flake": false, - "locked": { - "lastModified": 1669081697, - "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", - "owner": "haskell", - "repo": "cabal", - "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", - "type": "github" - } - }, "capkgs": { "locked": { - "lastModified": 1763687272, - "narHash": "sha256-wSM70yMIgfdODgigf/RG/yFNSjI/wa77TVGOjXmUrbU=", + "lastModified": 1763735739, + "narHash": "sha256-XQZm0ZyDqGu+9/xEljEySEMy2hd4tluW7ZWUzeDAn00=", "owner": "input-output-hk", "repo": "capkgs", - "rev": "d7536af2c9afe5bac1e28273374a38c045a45d67", + "rev": "74148943cc64ba61ce1430ddddb4ce5d1139718d", "type": "github" }, "original": { @@ -213,32 +112,6 @@ "type": "github" } }, - "cardano-automation": { - "inputs": { - "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-db-sync-schema": { "flake": false, "locked": { @@ -259,16 +132,16 @@ "cardano-db-sync-schema-ng": { "flake": false, "locked": { - "lastModified": 1742316958, - "narHash": "sha256-8dADl0Y5mu8rHGADDC56KYV/kQlDFITTpgRiSTHwUc8=", + "lastModified": 1763724366, + "narHash": "sha256-KgpfC3r8FD5AkdQQnxZLP1+0HQPRItbn7gJSTBQFVhM=", "owner": "IntersectMBO", "repo": "cardano-db-sync", - "rev": "cb61094c82254464fc9de777225e04d154d9c782", + "rev": "4a0a11473b658a225d12269364aff62ca00ab02e", "type": "github" }, "original": { "owner": "IntersectMBO", - "ref": "13.6.0.5", + "ref": "13.6.0.6", "repo": "cardano-db-sync", "type": "github" } @@ -276,15 +149,16 @@ "cardano-db-sync-service": { "flake": false, "locked": { - "lastModified": 1723218274, - "narHash": "sha256-V5QOzobpDLd+EALSYryThfSjlWEpJnt7rBug8heh91E=", + "lastModified": 1742316958, + "narHash": "sha256-8dADl0Y5mu8rHGADDC56KYV/kQlDFITTpgRiSTHwUc8=", "owner": "IntersectMBO", "repo": "cardano-db-sync", - "rev": "dbea349bfee8159bf443ce6fdeec4d3670ac3e70", + "rev": "cb61094c82254464fc9de777225e04d154d9c782", "type": "github" }, "original": { "owner": "IntersectMBO", + "ref": "13.6.0.5", "repo": "cardano-db-sync", "type": "github" } @@ -292,15 +166,16 @@ "cardano-db-sync-service-ng": { "flake": false, "locked": { - "lastModified": 1749798397, - "narHash": "sha256-3tzP/6KrFVoFAtguO/Yd7yRPXbldBSjWsrdO1sc9zA0=", + "lastModified": 1763724366, + "narHash": "sha256-KgpfC3r8FD5AkdQQnxZLP1+0HQPRItbn7gJSTBQFVhM=", "owner": "IntersectMBO", "repo": "cardano-db-sync", - "rev": "da764296943a1de65a5085810bf70f55e6bda289", + "rev": "4a0a11473b658a225d12269364aff62ca00ab02e", "type": "github" }, "original": { "owner": "IntersectMBO", + "ref": "13.6.0.6", "repo": "cardano-db-sync", "type": "github" } @@ -322,40 +197,6 @@ "type": "github" } }, - "cardano-node-10-5-2": { - "inputs": { - "CHaP": "CHaP", - "cardano-automation": "cardano-automation", - "customConfig": "customConfig", - "em": "em", - "empty-flake": "empty-flake", - "flake-compat": "flake-compat", - "hackageNix": "hackageNix", - "haskellNix": "haskellNix", - "incl": "incl", - "iohkNix": "iohkNix", - "nixpkgs": [ - "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-service": { "flake": false, "locked": { @@ -407,22 +248,6 @@ "type": "github" } }, - "cardano-shell": { - "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": { @@ -510,8 +335,8 @@ }, "colmena": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nixpkgs" @@ -532,87 +357,7 @@ "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": { - "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_2": { - "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_3": { "flake": false, "locked": { "lastModified": 1650374568, @@ -628,7 +373,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1733328505, @@ -702,21 +447,6 @@ } }, "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": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -731,60 +461,6 @@ "type": "github" } }, - "ghc-8.6.5-iohk": { - "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": [ @@ -816,448 +492,109 @@ "type": "github" } }, - "hackageNix": { - "flake": false, + "inclusive": { + "inputs": { + "stdlib": "stdlib" + }, "locked": { - "lastModified": 1745281520, - "narHash": "sha256-dk/70Cmjx8fGSURcAHQnowETeAOElzDxn0wH/P4DUWA=", + "lastModified": 1628098927, + "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "4c98778277c642e326b3cb7c2c9cbb9163b9ffbd", + "repo": "nix-inclusive", + "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "for-stackage", - "repo": "hackage.nix", + "repo": "nix-inclusive", "type": "github" } }, - "haskellNix": { + "inputs-check": { "inputs": { - "HTTP": "HTTP", - "cabal-32": "cabal-32", - "cabal-34": "cabal-34", - "cabal-36": "cabal-36", - "cardano-shell": "cardano-shell", - "flake-compat": "flake-compat_2", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc910X": "ghc910X", - "ghc911": "ghc911", - "hackage": [ - "cardano-node-10-5-2", - "hackageNix" + "flake-parts": [ + "flake-parts" ], - "hls-1.10": "hls-1.10", - "hls-2.0": "hls-2.0", - "hls-2.2": "hls-2.2", - "hls-2.3": "hls-2.3", - "hls-2.4": "hls-2.4", - "hls-2.5": "hls-2.5", - "hls-2.6": "hls-2.6", - "hls-2.7": "hls-2.7", - "hls-2.8": "hls-2.8", - "hpc-coveralls": "hpc-coveralls", - "hydra": "hydra", - "iserv-proxy": "iserv-proxy", "nixpkgs": [ - "cardano-node-10-5-2", "nixpkgs" - ], - "nixpkgs-2003": "nixpkgs-2003", - "nixpkgs-2105": "nixpkgs-2105", - "nixpkgs-2111": "nixpkgs-2111", - "nixpkgs-2205": "nixpkgs-2205", - "nixpkgs-2211": "nixpkgs-2211", - "nixpkgs-2305": "nixpkgs-2305", - "nixpkgs-2311": "nixpkgs-2311", - "nixpkgs-unstable": "nixpkgs-unstable", - "old-ghc-nix": "old-ghc-nix", - "stackage": "stackage" + ] }, "locked": { - "lastModified": 1718797200, - "narHash": "sha256-ueFxTuZrQ3ZT/Fj5sSeUWlqKa4+OkUU1xW0E+q/XTfw=", + "lastModified": 1741904425, + "narHash": "sha256-s/M0Pa+4pm64BZT4nfsQMTNUZcsvvdfBhvEM5BrxaTQ=", "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "cb139fa956158397aa398186bb32dd26f7318784", + "repo": "inputs-check", + "rev": "54a0f366a6ab2c17a9cf3b97aa4e0b96083373e1", "type": "github" }, "original": { "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "cb139fa956158397aa398186bb32dd26f7318784", + "repo": "inputs-check", "type": "github" } }, - "hls-1.10": { - "flake": false, - "locked": { - "lastModified": 1680000865, - "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", - "type": "github" + "iohk-nix": { + "inputs": { + "blst": "blst", + "nixpkgs": "nixpkgs_2", + "secp256k1": "secp256k1", + "sodium": "sodium" }, - "original": { - "owner": "haskell", - "ref": "1.10.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.0": { - "flake": false, "locked": { - "lastModified": 1687698105, - "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "783905f211ac63edf982dd1889c671653327e441", + "lastModified": 1751421193, + "narHash": "sha256-rklXDo12dfukaSqcEyiYbze3ffRtTl2/WAAQCWfkGiw=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "64ca6f4c0c6db283e2ec457c775bce75173fb319", "type": "github" }, "original": { - "owner": "haskell", - "ref": "2.0.0.1", - "repo": "haskell-language-server", + "owner": "input-output-hk", + "repo": "iohk-nix", "type": "github" } }, - "hls-2.2": { - "flake": false, + "iohk-nix-ng": { + "inputs": { + "blst": "blst_2", + "nixpkgs": "nixpkgs_3", + "secp256k1": "secp256k1_2", + "sodium": "sodium_2" + }, "locked": { - "lastModified": 1693064058, - "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85", + "lastModified": 1762970280, + "narHash": "sha256-1OZsxij29cBXBFK2NtexgBXbkt2a2sqnRq1HB8RejxE=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "a704b93ea51ee1a8a7e456659e0b28ddba280a95", "type": "github" }, "original": { - "owner": "haskell", - "ref": "2.2.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.3": { - "flake": false, - "locked": { - "lastModified": 1695910642, - "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.3.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.4": { - "flake": false, - "locked": { - "lastModified": 1699862708, - "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.4.0.1", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.5": { - "flake": false, - "locked": { - "lastModified": 1701080174, - "narHash": "sha256-fyiR9TaHGJIIR0UmcCb73Xv9TJq3ht2ioxQ2mT7kVdc=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "27f8c3d3892e38edaef5bea3870161815c4d014c", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.5.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.6": { - "flake": false, - "locked": { - "lastModified": 1705325287, - "narHash": "sha256-+P87oLdlPyMw8Mgoul7HMWdEvWP/fNlo8jyNtwME8E8=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "6e0b342fa0327e628610f2711f8c3e4eaaa08b1e", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.6.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.7": { - "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": { - "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" - } - }, - "hpc-coveralls": { - "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-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" - }, - "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" - }, - "locked": { - "lastModified": 1628098927, - "narHash": "sha256-Ft4sdf7VPL8MQtu18AAPiN2s5pUsbv+3RxqzJSa/yzg=", - "owner": "input-output-hk", - "repo": "nix-inclusive", - "rev": "13123eb7a8c3359738a4756b8d645729e8655b27", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "nix-inclusive", - "type": "github" - } - }, - "inputs-check": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1741904425, - "narHash": "sha256-s/M0Pa+4pm64BZT4nfsQMTNUZcsvvdfBhvEM5BrxaTQ=", - "owner": "input-output-hk", - "repo": "inputs-check", - "rev": "54a0f366a6ab2c17a9cf3b97aa4e0b96083373e1", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "inputs-check", - "type": "github" - } - }, - "iohk-nix": { - "inputs": { - "blst": "blst_2", - "nixpkgs": "nixpkgs_3", - "secp256k1": "secp256k1_2", - "sodium": "sodium_2" - }, - "locked": { - "lastModified": 1751421193, - "narHash": "sha256-rklXDo12dfukaSqcEyiYbze3ffRtTl2/WAAQCWfkGiw=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "64ca6f4c0c6db283e2ec457c775bce75173fb319", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", - "type": "github" - } - }, - "iohk-nix-ng": { - "inputs": { - "blst": "blst_3", - "nixpkgs": "nixpkgs_4", - "secp256k1": "secp256k1_3", - "sodium": "sodium_3" - }, - "locked": { - "lastModified": 1762970280, - "narHash": "sha256-1OZsxij29cBXBFK2NtexgBXbkt2a2sqnRq1HB8RejxE=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "a704b93ea51ee1a8a7e456659e0b28ddba280a95", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", - "type": "github" - } - }, - "iohkNix": { - "inputs": { - "blst": "blst", - "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" - } - }, - "iserv-proxy": { - "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": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "input-output-hk", + "repo": "iohk-nix", "type": "github" } }, "nix": { "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_2", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_3", + "git-hooks-nix": "git-hooks-nix", + "nixpkgs": "nixpkgs_4", + "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1661606874, - "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", - "owner": "NixOS", + "lastModified": 1751027644, + "narHash": "sha256-f3ar0uez/+tc+PFtOTyjo7Vfa2xsLxl6K3vZt2Bs4so=", + "owner": "nixos", "repo": "nix", - "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", + "rev": "8f6c5d088ad49df471168b769ae44f4ea0b915f3", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "2.11.0", + "owner": "nixos", + "ref": "2.29-maintenance", "repo": "nix", "type": "github" } @@ -1283,45 +620,6 @@ "type": "github" } }, - "nix_2": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_3", - "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs_5", - "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression_2" - }, - "locked": { - "lastModified": 1751027644, - "narHash": "sha256-f3ar0uez/+tc+PFtOTyjo7Vfa2xsLxl6K3vZt2Bs4so=", - "owner": "nixos", - "repo": "nix", - "rev": "8f6c5d088ad49df471168b769ae44f4ea0b915f3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "2.29-maintenance", - "repo": "nix", - "type": "github" - } - }, - "nixlib": { - "locked": { - "lastModified": 1667696192, - "narHash": "sha256-hOdbIhnpWvtmVynKcsj10nxz9WROjZja+1wRAJ/C9+s=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "babd9cd2ca6e413372ed59fbb1ecc3c3a5fd3e5b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1705458851, @@ -1338,86 +636,6 @@ "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-2105": { - "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, - "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, - "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, - "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, @@ -1434,38 +652,6 @@ "type": "github" } }, - "nixpkgs-2305": { - "locked": { - "lastModified": 1701362232, - "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-23.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-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-lib": { "locked": { "dir": "lib", @@ -1515,39 +701,7 @@ "type": "github" } }, - "nixpkgs-regression_2": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-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": 1748248602, "narHash": "sha256-LanRAm0IRpL36KpCKSknEwkBFvTLc9mDHKeAmfTrHwg=", @@ -1564,22 +718,6 @@ } }, "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": 1751071626, "narHash": "sha256-/uHE/AD2qGq4QLigWAnBHiVvpVXB04XAfrOtw8JMv+Y=", @@ -1595,7 +733,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1751071626, "narHash": "sha256-/uHE/AD2qGq4QLigWAnBHiVvpVXB04XAfrOtw8JMv+Y=", @@ -1611,7 +749,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1747179050, "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", @@ -1627,7 +765,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1748162331, "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", @@ -1643,23 +781,6 @@ "type": "github" } }, - "old-ghc-nix": { - "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": { @@ -1702,7 +823,6 @@ "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", @@ -1716,9 +836,9 @@ "inputs-check": "inputs-check", "iohk-nix": "iohk-nix", "iohk-nix-ng": "iohk-nix-ng", - "nix": "nix_2", - "nixpkgs": "nixpkgs_6", - "nixpkgs-unstable": "nixpkgs-unstable_2", + "nix": "nix", + "nixpkgs": "nixpkgs_5", + "nixpkgs-unstable": "nixpkgs-unstable", "opentofu-registry": "opentofu-registry", "process-compose-flake": "process-compose-flake", "services-flake": "services-flake", @@ -1761,23 +881,6 @@ "type": "github" } }, - "secp256k1_3": { - "flake": false, - "locked": { - "lastModified": 1683999695, - "narHash": "sha256-9nJJVENMXjXEJZzw8DHzin1DkFkF8h9m/c6PuM7Uk4s=", - "owner": "bitcoin-core", - "repo": "secp256k1", - "rev": "acf5c55ae6a94e5ca847e07def40427547876101", - "type": "github" - }, - "original": { - "owner": "bitcoin-core", - "ref": "v0.3.2", - "repo": "secp256k1", - "type": "github" - } - }, "services-flake": { "locked": { "lastModified": 1705690208, @@ -1827,23 +930,6 @@ "type": "github" } }, - "sodium_3": { - "flake": false, - "locked": { - "lastModified": 1675156279, - "narHash": "sha256-0uRcN5gvMwO7MCXVYnoqG/OmeBFi8qRVnDWJLnBb9+Y=", - "owner": "input-output-hk", - "repo": "libsodium", - "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "libsodium", - "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -1880,22 +966,6 @@ "type": "github" } }, - "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" - } - }, "stdlib": { "locked": { "lastModified": 1590026685, @@ -1926,21 +996,6 @@ "type": "github" } }, - "systems_2": { - "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": [ @@ -1949,7 +1004,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1747386897, @@ -1984,24 +1039,6 @@ "repo": "treefmt-nix", "type": "github" } - }, - "utils": { - "inputs": { - "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" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d49945f..e23c5fa 100644 --- a/flake.nix +++ b/flake.nix @@ -66,9 +66,6 @@ # Until blockperf detail fix is merged to master upstream blockperf.url = "github:johnalotoski/blockperf/jl/fix-detail"; - # Until cardano-node 10.5.2 is tagged - cardano-node-10-5-2.url = "github:IntersectMBO/cardano-node/mw/release/10.5"; - # For tmp local testing pins # cardano-faucet.url = "github:input-output-hk/cardano-faucet/jl/node-9.2"; # cardano-faucet.url = "path:/home/jlotoski/work/iohk/cardano-faucet-wt/jl/node-9.2"; @@ -82,7 +79,7 @@ }; cardano-db-sync-schema-ng = { - url = "github:IntersectMBO/cardano-db-sync/13.6.0.5"; + url = "github:IntersectMBO/cardano-db-sync/13.6.0.6"; flake = false; }; @@ -91,12 +88,12 @@ # flakeModule options and do not necessarily reflect the software # versions running on those nixos services. cardano-db-sync-service = { - url = "github:IntersectMBO/cardano-db-sync"; + url = "github:IntersectMBO/cardano-db-sync/13.6.0.5"; flake = false; }; cardano-db-sync-service-ng = { - url = "github:IntersectMBO/cardano-db-sync"; + url = "github:IntersectMBO/cardano-db-sync/13.6.0.6"; flake = false; }; diff --git a/flakeModules/pkgs.nix b/flakeModules/pkgs.nix index fa527cb..d8dc5b1 100644 --- a/flakeModules/pkgs.nix +++ b/flakeModules/pkgs.nix @@ -36,6 +36,7 @@ # perSystem.cardano-parts.pkgs.cardano-db-sync # perSystem.cardano-parts.pkgs.cardano-db-sync-ng # perSystem.cardano-parts.pkgs.cardano-db-tool +# perSystem.cardano-parts.pkgs.cardano-db-tool-ng # perSystem.cardano-parts.pkgs.cardano-faucet # perSystem.cardano-parts.pkgs.cardano-faucet-ng # perSystem.cardano-parts.pkgs.cardano-node @@ -465,7 +466,7 @@ in credential-manager-release = "IntersectMBO-credential-manager-0-1-5-0-ba221bd"; dbsync-release = "input-output-hk-cardano-db-sync-13-6-0-5-cb61094"; - dbsync-pre-release = "input-output-hk-cardano-db-sync-13-6-0-5-cb61094"; + dbsync-pre-release = "input-output-hk-cardano-db-sync-13-6-0-6-4a0a114"; faucet = caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d"; # faucet = localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet"; From 0f36e29073a5c285ef8359afc7686db451acc636 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Sat, 22 Nov 2025 03:48:03 -0600 Subject: [PATCH 6/6] bump: capkgs for node release 10.5.3 --- flake.lock | 6 +++--- flakeModules/pkgs.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 4d0304c..287d191 100644 --- a/flake.lock +++ b/flake.lock @@ -99,11 +99,11 @@ }, "capkgs": { "locked": { - "lastModified": 1763735739, - "narHash": "sha256-XQZm0ZyDqGu+9/xEljEySEMy2hd4tluW7ZWUzeDAn00=", + "lastModified": 1763787324, + "narHash": "sha256-NAuCZBgGET9zyE0xjsMQQ2ZEeS+XUEqaalMMwaH8FmU=", "owner": "input-output-hk", "repo": "capkgs", - "rev": "74148943cc64ba61ce1430ddddb4ce5d1139718d", + "rev": "5389b08b804e2140bbf4655dff8ddc42ac61bdd7", "type": "github" }, "original": { diff --git a/flakeModules/pkgs.nix b/flakeModules/pkgs.nix index d8dc5b1..2d6f707 100644 --- a/flakeModules/pkgs.nix +++ b/flakeModules/pkgs.nix @@ -478,7 +478,7 @@ in mithril-release = "input-output-hk-mithril-2543-1-hotfix-5d5571e"; mithril-pre-release = "input-output-hk-mithril-unstable-2943337"; - node-release = pkg: caPkgs."${pkg}-input-output-hk-cardano-node-10-5-2-1ec98e9"; + node-release = pkg: caPkgs."${pkg}-input-output-hk-cardano-node-10-5-3-6c034ec"; # node-release = pkg: localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.${pkg}; node-pre-release = pkg: caPkgs."${pkg}-input-output-hk-cardano-node-10-6-0-f5ac0eb";