From eadd6823b1abfca51d045545f15934dea77a2b2a Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Mon, 22 May 2023 20:22:45 -0300 Subject: [PATCH 01/13] updating cardano-node version --- cabal.project | 2 +- flake.lock | 14 +++++++------- nix/cardano/devshellProfiles.nix | 5 ----- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/cabal.project b/cabal.project index e4aa4c17ca..db9e3aa16f 100644 --- a/cabal.project +++ b/cabal.project @@ -1,5 +1,5 @@ -- run `nix flake lock --update-input hackage` after updating index-state. -index-state: 2022-07-01T00:00:00Z +index-state: 2023-05-20T00:00:00Z repository cardano-haskell-packages url: https://input-output-hk.github.io/cardano-haskell-packages diff --git a/flake.lock b/flake.lock index 0107d8e2a3..3c163b883f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1666870889, - "narHash": "sha256-4KKdmTO9vjUtLN30dPwkWF+6265crSG979HhB/oA3l4=", + "lastModified": 1684774104, + "narHash": "sha256-BeflyQIdaAe+Hcell/q52DN6P6ilCJUaj3Wgf+2QfAY=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "60611fb38ed4059168a9c275aed3463f97025c84", + "rev": "c46d4e87cd4c60b493fc88b3d13dd7bfdaab1260", "type": "github" }, "original": { @@ -7115,11 +7115,11 @@ "stackage": "stackage_16" }, "locked": { - "lastModified": 1666836038, - "narHash": "sha256-n/zM5Up2g86bZ/cU4lFGbm0uJuwk38bX0jiNAUuhi4o=", + "lastModified": 1684716683, + "narHash": "sha256-ej7dV4gpauKwaOrvO5MpvudiZLDlG2mEtrir2x52H4I=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "a5c3eefe071921c37e87a8c639d059e0fbaad7d4", + "rev": "85c1f98234af7c07907a1ab46756e5fab8e6cc71", "type": "github" }, "original": { @@ -12179,7 +12179,7 @@ "narHash": "sha256-TKaxWAVJR+a5JJauKZqibmaM5e/Pi5tBDx9s8fl/kSE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "309faedb8338d3ae8ad8f1043b3ccf48c9cc2970", + "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", "type": "github" }, "original": { diff --git a/nix/cardano/devshellProfiles.nix b/nix/cardano/devshellProfiles.nix index 2350e8944b..48b0039dfd 100644 --- a/nix/cardano/devshellProfiles.nix +++ b/nix/cardano/devshellProfiles.nix @@ -8,7 +8,6 @@ let inherit (cell) packages; inherit (packages.project.pkgs) haskell-nix; inherit (packages.project.args) compiler-nix-name; - inherit (packages.project) index-state; in rec { @@ -65,7 +64,6 @@ rec { #{ # package = haskell-nix.tool compiler-nix-name "hlint" { # version = "3.2.7"; - # inherit index-state; # }; # name = "hlint"; # category = "development"; @@ -73,7 +71,6 @@ rec { { package = haskell-nix.tool compiler-nix-name "ghcid" { version = "0.8.7"; - inherit index-state; }; name = "ghcid"; category = "development"; @@ -81,7 +78,6 @@ rec { #{ # package = haskell-nix.tool compiler-nix-name "haskell-language-server" { # version = "1.6.1.1"; - # inherit index-state; # }; # name = "haskell-language-server"; # category = "development"; @@ -89,7 +85,6 @@ rec { #{ # package = haskell-nix.tool compiler-nix-name "stylish-haskell" { # version = "0.13.0.0"; - # inherit index-state; # }; # name = "stylish-haskell"; # category = "development"; From b757c7cb9e1f9381c4b077f39688ec9455613af6 Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Thu, 1 Jun 2023 12:39:23 -0300 Subject: [PATCH 02/13] latest attempt at fixing build --- cabal.project | 141 +++---------------------------- nix/cardano/packages/haskell.nix | 5 ++ 2 files changed, 15 insertions(+), 131 deletions(-) diff --git a/cabal.project b/cabal.project index db9e3aa16f..702816d5f8 100644 --- a/cabal.project +++ b/cabal.project @@ -1,5 +1,5 @@ -- run `nix flake lock --update-input hackage` after updating index-state. -index-state: 2023-05-20T00:00:00Z +index-state: 2023-05-15T00:00:00Z repository cardano-haskell-packages url: https://input-output-hk.github.io/cardano-haskell-packages @@ -28,8 +28,6 @@ constraints: -- constraint from dependent-sum-template (which is the library we actually use). , dependent-sum > 0.6.2.0 , HSOpenSSL >= 0.11.7.2 - , algebraic-graphs < 0.7 - , protolude < 0.3.1 , hw-aeson < 0.1.6.0 allow-newer: @@ -40,23 +38,6 @@ allow-newer: test-show-details: direct -source-repository-package - type: git - location: https://github.com/input-output-hk/cardano-node - tag: 4b0bb77c6262778158331d7c1d00140884a3e79e - --sha256: 1c3xsxs4if86wjrhzsy6mdmrnfxrcgs26djfb52n2plpmqv744qk - subdir: - cardano-api - cardano-cli - cardano-git-rev - --- Using a fork until our patches can be merged upstream -source-repository-package - type: git - location: https://github.com/input-output-hk/optparse-applicative - tag: 7497a29cb998721a9068d5725d49461f2bba0e7a - --sha256: 1gvsrg925vynwgqwplgjmp53vj953qyh3wbdf34pw21c8r47w35r - source-repository-package type: git location: https://github.com/vshabanov/ekg-json @@ -71,65 +52,14 @@ source-repository-package source-repository-package type: git - location: https://github.com/input-output-hk/cardano-base - tag: a3c13fb11bc41fedff7885ca70a3b33f61fef4b5 - --sha256: 0h492cz9mvzbsl5yzvp3iq40c0z0j5hmrifdrnnqzzk02g9j9c4b - subdir: - base-deriving-via - binary - binary/test - cardano-crypto-class - cardano-crypto-praos - cardano-crypto-tests - measures - orphans-deriving-via - slotting - strict-containers - -source-repository-package - type: git - location: https://github.com/input-output-hk/cardano-crypto - tag: f73079303f663e028288f9f4a9e08bcca39a923e - --sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q - -source-repository-package - type: git - location: https://github.com/input-output-hk/cardano-ledger - tag: f49879a79098d9372d63baa13b94a941a56eda34 - --sha256: 0i9x66yqkrvx2w79dy6lzlya82yxc8567rgjj828vc2d46d6nvx6 - subdir: - eras/alonzo/impl - eras/alonzo/test-suite - eras/babbage/impl - eras/babbage/test-suite - eras/byron/chain/executable-spec - eras/byron/crypto - eras/byron/crypto/test - eras/byron/ledger/executable-spec - eras/byron/ledger/impl - eras/byron/ledger/impl/test - eras/shelley/impl - eras/shelley/test-suite - eras/shelley-ma/impl - eras/shelley-ma/test-suite - libs/cardano-ledger-core - libs/cardano-ledger-pretty - libs/cardano-protocol-tpraos - libs/cardano-data - libs/vector-map - libs/set-algebra - libs/small-steps - libs/small-steps-test - libs/non-integral - -source-repository-package - type: git - location: https://github.com/input-output-hk/cardano-prelude - tag: 6ea36cf2247ac0bc33e08c327abec34dfd05bd99 - --sha256: 0z2y3wzppc12bpn9bl48776ms3nszw8j58xfsdxf97nzjgrmd62g + location: https://github.com/input-output-hk/ouroboros-consensus + tag: 79a2422afd869bc2eff95221408c432b45d38308 + --sha256: 12sm8fn1b3rrjzsvvr0wrvwq10hl55iwq7qcd84wgw3l38m1cw5v subdir: - cardano-prelude - cardano-prelude-test + ouroboros-consensus + ouroboros-consensus-cardano + ouroboros-consensus-diffusion + ouroboros-consensus-protocol source-repository-package type: git @@ -158,57 +88,6 @@ source-repository-package tag: 3825d3abf75f83f406c1f7161883c438dac7277d --sha256: 19wahfv726fa3mqajpqdqhnl9ica3xmf68i254q45iyjcpj1psqx -source-repository-package - type: git - location: https://github.com/input-output-hk/ouroboros-network - tag: c764553561bed8978d2c6753d1608dc65449617a - --sha256: 0hdh7xdrvxw943r6qr0xr4kwszindh5mnsn1lww6qdnxnmn7wcsc - subdir: - monoidal-synchronisation - network-mux - ouroboros-consensus - ouroboros-consensus-byron - ouroboros-consensus-cardano - ouroboros-consensus-protocol - ouroboros-consensus-shelley - ouroboros-network - ouroboros-network-framework - ouroboros-network-testing - -source-repository-package - type: git - location: https://github.com/input-output-hk/io-sim - tag: f4183f274d88d0ad15817c7052df3a6a8b40e6dc - --sha256: 0vb2pd9hl89v2y5hrhrsm69yx0jf98vppjmfncj2fraxr3p3lldw - subdir: - io-classes - io-sim - strict-stm - -source-repository-package - type: git - location: https://github.com/input-output-hk/typed-protocols - tag: 181601bc3d9e9d21a671ce01e0b481348b3ca104 - --sha256: 1lr97b2z7l0rpsmmz92rsv27qzd5vavz10cf7n25svya4kkiysp5 - subdir: - typed-protocols - typed-protocols-cborg - typed-protocols-examples - -source-repository-package - type: git - location: https://github.com/input-output-hk/plutus - tag: f680ac6979e069fcc013e4389ee607ff5fa6672f - --sha256: 180jq8hd0jlg48ya7b5yw3bnd2d5czy0b1agy9ng3mgnzpyq747i - subdir: - plutus-core - plutus-ledger-api - plutus-tx - plutus-tx-plugin - prettyprinter-configurable - stubs/plutus-ghc-stub - word-array - source-repository-package type: git location: https://github.com/input-output-hk/ekg-forward @@ -238,8 +117,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-addresses - tag: 4a369086471d0849d40ba384ca39a4ab94f23d82 - --sha256: 1rxbaycknxaadyrwn1knlz0mp1mwavm2kcw7dmp1pyb6ifrq62iq + tag: 5ceb877c46a9dde9bde2032dbf94ed6dd84626a5 + --sha256: 0hyvzr4jypl67lzfqq9hd354w4nrl0510fcsmqr6fgaik46j8pc9 subdir: command-line core diff --git a/nix/cardano/packages/haskell.nix b/nix/cardano/packages/haskell.nix index 84680bdd6d..93dbc37327 100644 --- a/nix/cardano/packages/haskell.nix +++ b/nix/cardano/packages/haskell.nix @@ -82,6 +82,11 @@ in packageNames = builtins.attrNames packagesExes; in [ + ({ pkgs, ... }: { + # Use the VRF fork of libsodium + packages.cardano-crypto-praos.components.library.pkgconfig = lib.mkForce [ [ pkgs.libsodium-vrf ] ]; + packages.cardano-crypto-class.components.library.pkgconfig = lib.mkForce [ [ pkgs.libsodium-vrf pkgs.secp256k1 ] ]; + }) # Allow reinstallation of Win32 ({ pkgs, ... }: lib.mkIf pkgs.stdenv.hostPlatform.isWindows { # When cross compfixesiling we don't have a `ghc` package From 5e3e6814599565024a99f504479a4157ac3688f6 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Sun, 4 Jun 2023 16:47:10 +0800 Subject: [PATCH 03/13] cleanup project file; use CHaP --- cabal.project | 96 +++------------------------------------------------ flake.lock | 89 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 86 insertions(+), 99 deletions(-) diff --git a/cabal.project b/cabal.project index 702816d5f8..5f4666d8ad 100644 --- a/cabal.project +++ b/cabal.project @@ -15,104 +15,18 @@ repository cardano-haskell-packages packages: src/cardano-faucet -constraints: - hedgehog >= 1.0 - , bimap >= 0.4.0 - , libsystemd-journal >= 1.4.4 - , systemd >= 2.3.0 - -- systemd-2.3.0 requires at least network 3.1.1.0 but it doesn't declare - -- that dependency - , network >= 3.1.1.0 - -- bizarre issue: in earlier versions they define their own 'GEq', in newer - -- ones they reuse the one from 'some', but there isn't e.g. a proper version - -- constraint from dependent-sum-template (which is the library we actually use). - , dependent-sum > 0.6.2.0 - , HSOpenSSL >= 0.11.7.2 - , hw-aeson < 0.1.6.0 - allow-newer: *:aeson, monoidal-containers:aeson, size-based:template-haskell, attoparsec -test-show-details: direct - -source-repository-package - type: git - location: https://github.com/vshabanov/ekg-json - tag: 00ebe7211c981686e65730b7144fbf5350462608 - --sha256: 1zvjm3pb38w0ijig5wk5mdkzcszpmlp5d4zxvks2jk1rkypi8gsm - -source-repository-package - type: git - location: https://github.com/input-output-hk/hedgehog-extras - tag: 4e55143e06f3c730ad989dbdee59f9fd6edce167 - --sha256: 080m31jl53bggbp6r92p8xifs9x0sjv7y0xhi2r8dmdcac560scr - -source-repository-package - type: git - location: https://github.com/input-output-hk/ouroboros-consensus - tag: 79a2422afd869bc2eff95221408c432b45d38308 - --sha256: 12sm8fn1b3rrjzsvvr0wrvwq10hl55iwq7qcd84wgw3l38m1cw5v - subdir: - ouroboros-consensus - ouroboros-consensus-cardano - ouroboros-consensus-diffusion - ouroboros-consensus-protocol - -source-repository-package - type: git - location: https://github.com/input-output-hk/goblins - tag: cde90a2b27f79187ca8310b6549331e59595e7ba - --sha256: 17c88rbva3iw82yg9srlxjv2ia5wjb9cyqw44hik565f5v9svnyg - -source-repository-package - type: git - location: https://github.com/input-output-hk/iohk-monitoring-framework - tag: 066f7002aac5a0efc20e49643fea45454f226caa - --sha256: 0s6x4in11k5ba7nl7la896g28sznf9185xlqg9c604jqz58vj9nj - subdir: - contra-tracer - iohk-monitoring - plugins/backend-aggregation - plugins/backend-ekg - plugins/backend-monitoring - plugins/backend-trace-forwarder - plugins/scribe-systemd - tracer-transformers - -source-repository-package - type: git - location: https://github.com/input-output-hk/Win32-network - tag: 3825d3abf75f83f406c1f7161883c438dac7277d - --sha256: 19wahfv726fa3mqajpqdqhnl9ica3xmf68i254q45iyjcpj1psqx - -source-repository-package - type: git - location: https://github.com/input-output-hk/ekg-forward - tag: 297cd9db5074339a2fb2e5ae7d0780debb670c63 - --sha256: 1zcwry3y5rmd9lgxy89wsb3k4kpffqji35dc7ghzbz603y1gy24g - -source-repository-package - type: git - location: https://github.com/HeinrichApfelmus/threepenny-gui - tag: 2377a7851e60461179181515c90620aae5073357 - --sha256: sha256-7Ja2VrKCrXJwYlu0OUHdydJM2FSukDGe7au9nlK31G4= - --- Drops an instance breaking our code. Should be released to Hackage eventually. -source-repository-package - type: git - location: https://github.com/input-output-hk/flat - tag: ee59880f47ab835dbd73bea0847dab7869fc20d8 - --sha256: 1lrzknw765pz2j97nvv9ip3l1mcpf2zr4n56hwlz0rk7wq7ls4cm +constraints: + -- needed to make cardano-cli compile, as cardano-ping + -- changed the `logger` signature. + cardano-ping < 0.2 --- https://github.com/fpco/weigh/pull/47 -source-repository-package - type: git - location: https://github.com/TeofilC/weigh.git - tag: 8a3b2283c3e73a84ad1da6cb35a39d886c44772c - --sha256: 13cnj7l50ihxhhrfl0j6xv64rw7xiq9c8nbwzqdzr6lkk3w7awmx +test-show-details: direct source-repository-package type: git diff --git a/flake.lock b/flake.lock index 3c163b883f..e30ff9334c 100644 --- a/flake.lock +++ b/flake.lock @@ -4793,15 +4793,16 @@ "flake-compat_35": { "flake": false, "locked": { - "lastModified": 1635892615, - "narHash": "sha256-harGbMZr4hzat2BWBU+Y5OYXlu+fVz7E4WeQzHi5o8A=", + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", "owner": "input-output-hk", "repo": "flake-compat", - "rev": "eca47d3377946315596da653862d341ee5341318", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", "type": "github" }, "original": { "owner": "input-output-hk", + "ref": "hkm/gitlab-fix", "repo": "flake-compat", "type": "github" } @@ -6043,16 +6044,20 @@ } }, "flake-utils_74": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", + "lastModified": 1681378341, + "narHash": "sha256-2qUN04W6X9cHHytEsJTM41CmusifPTC0bgTtYsHSNY8=", + "owner": "hamishmack", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "2767bafdb189cd623354620c2dacbeca8fd58b17", "type": "github" }, "original": { - "owner": "numtide", + "owner": "hamishmack", + "ref": "hkm/nested-hydraJobs", "repo": "flake-utils", "type": "github" } @@ -7100,8 +7105,10 @@ "hackage": [ "hackage" ], + "hls-1.10": "hls-1.10_4", "hpc-coveralls": "hpc-coveralls_16", "hydra": "hydra_8", + "iserv-proxy": "iserv-proxy_6", "nixpkgs": [ "haskell-nix", "nixpkgs-unstable" @@ -7110,6 +7117,7 @@ "nixpkgs-2105": "nixpkgs-2105_16", "nixpkgs-2111": "nixpkgs-2111_16", "nixpkgs-2205": "nixpkgs-2205_6", + "nixpkgs-2211": "nixpkgs-2211_6", "nixpkgs-unstable": "nixpkgs-unstable_15", "old-ghc-nix": "old-ghc-nix_16", "stackage": "stackage_16" @@ -7741,6 +7749,23 @@ "type": "github" } }, + "hls-1.10_4": { + "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" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -8891,6 +8916,23 @@ "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" } }, + "iserv-proxy_6": { + "flake": false, + "locked": { + "lastModified": 1688517130, + "narHash": "sha256-hUqfxSlo+ffqVdkSZ1EDoB7/ILCL25eYkcCXW9/P3Wc=", + "ref": "hkm/remote-iserv", + "rev": "9151db2a9a61d7f5fe52ff8836f18bbd0fd8933c", + "revCount": 13, + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + }, + "original": { + "ref": "hkm/remote-iserv", + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + } + }, "kriti-lang": { "flake": false, "locked": { @@ -12269,6 +12311,22 @@ "type": "github" } }, + "nixpkgs-2211_6": { + "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-darwin": { "locked": { "lastModified": 1676998680, @@ -16482,6 +16540,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tailwind-haskell": { "inputs": { "flake-compat": "flake-compat_6", From 4cb28f14087d3392460e739789a2a61510037eb6 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Sun, 4 Jun 2023 16:48:10 +0800 Subject: [PATCH 04/13] mark cardano-cli as potentially producing warnigns --- nix/cardano/packages/haskell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/cardano/packages/haskell.nix b/nix/cardano/packages/haskell.nix index 93dbc37327..a0f20b3776 100644 --- a/nix/cardano/packages/haskell.nix +++ b/nix/cardano/packages/haskell.nix @@ -211,7 +211,7 @@ in packages = let # TODO: empty this list: - packagesWithWarnings = [ "ouroboros-consensus" ]; + packagesWithWarnings = [ "ouroboros-consensus" "cardano-cli"]; in lib.genAttrs (lib.subtractLists packagesWithWarnings packageNames) (name: { configureFlags = [ "--ghc-option=-Werror" ]; }); From 1c80a1eeed42d3e2f3ff77c49567e38eb06f1c49 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Sun, 4 Jun 2023 16:48:36 +0800 Subject: [PATCH 05/13] fix some import errors --- src/cardano-faucet/src/Cardano/Faucet/Types.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cardano-faucet/src/Cardano/Faucet/Types.hs b/src/cardano-faucet/src/Cardano/Faucet/Types.hs index 428c23b6d1..fb8d494b5a 100644 --- a/src/cardano-faucet/src/Cardano/Faucet/Types.hs +++ b/src/cardano-faucet/src/Cardano/Faucet/Types.hs @@ -12,10 +12,10 @@ import Cardano.Address.Derivation (Depth(RootK, AccountK, PaymentK, PolicyK), XP import Cardano.Address.Style.Shelley (Shelley, Role(UTxOExternal, Stake), derivePolicyPrivateKey) import Cardano.Api (AnyCardanoEra, IsCardanoEra, TxIn, TxOut, CtxUTxO, NetworkId, TxInMode, CardanoMode, TxId, FileError, Lovelace, AddressAny(AddressByron, AddressShelley), NetworkId, AssetId(AssetId, AdaAssetId), Quantity, SigningKey, getVerificationKey, makeByronAddress, castVerificationKey, PaymentExtendedKey) import Cardano.Api.Shelley (PoolId, StakeExtendedKey, StakeCredential, AssetName(..)) -import Cardano.CLI.Environment (EnvSocketError) -import Cardano.CLI.Shelley.Key (InputDecodeError) +import Cardano.Api (EnvSocketError, InputDecodeError) import Cardano.CLI.Shelley.Run.Address (SomeAddressVerificationKey(AByronVerificationKey, APaymentVerificationKey, APaymentExtendedVerificationKey, AGenesisUTxOVerificationKey), ShelleyAddressCmdError, buildShelleyAddress) -import Cardano.CLI.Shelley.Run.Transaction (ShelleyTxCmdError, SomeWitness, renderShelleyTxCmdError) +import Cardano.CLI.Shelley.Run.Transaction (ShelleyTxCmdError, renderShelleyTxCmdError) +import Cardano.CLI.Shelley.Run.Read (SomeWitness) import Cardano.Mnemonic (mkSomeMnemonic, getMkSomeMnemonicError) import Cardano.Prelude import Control.Concurrent.STM (TMVar, TQueue) From eae529a1766cb67440c9bd24b9660f1887fade31 Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Wed, 7 Jun 2023 04:25:59 -0300 Subject: [PATCH 06/13] fix all of the compile errors --- src/cardano-faucet/cardano-faucet.cabal | 3 +- src/cardano-faucet/src/Cardano/Faucet.hs | 44 +++++++++++------- .../src/Cardano/Faucet/TxUtils.hs | 35 ++++++-------- .../src/Cardano/Faucet/Types.hs | 23 +++++++--- .../src/Cardano/Faucet/Utils.hs | 10 ++-- src/cardano-faucet/src/Cardano/Faucet/Web.hs | 46 +++++++++---------- 6 files changed, 86 insertions(+), 75 deletions(-) diff --git a/src/cardano-faucet/cardano-faucet.cabal b/src/cardano-faucet/cardano-faucet.cabal index f80f6efe6e..a012b0a5af 100644 --- a/src/cardano-faucet/cardano-faucet.cabal +++ b/src/cardano-faucet/cardano-faucet.cabal @@ -33,6 +33,7 @@ common project-config -Wpartial-fields -Wredundant-constraints -Wunused-packages + -Wno-orphans common maybe-unix if !os(windows) @@ -77,7 +78,7 @@ library , iproute , network , ouroboros-consensus - , ouroboros-network + , ouroboros-network-protocols , parsec , servant-client , servant-server diff --git a/src/cardano-faucet/src/Cardano/Faucet.hs b/src/cardano-faucet/src/Cardano/Faucet.hs index 08252e06fa..d9fef2e282 100644 --- a/src/cardano-faucet/src/Cardano/Faucet.hs +++ b/src/cardano-faucet/src/Cardano/Faucet.hs @@ -18,14 +18,11 @@ module Cardano.Faucet (main) where import Cardano.Address.Derivation (Depth(AccountK), XPrv) import Cardano.Address.Style.Shelley (getKey, Shelley) -import Cardano.Api (TxInMode, CardanoMode, AddressAny, EraInMode, IsShelleyBasedEra, QueryInMode(QueryInEra, QueryCurrentEra), UTxO(unUTxO), QueryUTxOFilter(QueryUTxOByAddress), BlockInMode, ChainPoint, AnyCardanoEra(AnyCardanoEra), CardanoEraStyle(ShelleyBasedEra), LocalNodeConnectInfo(LocalNodeConnectInfo), LocalNodeClientProtocols(LocalNodeClientProtocols, localChainSyncClient, localStateQueryClient, localTxSubmissionClient, localTxMonitoringClient), toEraInMode, ConsensusMode(CardanoMode), QueryInEra(QueryInShelleyBasedEra), QueryInShelleyBasedEra(QueryUTxO, QueryStakeAddresses), LocalStateQueryClient(LocalStateQueryClient), ConsensusModeIsMultiEra(CardanoModeIsMultiEra), cardanoEraStyle, connectToLocalNode, LocalChainSyncClient(NoLocalChainSyncClient), SigningKey(PaymentExtendedSigningKey), getVerificationKey, Lovelace, serialiseAddress) +import Cardano.Api (TxInMode, CardanoMode, AddressAny, EraInMode, IsShelleyBasedEra, QueryInMode(QueryInEra, QueryCurrentEra), UTxO(unUTxO), QueryUTxOFilter(QueryUTxOByAddress), BlockInMode, ChainPoint, AnyCardanoEra(AnyCardanoEra), CardanoEraStyle(ShelleyBasedEra), LocalNodeConnectInfo(LocalNodeConnectInfo), LocalNodeClientProtocols(LocalNodeClientProtocols, localChainSyncClient, localStateQueryClient, localTxSubmissionClient, localTxMonitoringClient), toEraInMode, ConsensusMode(CardanoMode), QueryInEra(QueryInShelleyBasedEra), QueryInShelleyBasedEra(QueryUTxO, QueryStakeAddresses), LocalStateQueryClient(LocalStateQueryClient), ConsensusModeIsMultiEra(CardanoModeIsMultiEra), cardanoEraStyle, connectToLocalNode, LocalChainSyncClient(NoLocalChainSyncClient), SigningKey(PaymentExtendedSigningKey), getVerificationKey, Lovelace, serialiseAddress, EnvSocketError(..), ShelleyWitnessSigningKey(WitnessPaymentExtendedKey)) import Cardano.Api.Byron () --import Cardano.CLI.Run.Friendly (friendlyTxBS) -import Cardano.Api.Shelley (makeStakeAddress, StakeCredential(StakeCredentialByKey), verificationKeyHash, castVerificationKey, SigningKey(StakeExtendedSigningKey), StakeAddress, PoolId, NetworkId, StakeExtendedKey, queryExpr, LocalStateQueryExpr, determineEraExpr, CardanoEra, CardanoEra(ShelleyEra, AllegraEra, AlonzoEra, MaryEra, BabbageEra, ByronEra), shelleyBasedEra, IsCardanoEra, LocalTxMonitorClient(..), SlotNo) -import Cardano.CLI.Environment (readEnvSocketPath) +import Cardano.Api.Shelley (makeStakeAddress, StakeCredential(StakeCredentialByKey), verificationKeyHash, castVerificationKey, SigningKey(StakeExtendedSigningKey), StakeAddress, PoolId, NetworkId, StakeExtendedKey, queryExpr, LocalStateQueryExpr, determineEraExpr, CardanoEra, CardanoEra(ConwayEra, ShelleyEra, AllegraEra, AlonzoEra, MaryEra, BabbageEra, ByronEra), shelleyBasedEra, IsCardanoEra, LocalTxMonitorClient(..), SlotNo, UnsupportedNtcVersionError) import Cardano.CLI.Shelley.Run.Address -import Cardano.CLI.Shelley.Run.Transaction -import Cardano.CLI.Types import Cardano.Faucet.Misc import Cardano.Faucet.Types import Cardano.Faucet.Utils @@ -37,6 +34,7 @@ import Data.List.Utils (uniq) import Data.Map qualified as Map import Data.Map.Merge.Lazy as Map import Data.Set qualified as Set +import Data.Text qualified as Text import Formatting ((%), format) import Formatting.ShortFormatters hiding (x, b, f, l) import Network.Wai.Handler.Warp @@ -219,13 +217,15 @@ submissionClient dryRun txQueue = Net.Tx.LocalTxSubmissionClient waitForTxAndLoo --print result waitForTxAndLoop -withEra :: AnyCardanoEra -> (forall era. IsShelleyBasedEra era => CardanoEra era -> a) -> a -withEra (AnyCardanoEra ByronEra) _ = Prelude.error "byron not supported" -withEra (AnyCardanoEra AllegraEra) action = action AllegraEra -withEra (AnyCardanoEra AlonzoEra) action = action AlonzoEra -withEra (AnyCardanoEra BabbageEra) action = action BabbageEra -withEra (AnyCardanoEra MaryEra) action = action MaryEra -withEra (AnyCardanoEra ShelleyEra) action = action ShelleyEra +withEra :: Either UnsupportedNtcVersionError AnyCardanoEra -> (forall era. IsShelleyBasedEra era => CardanoEra era -> a) -> a +withEra (Right (AnyCardanoEra ByronEra)) _ = Prelude.error "byron not supported" +withEra (Right (AnyCardanoEra AllegraEra)) action = action AllegraEra +withEra (Right (AnyCardanoEra AlonzoEra)) action = action AlonzoEra +withEra (Right (AnyCardanoEra BabbageEra)) action = action BabbageEra +withEra (Right (AnyCardanoEra MaryEra)) action = action MaryEra +withEra (Right (AnyCardanoEra ShelleyEra)) action = action ShelleyEra +withEra (Right (AnyCardanoEra ConwayEra)) action = action ConwayEra +withEra (Left _) _ = Prelude.error "withEra ntc error" queryManyStakeAddr :: forall era mode . IsShelleyBasedEra era => NetworkId -> Maybe (EraInMode era mode) -> [StakeCredential] -> QueryInMode mode (Either EraMismatch (Map StakeAddress Lovelace, Map StakeAddress PoolId)) queryManyStakeAddr _ Nothing _ = Prelude.error "not handled" @@ -242,7 +242,7 @@ newFaucetState fsConfig fsTxQueue = do addrK = accountKeyToPaymentKey fsAcctKey (fcfAddressIndex fsConfig) pay_skey = PaymentExtendedSigningKey $ getKey addrK pay_vkey = getVerificationKey pay_skey - fsPaymentSkey = APaymentExtendedSigningKey pay_skey + fsPaymentSkey = WitnessPaymentExtendedKey pay_skey fsPaymentVkey = APaymentExtendedVerificationKey pay_vkey fsBucketSizes = findAllSizes fsConfig fsNetwork = fcfNetwork fsConfig @@ -260,11 +260,12 @@ _newQueryClient port config txQueue = do _child <- liftIO $ forkIO $ startApiServer era faucetState port eUtxoResult <- queryExpr $ getUtxoQuery (fsOwnAddress faucetState) $ toEraInMode era CardanoMode case eUtxoResult of - Right result -> do + Right (Right result) -> do let stats = computeUtxoStats (unUTxO result) print stats liftIO $ atomically $ putTMVar (fsUtxoTMVar faucetState) (unUTxO result) putStrLn @Text "utxo set initialized" + Right (Left err) -> print err Left err -> print err case fcfMaxStakeKeyIndex config of Just count -> do @@ -276,7 +277,7 @@ _newQueryClient port config txQueue = do eResult <- queryExpr (queryManyStakeAddr (fcfNetwork config) (toEraInMode era CardanoMode) x) print eResult case eResult of - Right result -> do + Right (Right result) -> do let (notRegistered, notDelegated, delegated) = sortStakeKeys result manyStakeKeys case fcfDebug config of @@ -287,6 +288,7 @@ _newQueryClient port config txQueue = do False -> do putStrLn $ format (d % " stake keys not registered, " % d % " stake keys registered and ready for use, "%d%" stake keys delegated to pools") (length notRegistered) (length notDelegated) (length delegated) liftIO $ atomically $ putTMVar (fsStakeTMVar faucetState) (notDelegated, delegated) + Right (Left err) -> print err Left err -> print err Nothing -> pure () pure () @@ -370,6 +372,16 @@ txMonitor FaucetConfigFile{fcfDebug} = LocalTxMonitorClient $ return $ CTxMon.Se getNextTx Nothing = do return $ CTxMon.SendMsgAwaitAcquire getSnapshot +readEnvSocketPath :: IO (Either EnvSocketError Prelude.String) +readEnvSocketPath = do + mEnvName <- lookupEnv envName + case mEnvName of + Just sPath -> return $ Right sPath + Nothing -> return . Left $ CliEnvVarLookup (Text.pack envName) + where + envName :: Prelude.String + envName = "CARDANO_NODE_SOCKET_PATH" + main :: IO () main = do hSetBuffering stdout LineBuffering @@ -384,7 +396,7 @@ main = do port = Prelude.read $ portString bar <- unmaybe configFilePath fsConfig <- parseConfig bar - SocketPath sockPath <- withExceptT FaucetErrorSocketNotFound readEnvSocketPath + Right sockPath <- liftIO $ readEnvSocketPath let localNodeConnInfo :: LocalNodeConnectInfo CardanoMode localNodeConnInfo = LocalNodeConnectInfo defaultCModeParams (fcfNetwork fsConfig) sockPath diff --git a/src/cardano-faucet/src/Cardano/Faucet/TxUtils.hs b/src/cardano-faucet/src/Cardano/Faucet/TxUtils.hs index 9a74627f10..1f5028bfe9 100644 --- a/src/cardano-faucet/src/Cardano/Faucet/TxUtils.hs +++ b/src/cardano-faucet/src/Cardano/Faucet/TxUtils.hs @@ -4,15 +4,15 @@ module Cardano.Faucet.TxUtils where -import Cardano.Api (Lovelace, IsShelleyBasedEra, ShelleyBasedEra, NetworkId, TxIn, TxOut(TxOut), CtxUTxO, TxBody, TxBodyContent(TxBodyContent), Witness(KeyWitness), KeyWitnessInCtx(KeyWitnessForSpending), TxInsCollateral(TxInsCollateralNone), TxInsReference(TxInsReferenceNone), TxTotalCollateral(TxTotalCollateralNone), TxReturnCollateral(TxReturnCollateralNone), TxMetadataInEra(TxMetadataNone), TxAuxScripts(TxAuxScriptsNone), TxExtraKeyWitnesses(TxExtraKeyWitnessesNone), TxWithdrawals(TxWithdrawalsNone), TxCertificates, BuildTxWith(BuildTxWith), TxUpdateProposal(TxUpdateProposalNone), TxMintValue(..), TxScriptValidity(TxScriptValidityNone), shelleyBasedToCardanoEra, Tx, makeShelleyKeyWitness, makeSignedTransaction, AddressAny, TxId, getTxId, BuildTx) +import Cardano.Api (Lovelace, IsShelleyBasedEra, ShelleyBasedEra, TxIn, TxOut(TxOut), CtxUTxO, TxBody, TxBodyContent(TxBodyContent), Witness(KeyWitness), KeyWitnessInCtx(KeyWitnessForSpending), TxInsCollateral(TxInsCollateralNone), TxInsReference(TxInsReferenceNone), TxTotalCollateral(TxTotalCollateralNone), TxReturnCollateral(TxReturnCollateralNone), TxMetadataInEra(TxMetadataNone), TxAuxScripts(TxAuxScriptsNone), TxExtraKeyWitnesses(TxExtraKeyWitnessesNone), TxWithdrawals(TxWithdrawalsNone), TxCertificates, BuildTxWith(BuildTxWith), TxUpdateProposal(TxUpdateProposalNone), TxMintValue(..), TxScriptValidity(TxScriptValidityNone), shelleyBasedToCardanoEra, Tx, makeShelleyKeyWitness, makeSignedTransaction, AddressAny, TxId, getTxId, BuildTx, ShelleyWitnessSigningKey) +import Cardano.Api.Shelley (lovelaceToValue, Value, createAndValidateTransactionBody) import Cardano.CLI.Shelley.Run.Transaction -import Cardano.Api.Shelley (lovelaceToValue, makeTransactionBody, Value) import Cardano.CLI.Types +import Cardano.Faucet.Misc (getValue, faucetValueToLovelace) import Cardano.Faucet.Types (FaucetWebError(..), FaucetValue) import Cardano.Faucet.Utils -import Cardano.Faucet.Misc (getValue, faucetValueToLovelace) import Cardano.Prelude hiding ((%)) -import Control.Monad.Trans.Except.Extra (firstExceptT, left, hoistEither) +import Control.Monad.Trans.Except.Extra (left) getMintedValue :: TxMintValue BuildTx era -> Value getMintedValue (TxMintValue _ val _) = val @@ -66,7 +66,7 @@ txBuild sbe (txin, txout) addressOrOutputs certs minting (Fee fixedFee) = do <*> pure minting <*> pure TxScriptValidityNone - case makeTransactionBody txBodyContent of + case createAndValidateTransactionBody txBodyContent of Left err -> left $ FaucetWebErrorTodo $ show err Right txbody -> pure txbody {- @@ -112,20 +112,14 @@ txBuild sbe (txin, txout) addressOrOutputs certs minting (Fee fixedFee) = do -} txSign :: IsShelleyBasedEra era - => NetworkId - -> TxBody era - -> [SomeWitness] + => TxBody era + -> [ShelleyWitnessSigningKey] -> ExceptT ShelleyTxCmdError IO (Tx era) -txSign networkId txBody sks = do - let (sksByron, sksShelley) = partitionSomeWitnesses $ map categoriseSomeWitness sks - - -- Byron witnesses require the network ID. This can either be provided - -- directly or derived from a provided Byron address. - byronWitnesses <- firstExceptT (ShelleyTxCmdBootstrapWitnessError) . hoistEither $ - mkShelleyBootstrapWitnesses (Just networkId) txBody sksByron +txSign txBody sks = do + --let (sksByron, sksShelley) = partitionSomeWitnesses $ map categoriseSomeWitness sks - let shelleyKeyWitnesses = map (makeShelleyKeyWitness txBody) sksShelley - let tx = makeSignedTransaction (byronWitnesses ++ shelleyKeyWitnesses) txBody + let shelleyKeyWitnesses = map (makeShelleyKeyWitness txBody) sks + let tx = makeSignedTransaction shelleyKeyWitnesses txBody return tx @@ -133,18 +127,17 @@ makeAndSignTx :: IsShelleyBasedEra era => ShelleyBasedEra era -> (TxIn, TxOut CtxUTxO era) -> Either AddressAny [TxOutAnyEra] - -> NetworkId - -> [SomeWitness] + -> [ShelleyWitnessSigningKey] -> TxCertificates BuildTx era -> TxMintValue BuildTx era -> Fee -> ExceptT FaucetWebError IO (Tx era, TxId) -makeAndSignTx sbe txinout addressOrOutputs network skeys certs minting fee = do +makeAndSignTx sbe txinout addressOrOutputs skeys certs minting fee = do -- instead of having to specify an output that is exactly equal to input-fees -- i specify no outputs, and set the change addr to the end-user unsignedTx <- txBuild sbe txinout addressOrOutputs certs minting fee let txid :: TxId txid = getTxId unsignedTx - signedTx <- withExceptT (FaucetWebErrorTodo . renderShelleyTxCmdError) $ txSign network unsignedTx skeys + signedTx <- withExceptT (FaucetWebErrorTodo . renderShelleyTxCmdError) $ txSign unsignedTx skeys pure (signedTx, txid) diff --git a/src/cardano-faucet/src/Cardano/Faucet/Types.hs b/src/cardano-faucet/src/Cardano/Faucet/Types.hs index fb8d494b5a..906906f41e 100644 --- a/src/cardano-faucet/src/Cardano/Faucet/Types.hs +++ b/src/cardano-faucet/src/Cardano/Faucet/Types.hs @@ -8,19 +8,20 @@ module Cardano.Faucet.Types where +import Prelude (fail) + import Cardano.Address.Derivation (Depth(RootK, AccountK, PaymentK, PolicyK), XPrv, genMasterKeyFromMnemonic, indexFromWord32, deriveAccountPrivateKey, deriveAddressPrivateKey, Index, DerivationType(Hardened, Soft)) import Cardano.Address.Style.Shelley (Shelley, Role(UTxOExternal, Stake), derivePolicyPrivateKey) -import Cardano.Api (AnyCardanoEra, IsCardanoEra, TxIn, TxOut, CtxUTxO, NetworkId, TxInMode, CardanoMode, TxId, FileError, Lovelace, AddressAny(AddressByron, AddressShelley), NetworkId, AssetId(AssetId, AdaAssetId), Quantity, SigningKey, getVerificationKey, makeByronAddress, castVerificationKey, PaymentExtendedKey) -import Cardano.Api.Shelley (PoolId, StakeExtendedKey, StakeCredential, AssetName(..)) +import Cardano.Api (AnyCardanoEra, IsCardanoEra, TxIn, TxOut, CtxUTxO, TxInMode, CardanoMode, TxId, FileError, Lovelace, AddressAny(AddressByron, AddressShelley), AssetId(AssetId, AdaAssetId), Quantity, SigningKey, getVerificationKey, makeByronAddress, castVerificationKey, PaymentExtendedKey) +import Cardano.Api.Shelley (PoolId, StakeExtendedKey, StakeCredential, AssetName(..), NetworkId(Testnet, Mainnet), NetworkMagic(NetworkMagic), ShelleyWitnessSigningKey) import Cardano.Api (EnvSocketError, InputDecodeError) import Cardano.CLI.Shelley.Run.Address (SomeAddressVerificationKey(AByronVerificationKey, APaymentVerificationKey, APaymentExtendedVerificationKey, AGenesisUTxOVerificationKey), ShelleyAddressCmdError, buildShelleyAddress) import Cardano.CLI.Shelley.Run.Transaction (ShelleyTxCmdError, renderShelleyTxCmdError) -import Cardano.CLI.Shelley.Run.Read (SomeWitness) import Cardano.Mnemonic (mkSomeMnemonic, getMkSomeMnemonicError) import Cardano.Prelude import Control.Concurrent.STM (TMVar, TQueue) import Control.Monad.Trans.Except.Extra (left) -import Data.Aeson (ToJSON(..), object, (.=), Options(fieldLabelModifier), defaultOptions, camelTo2, genericToJSON, FromJSON(parseJSON), eitherDecodeFileStrict, Value(String), withObject, (.:), (.:?), Object) +import Data.Aeson (ToJSON(..), object, (.=), Options(fieldLabelModifier), defaultOptions, camelTo2, genericToJSON, FromJSON(parseJSON), eitherDecodeFileStrict, Value(String,Object), withObject, (.:), (.:?), Object) import Data.Aeson.Types (Parser) import Data.Aeson.KeyMap (member) import Data.ByteString.Char8 qualified as BSC @@ -84,7 +85,7 @@ data FaucetWebError = FaucetWebErrorInvalidAddress Text Text | FaucetWebErrorUtxoNotFound FaucetValue | FaucetWebErrorEraConversion | FaucetWebErrorTodo Text - | FaucetWebErrorFeatureMismatch AnyCardanoEra Text + | FaucetWebErrorFeatureMismatch AnyCardanoEra | FaucetWebErrorConsensusModeMismatchTxBalance Text AnyCardanoEra | FaucetWebErrorEraMismatch Text | FaucetWebErrorAutoBalance Text @@ -109,7 +110,7 @@ data IsCardanoEra era => FaucetState era = FaucetState , fsNetwork :: NetworkId , fsTxQueue :: TQueue (TxInMode CardanoMode, ByteString) , fsRootKey :: Shelley 'RootK XPrv - , fsPaymentSkey :: SomeWitness + , fsPaymentSkey :: ShelleyWitnessSigningKey , fsPaymentVkey :: SomeAddressVerificationKey , fsAcctKey :: Shelley 'AccountK XPrv , fsConfig :: FaucetConfigFile @@ -187,6 +188,15 @@ data FaucetConfigFile = FaucetConfigFile , fcfAddressIndex :: Word32 } deriving (Generic, Show) +-- copied from bench/tx-generator/src/Cardano/TxGenerator/Internal/Orphans.hs +instance FromJSON NetworkId where + parseJSON j = case j of + String "Mainnet" -> pure Mainnet + Object v -> v .:? "Testnet" >>= maybe failure (pure . Testnet . NetworkMagic) + _ -> failure + where + failure = fail $ "could not parse NetworkId: " <> show j + instance FromJSON FaucetConfigFile where parseJSON = withObject "FaucetConfigFile" $ \o -> do fcfMnemonic <- o .: "mnemonic" @@ -323,6 +333,7 @@ vkeyToAddr nw (AByronVerificationKey vk) = return (AddressByron (makeByronAddres vkeyToAddr nw (APaymentVerificationKey vk) = AddressShelley <$> buildShelleyAddress vk Nothing nw vkeyToAddr nw (APaymentExtendedVerificationKey vk) = AddressShelley <$> buildShelleyAddress (castVerificationKey vk) Nothing nw vkeyToAddr nw (AGenesisUTxOVerificationKey vk) = AddressShelley <$> buildShelleyAddress (castVerificationKey vk) Nothing nw +vkeyToAddr _ _ = fail "unexpected vkey type" paymentKeyToAddress :: SigningKey PaymentExtendedKey -> NetworkId -> ExceptT FaucetError IO AddressAny paymentKeyToAddress skey network = do diff --git a/src/cardano-faucet/src/Cardano/Faucet/Utils.hs b/src/cardano-faucet/src/Cardano/Faucet/Utils.hs index 3e8b040f6d..ce73ab2084 100644 --- a/src/cardano-faucet/src/Cardano/Faucet/Utils.hs +++ b/src/cardano-faucet/src/Cardano/Faucet/Utils.hs @@ -8,7 +8,6 @@ module Cardano.Faucet.Utils where import Cardano.Api (TxIn, TxOut(TxOut), CtxUTxO, Lovelace, CardanoEra, TxFee, txFeesExplicitInEra, TxFee(TxFeeImplicit, TxFeeExplicit), anyCardanoEra, TxValidityLowerBound(TxValidityNoLowerBound), TxValidityUpperBound(TxValidityNoUpperBound), validityNoUpperBoundSupportedInEra) import Cardano.Api.Shelley () -import Cardano.CLI.Shelley.Run.Transaction import Cardano.Faucet.Misc import Cardano.Faucet.Types import Cardano.Prelude hiding ((%)) @@ -74,14 +73,13 @@ validateTxFee :: validateTxFee era mfee = case (txFeesExplicitInEra era, mfee) of (Left implicit, Nothing) -> return (TxFeeImplicit implicit) (Right explicit, Just fee) -> return (TxFeeExplicit explicit fee) - (Right _, Nothing) -> txFeatureMismatch era TxFeatureImplicitFees - (Left _, Just _) -> txFeatureMismatch era TxFeatureExplicitFees + (Right _, Nothing) -> txFeatureMismatch era + (Left _, Just _) -> txFeatureMismatch era txFeatureMismatch :: CardanoEra era - -> TxFeature -> ExceptT FaucetWebError IO a -txFeatureMismatch era feature = left (FaucetWebErrorFeatureMismatch (anyCardanoEra era) (show feature)) +txFeatureMismatch era = left (FaucetWebErrorFeatureMismatch (anyCardanoEra era)) noBoundsIfSupported :: CardanoEra era @@ -94,5 +92,5 @@ noUpperBoundIfSupported :: CardanoEra era -> ExceptT FaucetWebError IO (TxValidityUpperBound era) noUpperBoundIfSupported era = case validityNoUpperBoundSupportedInEra era of - Nothing -> txFeatureMismatch era TxFeatureValidityNoUpperBound + Nothing -> txFeatureMismatch era Just supported -> return (TxValidityNoUpperBound supported) diff --git a/src/cardano-faucet/src/Cardano/Faucet/Web.hs b/src/cardano-faucet/src/Cardano/Faucet/Web.hs index a4414edc11..8eab6a169e 100644 --- a/src/cardano-faucet/src/Cardano/Faucet/Web.hs +++ b/src/cardano-faucet/src/Cardano/Faucet/Web.hs @@ -15,9 +15,9 @@ module Cardano.Faucet.Web (userAPI, server, SiteVerifyRequest(..)) where import Cardano.Api (CardanoEra, IsShelleyBasedEra, TxInMode(TxInMode), Lovelace(Lovelace), IsCardanoEra, TxCertificates(TxCertificatesNone), serialiseAddress, SigningKey(PaymentExtendedSigningKey), PaymentExtendedKey) -import Cardano.Api.Shelley (StakeCredential, makeStakeAddressDelegationCertificate, PoolId, TxCertificates(TxCertificates), certificatesSupportedInEra, BuildTxWith(BuildTxWith), Witness(KeyWitness), KeyWitnessInCtx(KeyWitnessForStakeAddr), StakeExtendedKey, serialiseToBech32, AssetId(AssetId, AdaAssetId), PolicyId(PolicyId), serialiseToRawBytesHexText, AssetName(AssetName), TxMintValue(TxMintNone, TxMintValue), AddressAny, multiAssetSupportedInEra, valueFromList, ScriptWitness(SimpleScriptWitness), SimpleScript(RequireSignature), Script(SimpleScript), simpleScriptVersion, SimpleScriptOrReferenceInput(SScript), SimpleScriptV2, scriptLanguageSupportedInEra, ScriptLanguage(SimpleScriptLanguage), SimpleScriptVersion, shelleyBasedEra, Tx, TxId, verificationKeyHash, getVerificationKey, castVerificationKey, VerificationKey, Quantity(Quantity), scriptPolicyId, TxOut(TxOut), TxOutValue(TxOutAdaOnly, TxOutValue), lovelaceToValue, negateValue, Value, BuildTx, CtxUTxO, WitCtxMint) +import Cardano.Api.Shelley (StakeCredential, PoolId, TxCertificates(TxCertificates), certificatesSupportedInEra, BuildTxWith(BuildTxWith), Witness(KeyWitness), KeyWitnessInCtx(KeyWitnessForStakeAddr), StakeExtendedKey, serialiseToBech32, AssetId(AssetId, AdaAssetId), PolicyId(PolicyId), serialiseToRawBytesHexText, AssetName(AssetName), TxMintValue(TxMintNone, TxMintValue), AddressAny, multiAssetSupportedInEra, valueFromList, ScriptWitness(SimpleScriptWitness), SimpleScript(RequireSignature), SimpleScriptOrReferenceInput(SScript), scriptLanguageSupportedInEra, ScriptLanguage(SimpleScriptLanguage), shelleyBasedEra, Tx, TxId, verificationKeyHash, getVerificationKey, castVerificationKey, VerificationKey, Quantity(Quantity), scriptPolicyId, TxOut(TxOut), TxOutValue(TxOutAdaOnly, TxOutValue), lovelaceToValue, negateValue, Value, BuildTx, CtxUTxO, WitCtxMint, Script(SimpleScript), SimpleScript, SimpleScript', ShelleyWitnessSigningKey(WitnessPaymentExtendedKey, WitnessStakeExtendedKey), makeStakeAddressPoolDelegationCertificate) import Cardano.CLI.Run.Friendly (friendlyTxBS) -import Cardano.CLI.Shelley.Run.Transaction (SomeWitness(..)) +import Cardano.CLI.Shelley.Run.Transaction () import Cardano.Faucet.Misc (convertEra, parseAddress, toFaucetValue, faucetValueToLovelace, stripMintingTokens) import Cardano.Faucet.TxUtils (makeAndSignTx, Fee(..)) import Cardano.Faucet.Types (CaptchaToken, ForwardedFor(..), SendMoneyReply(..), DelegationReply(..), SiteVerifyReply(..), SiteVerifyRequest(..), SecretKey, FaucetState(..), ApiKeyValue(..), RateLimitResult(..), ApiKey(..), RateLimitAddress(..), UtxoStats(..), FaucetValue(..), FaucetConfigFile(..), FaucetWebError(..), SiteKey(..), SendMoneySent(..), FaucetToken(FaucetToken, FaucetMintToken), rootKeyToPolicyKey) @@ -183,9 +183,9 @@ txoutToValue (TxOut _ txOutValue _ _) = unwrap txOutValue data TokenState = TokenState { tsAssetId :: AssetId , tsPolicyId :: PolicyId - , tsSimpleScript :: SimpleScript SimpleScriptV2 + , tsSimpleScript :: SimpleScript , tsPolicySKey :: SigningKey PaymentExtendedKey - , tsScript :: Script SimpleScriptV2 + , tsScript :: Script SimpleScript' } getTokenState :: HasCallStack => IsCardanoEra era => Word32 -> AssetName -> FaucetState era -> TokenState @@ -197,28 +197,26 @@ getTokenState policy_index name FaucetState{fsRootKey} = TokenState{tsAssetId,ts tsPolicySKey = PaymentExtendedSigningKey $ getKey policyKey policy_vkey :: VerificationKey PaymentExtendedKey policy_vkey = getVerificationKey tsPolicySKey - tsSimpleScript :: SimpleScript SimpleScriptV2 + tsSimpleScript :: SimpleScript tsSimpleScript = RequireSignature $ verificationKeyHash $ castVerificationKey policy_vkey - tsScript :: Script SimpleScriptV2 - tsScript = SimpleScript simpleScriptVersion tsSimpleScript + tsScript :: Script SimpleScript' + tsScript = SimpleScript tsSimpleScript tsPolicyId = scriptPolicyId tsScript tsAssetId = AssetId tsPolicyId name -getOptionalMintOutput :: IsCardanoEra era => FaucetState era -> CardanoEra era -> FaucetValue -> ExceptT FaucetWebError IO (Value, TxMintValue BuildTx era, [SomeWitness]) +getOptionalMintOutput :: IsCardanoEra era => FaucetState era -> CardanoEra era -> FaucetValue -> ExceptT FaucetWebError IO (Value, TxMintValue BuildTx era, [ShelleyWitnessSigningKey]) getOptionalMintOutput fs era (FaucetValueMultiAsset _ (FaucetMintToken (policy_index, name, quant))) = do supported <- either (\_ -> left $ FaucetWebErrorTodo "asset error") pure $ multiAssetSupportedInEra era let - x :: SimpleScriptVersion SimpleScriptV2 - x = simpleScriptVersion - languageSupportedInEra <- case (scriptLanguageSupportedInEra era $ SimpleScriptLanguage x) of + languageSupportedInEra <- case (scriptLanguageSupportedInEra era $ SimpleScriptLanguage) of Just yes -> pure yes Nothing -> left $ FaucetWebErrorTodo "scripts not supported" let TokenState{tsAssetId,tsPolicyId,tsSimpleScript,tsPolicySKey} = getTokenState policy_index name fs valueToMint = valueFromList [ (tsAssetId, quant) ] - witnessesProvidedMap = Map.fromList [(tsPolicyId, SimpleScriptWitness languageSupportedInEra simpleScriptVersion (SScript tsSimpleScript))] + witnessesProvidedMap = Map.fromList [(tsPolicyId, SimpleScriptWitness languageSupportedInEra (SScript tsSimpleScript))] y = BuildTxWith $ witnessesProvidedMap - pure $ (valueToMint, TxMintValue supported valueToMint y, [APaymentExtendedSigningKey tsPolicySKey]) + pure $ (valueToMint, TxMintValue supported valueToMint y, [WitnessPaymentExtendedKey tsPolicySKey]) getOptionalMintOutput _ _ _ = pure (mempty, TxMintNone, []) mintFreshTokens :: forall era . IsShelleyBasedEra era @@ -231,23 +229,21 @@ mintFreshTokens :: forall era . IsShelleyBasedEra era -> Integer -> Fee -> ExceptT FaucetWebError IO (Tx era, TxId) -mintFreshTokens era fs@FaucetState{fsUtxoTMVar,fsNetwork,fsPaymentSkey,fsOwnAddress} policyIndex destinationAddress tokenname count tx_out_count (Fee feeLovelace) = do +mintFreshTokens era fs@FaucetState{fsUtxoTMVar,fsPaymentSkey,fsOwnAddress} policyIndex destinationAddress tokenname count tx_out_count (Fee feeLovelace) = do let TokenState{tsAssetId,tsPolicyId,tsSimpleScript,tsPolicySKey} = getTokenState policyIndex tokenname fs sbe = shelleyBasedEra @era - x :: SimpleScriptVersion SimpleScriptV2 - x = simpleScriptVersion txinout@(_, txout) <- liftIO $ atomically $ do txinout <- findUtxoOfSize fsUtxoTMVar $ Ada $ Lovelace (1000 * 1000000) pure txinout supported <- either (\_ -> left $ FaucetWebErrorTodo "asset error") pure $ multiAssetSupportedInEra era - languageSupportedInEra <- case (scriptLanguageSupportedInEra era $ SimpleScriptLanguage x) of + languageSupportedInEra <- case (scriptLanguageSupportedInEra era $ SimpleScriptLanguage) of Just yes -> pure yes Nothing -> left $ FaucetWebErrorTodo "scripts not supported" let valueToMint = valueFromList [(tsAssetId, Quantity $ count * tx_out_count)] witnessesProvidedMap :: Map PolicyId (ScriptWitness WitCtxMint era) - witnessesProvidedMap = Map.fromList [(tsPolicyId, SimpleScriptWitness languageSupportedInEra simpleScriptVersion (SScript tsSimpleScript))] + witnessesProvidedMap = Map.fromList [(tsPolicyId, SimpleScriptWitness languageSupportedInEra (SScript tsSimpleScript))] mint = TxMintValue supported valueToMint $ BuildTxWith witnessesProvidedMap -- value in each utxo being created outputValue = valueFromList [ (AdaAssetId, Quantity 10000000), (tsAssetId, Quantity count) ] @@ -267,7 +263,7 @@ mintFreshTokens era fs@FaucetState{fsUtxoTMVar,fsNetwork,fsPaymentSkey,fsOwnAddr putStrLn $ format ("output_sum: " % sh) $ output_sum putStrLn $ format ("input_sum: " % sh) $ input_sum putStrLn $ format ("change: " % sh) $ change - (signedTx, txid) <- makeAndSignTx sbe txinout (Right outputsWithChange) fsNetwork [fsPaymentSkey, APaymentExtendedSigningKey tsPolicySKey] TxCertificatesNone mint (Fee feeLovelace) + (signedTx, txid) <- makeAndSignTx sbe txinout (Right outputsWithChange) [fsPaymentSkey, WitnessPaymentExtendedKey tsPolicySKey] TxCertificatesNone mint (Fee feeLovelace) pure (signedTx, txid) handleDelegateStake :: forall era. IsShelleyBasedEra era @@ -280,7 +276,7 @@ handleDelegateStake :: forall era. IsShelleyBasedEra era -> Maybe ForwardedFor -> Maybe Text -> Servant.Handler (Headers '[Header "Access-Control-Allow-Origin" Text] DelegationReply) -handleDelegateStake era FaucetState{fsPaymentSkey,fsNetwork,fsUtxoTMVar,fsTxQueue,fsStakeTMVar,fsConfig,fsDelegationRateLimitState,fsOwnAddress} poolId mApiKey mToken remoteip mForwardedFor mOrigin = do +handleDelegateStake era FaucetState{fsPaymentSkey,fsUtxoTMVar,fsTxQueue,fsStakeTMVar,fsConfig,fsDelegationRateLimitState,fsOwnAddress} poolId mApiKey mToken remoteip mForwardedFor mOrigin = do let clientIP = pickIp mForwardedFor remoteip sbe = shelleyBasedEra @era @@ -311,11 +307,11 @@ handleDelegateStake era FaucetState{fsPaymentSkey,fsNetwork,fsUtxoTMVar,fsTxQueu Left err -> left err Right ((stake_skey, creds), txinout) -> do let - cert = makeStakeAddressDelegationCertificate creds poolId - stake_witness = AStakeExtendedSigningKey stake_skey + cert = makeStakeAddressPoolDelegationCertificate creds poolId + stake_witness = WitnessStakeExtendedKey stake_skey x = BuildTxWith $ Map.fromList [(creds,KeyWitness KeyWitnessForStakeAddr)] supported <- maybe (left $ FaucetWebErrorTodo "cert error") pure $ certificatesSupportedInEra era - (signedTx, txid) <- makeAndSignTx sbe txinout (Left fsOwnAddress) fsNetwork [fsPaymentSkey, stake_witness] (TxCertificates supported [cert] x) TxMintNone (Fee $ Lovelace 200000) + (signedTx, txid) <- makeAndSignTx sbe txinout (Left fsOwnAddress) [fsPaymentSkey, stake_witness] (TxCertificates supported [cert] x) TxMintNone (Fee $ Lovelace 200000) let prettyTx = friendlyTxBS era signedTx eraInMode <- convertEra era @@ -484,7 +480,7 @@ handleSendMoney :: forall era. IsShelleyBasedEra era => -> Maybe ForwardedFor -> Maybe Text -> Servant.Handler (Headers '[Header "Access-Control-Allow-Origin" Text] SendMoneyReply) -handleSendMoney era fs@FaucetState{fsNetwork,fsUtxoTMVar,fsPaymentSkey,fsTxQueue,fsConfig,fsSendMoneyRateLimitState} addr mType mApiKey mToken remoteip mForwardedFor mOrigin = do +handleSendMoney era fs@FaucetState{fsUtxoTMVar,fsPaymentSkey,fsTxQueue,fsConfig,fsSendMoneyRateLimitState} addr mType mApiKey mToken remoteip mForwardedFor mOrigin = do let clientIP = pickIp mForwardedFor remoteip let sbe = shelleyBasedEra @era eResult <- liftIO $ runExceptT $ do @@ -522,7 +518,7 @@ handleSendMoney era fs@FaucetState{fsNetwork,fsUtxoTMVar,fsPaymentSkey,fsTxQueue valueUserShouldReceive = txInValue <> mintedValue <> (negateValue $ lovelaceToValue feeLovelace) outputs :: [TxOutAnyEra] outputs = [ TxOutAnyEra addressAny valueUserShouldReceive TxOutDatumByNone ReferenceScriptAnyEraNone ] - (signedTx, txid) <- makeAndSignTx sbe txinout (Right outputs) fsNetwork (extraKeys <> [fsPaymentSkey]) TxCertificatesNone mintField (Fee $ feeLovelace) + (signedTx, txid) <- makeAndSignTx sbe txinout (Right outputs) (extraKeys <> [fsPaymentSkey]) TxCertificatesNone mintField (Fee $ feeLovelace) putStrLn $ format ("txin is worth: " % sh) $ txInValue putStrLn $ format ("user should receive: " % sh) valueUserShouldReceive putStrLn $ format (sh % ": sending funds to address " % st % " via txid " % sh) clientIP (serialiseAddress addressAny) txid From 57f24ea788f39e117d5bfe96abf0dcca3cbcc00f Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Thu, 13 Jul 2023 22:46:57 -0300 Subject: [PATCH 07/13] re-update to fix building --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e30ff9334c..babb8c4c81 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1684774104, - "narHash": "sha256-BeflyQIdaAe+Hcell/q52DN6P6ilCJUaj3Wgf+2QfAY=", + "lastModified": 1689254413, + "narHash": "sha256-sPmwlVNBtAXqFHCaIQtnFfqDKRErHmg0jmQZvRILXG4=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "c46d4e87cd4c60b493fc88b3d13dd7bfdaab1260", + "rev": "562fcb96351ae3be1e1c462cc36ae82694636c2f", "type": "github" }, "original": { @@ -6848,11 +6848,11 @@ "hackage_14": { "flake": false, "locked": { - "lastModified": 1666835858, - "narHash": "sha256-eP2qK2rDPX0g9fHW8oIf6rTYG6rwp+DP0iXf3UNAVu4=", + "lastModified": 1689208161, + "narHash": "sha256-qh5bnqYDhEhm9V5u6Z3eiYC5Dy9CAVKxQnSC3tHhO4A=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "bbfd6150cc23c2f351444c928d7e0d6e28e6a58f", + "rev": "521fbfc52df1ef8df4af20e75ca92e874a33b6b2", "type": "github" }, "original": { From ef409312283256453f12731c149dba91b7894c23 Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Tue, 18 Jul 2023 12:28:13 -0300 Subject: [PATCH 08/13] update dependencies and fix build errors --- cabal.project | 2 +- flake.lock | 1391 ++++++++++++++--------- flake.nix | 2 +- src/cardano-faucet/cardano-faucet.cabal | 4 + 4 files changed, 881 insertions(+), 518 deletions(-) diff --git a/cabal.project b/cabal.project index 5f4666d8ad..9dafd89c75 100644 --- a/cabal.project +++ b/cabal.project @@ -1,5 +1,5 @@ -- run `nix flake lock --update-input hackage` after updating index-state. -index-state: 2023-05-15T00:00:00Z +index-state: 2023-07-18T00:00:00Z repository cardano-haskell-packages url: https://input-output-hk.github.io/cardano-haskell-packages diff --git a/flake.lock b/flake.lock index babb8c4c81..a30163dca6 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1689254413, - "narHash": "sha256-sPmwlVNBtAXqFHCaIQtnFfqDKRErHmg0jmQZvRILXG4=", + "lastModified": 1689606699, + "narHash": "sha256-3f3lfnlxUZwZvgDxq2N+C5BECAZ3oZEN1QC/u6pZSmw=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "562fcb96351ae3be1e1c462cc36ae82694636c2f", + "rev": "eae7f5b14d4e7bb5c0e76518548b00acb1fd5f10", "type": "github" }, "original": { @@ -444,7 +444,7 @@ "alejandra_2": { "inputs": { "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_62" + "nixpkgs": "nixpkgs_63" }, "locked": { "lastModified": 1646360966, @@ -568,8 +568,8 @@ "cicero": "cicero_2", "data-merge": "data-merge_5", "n2c": "n2c_6", - "nixpkgs": "nixpkgs_69", - "std": "std_5" + "nixpkgs": "nixpkgs_70", + "std": "std_6" }, "locked": { "lastModified": 1670003309, @@ -645,6 +645,21 @@ "type": "github" } }, + "blank_13": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, "blank_2": { "locked": { "lastModified": 1625557891, @@ -1260,11 +1275,11 @@ "cabal-34_16": { "flake": false, "locked": { - "lastModified": 1640353650, - "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=", + "lastModified": 1645834128, + "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", "owner": "haskell", "repo": "cabal", - "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd", + "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", "type": "github" }, "original": { @@ -1498,11 +1513,11 @@ "cabal-36_14": { "flake": false, "locked": { - "lastModified": 1641652457, - "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=", + "lastModified": 1669081697, + "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", "owner": "haskell", "repo": "cabal", - "rev": "f27667f8ec360c475027dcaee0138c937477b070", + "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", "type": "github" }, "original": { @@ -1648,6 +1663,21 @@ "type": "github" } }, + "call-flake": { + "locked": { + "lastModified": 1687380775, + "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", + "owner": "divnix", + "repo": "call-flake", + "rev": "74061f6c241227cd05e79b702db9a300a2e4131a", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "call-flake", + "type": "github" + } + }, "capsules": { "inputs": { "bitte": [ @@ -1682,10 +1712,7 @@ "cardano-node", "nixpkgs" ], - "tullia": [ - "cardano-node", - "tullia" - ] + "tullia": "tullia_2" }, "locked": { "lastModified": 1679408951, @@ -1870,7 +1897,7 @@ }, "cardano-iohk-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_55" + "nixpkgs": "nixpkgs_56" }, "locked": { "lastModified": 1649070135, @@ -1907,7 +1934,7 @@ }, "cardano-mainnet-mirror_2": { "inputs": { - "nixpkgs": "nixpkgs_36" + "nixpkgs": "nixpkgs_39" }, "locked": { "lastModified": 1642701714, @@ -1926,7 +1953,7 @@ }, "cardano-mainnet-mirror_3": { "inputs": { - "nixpkgs": "nixpkgs_56" + "nixpkgs": "nixpkgs_57" }, "locked": { "lastModified": 1642701714, @@ -1945,7 +1972,7 @@ }, "cardano-mainnet-mirror_4": { "inputs": { - "nixpkgs": "nixpkgs_80" + "nixpkgs": "nixpkgs_81" }, "locked": { "lastModified": 1642701714, @@ -1999,7 +2026,7 @@ "customConfig": "customConfig_5", "em": "em", "empty-flake": "empty-flake", - "flake-compat": "flake-compat_9", + "flake-compat": "flake-compat_10", "hackageNix": "hackageNix_2", "haskellNix": "haskellNix_5", "hostNixpkgs": [ @@ -2007,32 +2034,26 @@ "nixpkgs" ], "iohkNix": "iohkNix_5", - "nix2container": "nix2container_2", + "nix2container": "nix2container_3", "nixpkgs": [ "cardano-node", "haskellNix", "nixpkgs-unstable" ], "ops-lib": "ops-lib_2", - "std": [ - "cardano-node", - "tullia", - "std" - ], - "tullia": "tullia_2", + "std": "std_4", "utils": "utils_14" }, "locked": { - "lastModified": 1687190129, - "narHash": "sha256-JCa9+QhZ2RVSIKkhz2WCZqTKCgdUSuezWS2YsQ5vhM4=", + "lastModified": 1689603252, + "narHash": "sha256-C/SAGACRWe8RBqYQcxzZJzBLdjHTG8GKPQYb0LHzig8=", "owner": "input-output-hk", "repo": "cardano-node", - "rev": "6f79e5c3ea109a70cd01910368e011635767305a", + "rev": "6f1dd12cfaff8aafdc5815c6ce9b64f13e5923f7", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "8.1.1", "repo": "cardano-node", "type": "github" } @@ -2484,7 +2505,7 @@ "inclusive": "inclusive_8", "nix": "nix_9", "nix-cache-proxy": "nix-cache-proxy_2", - "nixpkgs": "nixpkgs_66", + "nixpkgs": "nixpkgs_67", "poetry2nix": "poetry2nix_2", "utils": "utils_23" }, @@ -2773,7 +2794,7 @@ "data-merge_5": { "inputs": { "nixlib": "nixlib_5", - "yants": "yants_7" + "yants": "yants_8" }, "locked": { "lastModified": 1659548052, @@ -2818,7 +2839,7 @@ "deploy-rs": { "inputs": { "flake-compat": "flake-compat_14", - "nixpkgs": "nixpkgs_49", + "nixpkgs": "nixpkgs_50", "utils": "utils_15" }, "locked": { @@ -2882,7 +2903,7 @@ "devshell_11": { "inputs": { "flake-utils": "flake-utils_46", - "nixpkgs": "nixpkgs_63" + "nixpkgs": "nixpkgs_64" }, "locked": { "lastModified": 1644227066, @@ -3339,12 +3360,14 @@ "inputs": { "flake-utils": [ "cardano-node", + "cardano-automation", "tullia", "std", "flake-utils" ], "nixpkgs": [ "cardano-node", + "cardano-automation", "tullia", "std", "nixpkgs" @@ -3392,6 +3415,35 @@ } }, "dmerge_10": { + "inputs": { + "nixlib": [ + "explorer-cardano-rosetta", + "tullia", + "std", + "nixpkgs" + ], + "yants": [ + "explorer-cardano-rosetta", + "tullia", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "data-merge", + "type": "github" + } + }, + "dmerge_11": { "inputs": { "nixlib": [ "explorer-ogmios", @@ -3422,7 +3474,7 @@ "type": "github" } }, - "dmerge_11": { + "dmerge_12": { "inputs": { "nixlib": [ "explorer-ogmios", @@ -3451,7 +3503,7 @@ "type": "github" } }, - "dmerge_12": { + "dmerge_13": { "inputs": { "nixlib": [ "std", @@ -3476,7 +3528,7 @@ "type": "github" } }, - "dmerge_13": { + "dmerge_14": { "inputs": { "nixlib": [ "tullia", @@ -3534,12 +3586,14 @@ "inputs": { "nixlib": [ "cardano-node", + "cardano-automation", "tullia", "std", "nixpkgs" ], "yants": [ "cardano-node", + "cardano-automation", "tullia", "std", "yants" @@ -3561,44 +3615,49 @@ }, "dmerge_4": { "inputs": { + "haumea": [ + "cardano-node", + "std", + "haumea" + ], "nixlib": [ - "explorer-cardano-db-sync", - "tullia", + "cardano-node", "std", + "haumea", "nixpkgs" ], "yants": [ - "explorer-cardano-db-sync", - "tullia", + "cardano-node", "std", "yants" ] }, "locked": { - "lastModified": 1659548052, - "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "lastModified": 1686862774, + "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=", "owner": "divnix", - "repo": "data-merge", - "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", + "repo": "dmerge", + "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96", "type": "github" }, "original": { "owner": "divnix", - "repo": "data-merge", + "ref": "0.2.1", + "repo": "dmerge", "type": "github" } }, "dmerge_5": { "inputs": { "nixlib": [ - "explorer-cardano-graphql", - "bitte-cells", + "explorer-cardano-db-sync", + "tullia", "std", "nixpkgs" ], "yants": [ - "explorer-cardano-graphql", - "bitte-cells", + "explorer-cardano-db-sync", + "tullia", "std", "yants" ] @@ -3621,15 +3680,13 @@ "inputs": { "nixlib": [ "explorer-cardano-graphql", - "haskellNix", - "tullia", + "bitte-cells", "std", "nixpkgs" ], "yants": [ "explorer-cardano-graphql", - "haskellNix", - "tullia", + "bitte-cells", "std", "yants" ] @@ -3652,12 +3709,14 @@ "inputs": { "nixlib": [ "explorer-cardano-graphql", + "haskellNix", "tullia", "std", "nixpkgs" ], "yants": [ "explorer-cardano-graphql", + "haskellNix", "tullia", "std", "yants" @@ -3680,13 +3739,13 @@ "dmerge_8": { "inputs": { "nixlib": [ - "explorer-cardano-node", + "explorer-cardano-graphql", "tullia", "std", "nixpkgs" ], "yants": [ - "explorer-cardano-node", + "explorer-cardano-graphql", "tullia", "std", "yants" @@ -3709,13 +3768,13 @@ "dmerge_9": { "inputs": { "nixlib": [ - "explorer-cardano-rosetta", + "explorer-cardano-node", "tullia", "std", "nixpkgs" ], "yants": [ - "explorer-cardano-rosetta", + "explorer-cardano-node", "tullia", "std", "yants" @@ -3897,7 +3956,7 @@ "inputs": { "flake-compat": "flake-compat_12", "flake-utils": "flake-utils_29", - "nixpkgs": "nixpkgs_43", + "nixpkgs": "nixpkgs_44", "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { @@ -3935,7 +3994,7 @@ "inputs": { "flake-compat": "flake-compat_18", "flake-utils": "flake-utils_39", - "nixpkgs": "nixpkgs_57", + "nixpkgs": "nixpkgs_58", "pre-commit-hooks": "pre-commit-hooks_3" }, "locked": { @@ -3981,7 +4040,7 @@ "ema": "ema_3", "flake-parts": "flake-parts", "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_46", + "nixpkgs": "nixpkgs_47", "tailwind-haskell": "tailwind-haskell_2" }, "locked": { @@ -4004,7 +4063,7 @@ "flake-compat": "flake-compat_19", "flake-utils": "flake-utils_41", "heist": "heist_2", - "nixpkgs": "nixpkgs_59", + "nixpkgs": "nixpkgs_60", "tailwind-haskell": "tailwind-haskell_3" }, "locked": { @@ -4353,16 +4412,16 @@ "flake-compat_10": { "flake": false, "locked": { - "lastModified": 1672831974, - "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "lastModified": 1647532380, + "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", "owner": "input-output-hk", "repo": "flake-compat", - "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", + "rev": "7da118186435255a30b5ffeabba9629c344c0bec", "type": "github" }, "original": { "owner": "input-output-hk", - "ref": "hkm/gitlab-fix", + "ref": "fixes", "repo": "flake-compat", "type": "github" } @@ -4370,15 +4429,16 @@ "flake-compat_11": { "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" } @@ -4923,23 +4983,22 @@ "flake-compat_9": { "flake": false, "locked": { - "lastModified": 1647532380, - "narHash": "sha256-wswAxyO8AJTH7d5oU8VK82yBCpqwA+p6kLgpb1f1PAY=", - "owner": "input-output-hk", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "7da118186435255a30b5ffeabba9629c344c0bec", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { - "owner": "input-output-hk", - "ref": "fixes", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } }, "flake-parts": { "inputs": { - "nixpkgs": "nixpkgs_45" + "nixpkgs": "nixpkgs_46" }, "locked": { "lastModified": 1655570068, @@ -5230,27 +5289,26 @@ }, "flake-utils_25": { "locked": { - "lastModified": 1679360468, - "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", - "owner": "hamishmack", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", "repo": "flake-utils", - "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { - "owner": "hamishmack", - "ref": "hkm/nested-hydraJobs", + "owner": "numtide", "repo": "flake-utils", "type": "github" } }, "flake-utils_26": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -5261,26 +5319,27 @@ }, "flake-utils_27": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", + "lastModified": 1679360468, + "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", + "owner": "hamishmack", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", "type": "github" }, "original": { - "owner": "numtide", + "owner": "hamishmack", + "ref": "hkm/nested-hydraJobs", "repo": "flake-utils", "type": "github" } }, "flake-utils_28": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -6044,15 +6103,12 @@ } }, "flake-utils_74": { - "inputs": { - "systems": "systems" - }, "locked": { - "lastModified": 1681378341, - "narHash": "sha256-2qUN04W6X9cHHytEsJTM41CmusifPTC0bgTtYsHSNY8=", + "lastModified": 1679360468, + "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", "owner": "hamishmack", "repo": "flake-utils", - "rev": "2767bafdb189cd623354620c2dacbeca8fd58b17", + "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", "type": "github" }, "original": { @@ -6528,7 +6584,7 @@ }, "gomod2nix_10": { "inputs": { - "nixpkgs": "nixpkgs_102", + "nixpkgs": "nixpkgs_103", "utils": "utils_31" }, "locked": { @@ -6547,7 +6603,7 @@ }, "gomod2nix_2": { "inputs": { - "nixpkgs": "nixpkgs_39", + "nixpkgs": "nixpkgs_36", "utils": "utils_13" }, "locked": { @@ -6566,7 +6622,7 @@ }, "gomod2nix_3": { "inputs": { - "nixpkgs": "nixpkgs_51", + "nixpkgs": "nixpkgs_52", "utils": "utils_16" }, "locked": { @@ -6585,7 +6641,7 @@ }, "gomod2nix_4": { "inputs": { - "nixpkgs": "nixpkgs_73", + "nixpkgs": "nixpkgs_74", "utils": "utils_24" }, "locked": { @@ -6604,7 +6660,7 @@ }, "gomod2nix_5": { "inputs": { - "nixpkgs": "nixpkgs_76", + "nixpkgs": "nixpkgs_77", "utils": "utils_25" }, "locked": { @@ -6623,7 +6679,7 @@ }, "gomod2nix_6": { "inputs": { - "nixpkgs": "nixpkgs_83", + "nixpkgs": "nixpkgs_84", "utils": "utils_26" }, "locked": { @@ -6642,7 +6698,7 @@ }, "gomod2nix_7": { "inputs": { - "nixpkgs": "nixpkgs_87", + "nixpkgs": "nixpkgs_88", "utils": "utils_28" }, "locked": { @@ -6661,7 +6717,7 @@ }, "gomod2nix_8": { "inputs": { - "nixpkgs": "nixpkgs_92", + "nixpkgs": "nixpkgs_93", "utils": "utils_29" }, "locked": { @@ -6680,7 +6736,7 @@ }, "gomod2nix_9": { "inputs": { - "nixpkgs": "nixpkgs_95", + "nixpkgs": "nixpkgs_96", "utils": "utils_30" }, "locked": { @@ -6700,7 +6756,7 @@ "graphql-engine": { "inputs": { "flake-utils": "flake-utils_51", - "nixpkgs": "nixpkgs_71" + "nixpkgs": "nixpkgs_72" }, "locked": { "lastModified": 1671006554, @@ -6848,11 +6904,11 @@ "hackage_14": { "flake": false, "locked": { - "lastModified": 1689208161, - "narHash": "sha256-qh5bnqYDhEhm9V5u6Z3eiYC5Dy9CAVKxQnSC3tHhO4A=", + "lastModified": 1689640360, + "narHash": "sha256-837/6Bfs6UJx2GDSCLmCg3zyhW2tyBf1Ad4plT021WE=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "521fbfc52df1ef8df4af20e75ca92e874a33b6b2", + "rev": "c6a15a90fef46d4de1dbdfd6b20873b239599387", "type": "github" }, "original": { @@ -7106,6 +7162,7 @@ "hackage" ], "hls-1.10": "hls-1.10_4", + "hls-2.0": "hls-2.0", "hpc-coveralls": "hpc-coveralls_16", "hydra": "hydra_8", "iserv-proxy": "iserv-proxy_6", @@ -7118,16 +7175,17 @@ "nixpkgs-2111": "nixpkgs-2111_16", "nixpkgs-2205": "nixpkgs-2205_6", "nixpkgs-2211": "nixpkgs-2211_6", + "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-unstable": "nixpkgs-unstable_15", "old-ghc-nix": "old-ghc-nix_16", "stackage": "stackage_16" }, "locked": { - "lastModified": 1684716683, - "narHash": "sha256-ej7dV4gpauKwaOrvO5MpvudiZLDlG2mEtrir2x52H4I=", + "lastModified": 1689654322, + "narHash": "sha256-Z64cevCrl+p+UaHeAgMX3mfBZoD5Q9oMqvjd+/3u+eQ=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "85c1f98234af7c07907a1ab46756e5fab8e6cc71", + "rev": "75cae0a4372792f6189a63a2ded171206b9e44c8", "type": "github" }, "original": { @@ -7467,8 +7525,8 @@ "cabal-34": "cabal-34_6", "cabal-36": "cabal-36_5", "cardano-shell": "cardano-shell_6", - "flake-compat": "flake-compat_10", - "flake-utils": "flake-utils_25", + "flake-compat": "flake-compat_11", + "flake-utils": "flake-utils_27", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_6", "hackage": [ "cardano-node", @@ -7664,6 +7722,25 @@ "type": "github" } }, + "haumea": { + "inputs": { + "nixpkgs": "nixpkgs_42" + }, + "locked": { + "lastModified": 1685133229, + "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", + "owner": "nix-community", + "repo": "haumea", + "rev": "34dd58385092a23018748b50f9b23de6266dffc2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "v0.2.2", + "repo": "haumea", + "type": "github" + } + }, "heist": { "flake": false, "locked": { @@ -7766,6 +7843,23 @@ "type": "github" } }, + "hls-2.0": { + "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" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -8201,11 +8295,11 @@ ] }, "locked": { - "lastModified": 1646878427, - "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=", + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", "owner": "NixOS", "repo": "hydra", - "rev": "28b682b85b7efc5cf7974065792a1f22203a5927", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", "type": "github" }, "original": { @@ -8239,6 +8333,7 @@ "inputs": { "nixlib": [ "cardano-node", + "cardano-automation", "tullia", "std", "nixpkgs" @@ -8261,9 +8356,9 @@ "incl_3": { "inputs": { "nixlib": [ - "explorer-cardano-db-sync", - "tullia", + "cardano-node", "std", + "haumea", "nixpkgs" ] }, @@ -8284,7 +8379,7 @@ "incl_4": { "inputs": { "nixlib": [ - "explorer-cardano-node", + "explorer-cardano-db-sync", "tullia", "std", "nixpkgs" @@ -8307,8 +8402,7 @@ "incl_5": { "inputs": { "nixlib": [ - "explorer-ogmios", - "haskellNix", + "explorer-cardano-node", "tullia", "std", "nixpkgs" @@ -8331,6 +8425,9 @@ "incl_6": { "inputs": { "nixlib": [ + "explorer-ogmios", + "haskellNix", + "tullia", "std", "nixpkgs" ] @@ -8350,6 +8447,27 @@ } }, "incl_7": { + "inputs": { + "nixlib": [ + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1669263024, + "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", + "owner": "divnix", + "repo": "incl", + "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, + "incl_8": { "inputs": { "nixlib": [ "tullia", @@ -8919,11 +9037,11 @@ "iserv-proxy_6": { "flake": false, "locked": { - "lastModified": 1688517130, - "narHash": "sha256-hUqfxSlo+ffqVdkSZ1EDoB7/ILCL25eYkcCXW9/P3Wc=", + "lastModified": 1670983692, + "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=", "ref": "hkm/remote-iserv", - "rev": "9151db2a9a61d7f5fe52ff8836f18bbd0fd8933c", - "revCount": 13, + "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300", + "revCount": 10, "type": "git", "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" }, @@ -9530,23 +9648,25 @@ "inputs": { "flake-utils": [ "cardano-node", + "cardano-automation", "tullia", "std", "flake-utils" ], "nixpkgs": [ "cardano-node", + "cardano-automation", "tullia", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1665039323, - "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "lastModified": 1677330646, + "narHash": "sha256-hUYCwJneMjnxTvj30Fjow6UMJUITqHlpUGpXMPXUJsU=", "owner": "nlewo", "repo": "nix2container", - "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "rev": "ebca8f58d450cae1a19c07701a5a8ae40afc9efc", "type": "github" }, "original": { @@ -9587,7 +9707,7 @@ "n2c_6": { "inputs": { "flake-utils": "flake-utils_49", - "nixpkgs": "nixpkgs_68" + "nixpkgs": "nixpkgs_69" }, "locked": { "lastModified": 1664348923, @@ -9871,9 +9991,10 @@ }, "nix-nomad_2": { "inputs": { - "flake-compat": "flake-compat_11", + "flake-compat": "flake-compat_9", "flake-utils": [ "cardano-node", + "cardano-automation", "tullia", "nix2container", "flake-utils" @@ -9881,11 +10002,13 @@ "gomod2nix": "gomod2nix_2", "nixpkgs": [ "cardano-node", + "cardano-automation", "tullia", "nixpkgs" ], "nixpkgs-lib": [ "cardano-node", + "cardano-automation", "tullia", "nixpkgs" ] @@ -10337,7 +10460,7 @@ "nix2container_10": { "inputs": { "flake-utils": "flake-utils_69", - "nixpkgs": "nixpkgs_93" + "nixpkgs": "nixpkgs_94" }, "locked": { "lastModified": 1658567952, @@ -10356,7 +10479,7 @@ "nix2container_11": { "inputs": { "flake-utils": "flake-utils_71", - "nixpkgs": "nixpkgs_96" + "nixpkgs": "nixpkgs_97" }, "locked": { "lastModified": 1658567952, @@ -10375,7 +10498,7 @@ "nix2container_12": { "inputs": { "flake-utils": "flake-utils_77", - "nixpkgs": "nixpkgs_103" + "nixpkgs": "nixpkgs_104" }, "locked": { "lastModified": 1658567952, @@ -10393,15 +10516,15 @@ }, "nix2container_2": { "inputs": { - "flake-utils": "flake-utils_26", - "nixpkgs": "nixpkgs_38" + "flake-utils": "flake-utils_25", + "nixpkgs": "nixpkgs_37" }, "locked": { - "lastModified": 1671269339, - "narHash": "sha256-KR2SXh4c2Y+bgbCfXjTGJ74O9/u4CAPFA0KYZHhKf5Q=", + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", "owner": "nlewo", "repo": "nix2container", - "rev": "6800fff45afecc7e47c334d14cf2b2f4f25601a0", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", "type": "github" }, "original": { @@ -10412,15 +10535,15 @@ }, "nix2container_3": { "inputs": { - "flake-utils": "flake-utils_27", - "nixpkgs": "nixpkgs_40" + "flake-utils": "flake-utils_28", + "nixpkgs": "nixpkgs_41" }, "locked": { - "lastModified": 1658567952, - "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "lastModified": 1671269339, + "narHash": "sha256-KR2SXh4c2Y+bgbCfXjTGJ74O9/u4CAPFA0KYZHhKf5Q=", "owner": "nlewo", "repo": "nix2container", - "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "rev": "6800fff45afecc7e47c334d14cf2b2f4f25601a0", "type": "github" }, "original": { @@ -10432,7 +10555,7 @@ "nix2container_4": { "inputs": { "flake-utils": "flake-utils_35", - "nixpkgs": "nixpkgs_52" + "nixpkgs": "nixpkgs_53" }, "locked": { "lastModified": 1658567952, @@ -10451,7 +10574,7 @@ "nix2container_5": { "inputs": { "flake-utils": "flake-utils_53", - "nixpkgs": "nixpkgs_74" + "nixpkgs": "nixpkgs_75" }, "locked": { "lastModified": 1658567952, @@ -10470,7 +10593,7 @@ "nix2container_6": { "inputs": { "flake-utils": "flake-utils_56", - "nixpkgs": "nixpkgs_77" + "nixpkgs": "nixpkgs_78" }, "locked": { "lastModified": 1658567952, @@ -10489,7 +10612,7 @@ "nix2container_7": { "inputs": { "flake-utils": "flake-utils_61", - "nixpkgs": "nixpkgs_82" + "nixpkgs": "nixpkgs_83" }, "locked": { "lastModified": 1671269339, @@ -10508,7 +10631,7 @@ "nix2container_8": { "inputs": { "flake-utils": "flake-utils_62", - "nixpkgs": "nixpkgs_84" + "nixpkgs": "nixpkgs_85" }, "locked": { "lastModified": 1658567952, @@ -10527,7 +10650,7 @@ "nix2container_9": { "inputs": { "flake-utils": "flake-utils_64", - "nixpkgs": "nixpkgs_88" + "nixpkgs": "nixpkgs_89" }, "locked": { "lastModified": 1658567952, @@ -10562,7 +10685,7 @@ "nix_10": { "inputs": { "lowdown-src": "lowdown-src_10", - "nixpkgs": "nixpkgs_72", + "nixpkgs": "nixpkgs_73", "nixpkgs-regression": "nixpkgs-regression_10" }, "locked": { @@ -10583,7 +10706,7 @@ "nix_11": { "inputs": { "lowdown-src": "lowdown-src_11", - "nixpkgs": "nixpkgs_81", + "nixpkgs": "nixpkgs_82", "nixpkgs-regression": "nixpkgs-regression_11" }, "locked": { @@ -10604,7 +10727,7 @@ "nix_12": { "inputs": { "lowdown-src": "lowdown-src_12", - "nixpkgs": "nixpkgs_91", + "nixpkgs": "nixpkgs_92", "nixpkgs-regression": "nixpkgs-regression_12" }, "locked": { @@ -10625,20 +10748,20 @@ "nix_13": { "inputs": { "lowdown-src": "lowdown-src_13", - "nixpkgs": "nixpkgs_99", + "nixpkgs": "nixpkgs_100", "nixpkgs-regression": "nixpkgs-regression_13" }, "locked": { - "lastModified": 1643066034, - "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=", + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", "owner": "NixOS", "repo": "nix", - "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "2.6.0", + "ref": "2.11.0", "repo": "nix", "type": "github" } @@ -10709,7 +10832,7 @@ "nix_5": { "inputs": { "lowdown-src": "lowdown-src_5", - "nixpkgs": "nixpkgs_37", + "nixpkgs": "nixpkgs_40", "nixpkgs-regression": "nixpkgs-regression_5" }, "locked": { @@ -10730,7 +10853,7 @@ "nix_6": { "inputs": { "lowdown-src": "lowdown-src_6", - "nixpkgs": "nixpkgs_48", + "nixpkgs": "nixpkgs_49", "nixpkgs-regression": "nixpkgs-regression_6" }, "locked": { @@ -10751,7 +10874,7 @@ "nix_7": { "inputs": { "lowdown-src": "lowdown-src_7", - "nixpkgs": "nixpkgs_50", + "nixpkgs": "nixpkgs_51", "nixpkgs-regression": "nixpkgs-regression_7" }, "locked": { @@ -10772,7 +10895,7 @@ "nix_8": { "inputs": { "lowdown-src": "lowdown-src_8", - "nixpkgs": "nixpkgs_64", + "nixpkgs": "nixpkgs_65", "nixpkgs-regression": "nixpkgs-regression_8" }, "locked": { @@ -10793,7 +10916,7 @@ "nix_9": { "inputs": { "lowdown-src": "lowdown-src_9", - "nixpkgs": "nixpkgs_65", + "nixpkgs": "nixpkgs_66", "nixpkgs-regression": "nixpkgs-regression_9" }, "locked": { @@ -11039,29 +11162,32 @@ "inputs": { "flake-utils": [ "cardano-node", + "cardano-automation", "tullia", "std", "flake-utils" ], "nixago-exts": [ "cardano-node", + "cardano-automation", "tullia", "std", "blank" ], "nixpkgs": [ "cardano-node", + "cardano-automation", "tullia", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1661824785, - "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "lastModified": 1676075813, + "narHash": "sha256-X/aIT8Qc8UCqnxJvaZykx3CJ0ZnDFvO+dqp/7fglZWo=", "owner": "nix-community", "repo": "nixago", - "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "rev": "9cab4dde31ec2f2c05d702ea8648ce580664e906", "type": "github" }, "original": { @@ -12217,8 +12343,8 @@ }, "nixpkgs-2205_6": { "locked": { - "lastModified": 1663981975, - "narHash": "sha256-TKaxWAVJR+a5JJauKZqibmaM5e/Pi5tBDx9s8fl/kSE=", + "lastModified": 1682600000, + "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", "owner": "NixOS", "repo": "nixpkgs", "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", @@ -12313,11 +12439,11 @@ }, "nixpkgs-2211_6": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1685314633, + "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b", "type": "github" }, "original": { @@ -12327,6 +12453,22 @@ "type": "github" } }, + "nixpkgs-2305": { + "locked": { + "lastModified": 1685338297, + "narHash": "sha256-+Aq4O0Jn1W1q927ZHc3Zn6RO7bwQGmb6O8xYoGy0KrM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6287b47dbfabbb8bfbb9b1b53d198ad58a774de4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-darwin": { "locked": { "lastModified": 1676998680, @@ -12450,9 +12592,10 @@ "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "NixOS", + "repo": "nixpkgs", "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" + "type": "github" } }, "nixpkgs-regression_2": { @@ -12691,11 +12834,11 @@ }, "nixpkgs-unstable_15": { "locked": { - "lastModified": 1663905476, - "narHash": "sha256-0CSwRKaYravh9v6qSlBpM0gNg0UhKT2lL7Yn6Zbx7UM=", + "lastModified": 1685347552, + "narHash": "sha256-9woSppRyUFo26yUffORTzttJ+apOt8MmCv6RxpPNTU4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e14f9fb57315f0d4abde222364f19f88c77d2b79", + "rev": "f2f1ec390714d303cf84ba086e34e45b450dd8c4", "type": "github" }, "original": { @@ -12850,6 +12993,22 @@ } }, "nixpkgs_100": { + "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_101": { "locked": { "lastModified": 1676300157, "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", @@ -12865,7 +13024,7 @@ "type": "github" } }, - "nixpkgs_101": { + "nixpkgs_102": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -12881,7 +13040,7 @@ "type": "github" } }, - "nixpkgs_102": { + "nixpkgs_103": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -12897,7 +13056,7 @@ "type": "github" } }, - "nixpkgs_103": { + "nixpkgs_104": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -12912,7 +13071,7 @@ "type": "github" } }, - "nixpkgs_104": { + "nixpkgs_105": { "locked": { "lastModified": 1653920503, "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", @@ -12928,7 +13087,7 @@ "type": "github" } }, - "nixpkgs_105": { + "nixpkgs_106": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -13363,63 +13522,63 @@ }, "nixpkgs_36": { "locked": { - "lastModified": 1642336556, - "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_37": { "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_38": { "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", - "owner": "NixOS", + "lastModified": 1675940568, + "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_39": { "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "lastModified": 1642336556, + "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs_4": { @@ -13440,42 +13599,57 @@ }, "nixpkgs_40": { "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-22.05-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_41": { "locked": { - "lastModified": 1674407282, - "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", - "owner": "nixos", + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-22.11", + "owner": "NixOS", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_42": { "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "lastModified": 1681001314, + "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs_43": { + "locked": { + "lastModified": 1675940568, + "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", "type": "github" }, "original": { @@ -13485,7 +13659,7 @@ "type": "github" } }, - "nixpkgs_43": { + "nixpkgs_44": { "locked": { "lastModified": 1646470760, "narHash": "sha256-dQISyucVCCPaFioUhy5ZgfBz8rOMKGI8k13aPDFTqEs=", @@ -13501,7 +13675,7 @@ "type": "github" } }, - "nixpkgs_44": { + "nixpkgs_45": { "locked": { "lastModified": 1619531122, "narHash": "sha256-ovm5bo6PkZzNKh2YGXbRKYIjega0EjiEP0YDwyeXEYU=", @@ -13515,7 +13689,7 @@ "type": "indirect" } }, - "nixpkgs_45": { + "nixpkgs_46": { "locked": { "lastModified": 1656461576, "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=", @@ -13531,7 +13705,7 @@ "type": "github" } }, - "nixpkgs_46": { + "nixpkgs_47": { "locked": { "lastModified": 1655567057, "narHash": "sha256-Cc5hQSMsTzOHmZnYm8OSJ5RNUp22bd5NADWLHorULWQ=", @@ -13545,7 +13719,7 @@ "type": "indirect" } }, - "nixpkgs_47": { + "nixpkgs_48": { "locked": { "lastModified": 1656401090, "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=", @@ -13559,7 +13733,7 @@ "type": "indirect" } }, - "nixpkgs_48": { + "nixpkgs_49": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -13574,39 +13748,39 @@ "type": "indirect" } }, - "nixpkgs_49": { + "nixpkgs_5": { "locked": { - "lastModified": 1671417167, - "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", - "owner": "NixOS", + "lastModified": 1673796341, + "narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7", + "rev": "6dccdc458512abce8d19f74195bb20fdb067df50", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_50": { "locked": { - "lastModified": 1673796341, - "narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=", - "owner": "nixos", + "lastModified": 1671417167, + "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "6dccdc458512abce8d19f74195bb20fdb067df50", + "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_50": { + "nixpkgs_51": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -13622,7 +13796,7 @@ "type": "github" } }, - "nixpkgs_51": { + "nixpkgs_52": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -13638,7 +13812,7 @@ "type": "github" } }, - "nixpkgs_52": { + "nixpkgs_53": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -13653,7 +13827,7 @@ "type": "github" } }, - "nixpkgs_53": { + "nixpkgs_54": { "locked": { "lastModified": 1674407282, "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", @@ -13669,7 +13843,7 @@ "type": "github" } }, - "nixpkgs_54": { + "nixpkgs_55": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -13685,7 +13859,7 @@ "type": "github" } }, - "nixpkgs_55": { + "nixpkgs_56": { "locked": { "lastModified": 1648219316, "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", @@ -13699,7 +13873,7 @@ "type": "indirect" } }, - "nixpkgs_56": { + "nixpkgs_57": { "locked": { "lastModified": 1642336556, "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", @@ -13713,7 +13887,7 @@ "type": "indirect" } }, - "nixpkgs_57": { + "nixpkgs_58": { "locked": { "lastModified": 1641521701, "narHash": "sha256-IuW+4EqqKjNdJ4yO0Qr8k63OkyV1TaF5vsrZzU3GCfI=", @@ -13729,7 +13903,7 @@ "type": "github" } }, - "nixpkgs_58": { + "nixpkgs_59": { "locked": { "lastModified": 1619531122, "narHash": "sha256-ovm5bo6PkZzNKh2YGXbRKYIjega0EjiEP0YDwyeXEYU=", @@ -13743,38 +13917,38 @@ "type": "indirect" } }, - "nixpkgs_59": { + "nixpkgs_6": { "locked": { - "lastModified": 1641521701, - "narHash": "sha256-IuW+4EqqKjNdJ4yO0Qr8k63OkyV1TaF5vsrZzU3GCfI=", + "lastModified": 1642451377, + "narHash": "sha256-hvAuYDUN8XIrcQKE6wDw4LjTCcwrTp2B1i1i/5vfDMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d77bbfcbb650d9c219ca3286e1efb707b922d7c2", + "rev": "e5b47c5c21336e3fdd887d24c7e34363fa09c6d7", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "d77bbfcbb650d9c219ca3286e1efb707b922d7c2", "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_60": { "locked": { - "lastModified": 1642451377, - "narHash": "sha256-hvAuYDUN8XIrcQKE6wDw4LjTCcwrTp2B1i1i/5vfDMQ=", + "lastModified": 1641521701, + "narHash": "sha256-IuW+4EqqKjNdJ4yO0Qr8k63OkyV1TaF5vsrZzU3GCfI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e5b47c5c21336e3fdd887d24c7e34363fa09c6d7", + "rev": "d77bbfcbb650d9c219ca3286e1efb707b922d7c2", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", + "rev": "d77bbfcbb650d9c219ca3286e1efb707b922d7c2", "type": "github" } }, - "nixpkgs_60": { + "nixpkgs_61": { "locked": { "lastModified": 1641577433, "narHash": "sha256-T7lS8vpbC3dgtrkb2ueC9HWaX4RYUwdP7IEttnvKQ8Y=", @@ -13790,7 +13964,7 @@ "type": "github" } }, - "nixpkgs_61": { + "nixpkgs_62": { "locked": { "lastModified": 1641521701, "narHash": "sha256-IuW+4EqqKjNdJ4yO0Qr8k63OkyV1TaF5vsrZzU3GCfI=", @@ -13804,7 +13978,7 @@ "type": "indirect" } }, - "nixpkgs_62": { + "nixpkgs_63": { "locked": { "lastModified": 1646331602, "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", @@ -13820,7 +13994,7 @@ "type": "github" } }, - "nixpkgs_63": { + "nixpkgs_64": { "locked": { "lastModified": 1643381941, "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", @@ -13836,7 +14010,7 @@ "type": "github" } }, - "nixpkgs_64": { + "nixpkgs_65": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -13851,7 +14025,7 @@ "type": "indirect" } }, - "nixpkgs_65": { + "nixpkgs_66": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -13866,7 +14040,7 @@ "type": "indirect" } }, - "nixpkgs_66": { + "nixpkgs_67": { "locked": { "lastModified": 1644486793, "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", @@ -13882,7 +14056,7 @@ "type": "github" } }, - "nixpkgs_67": { + "nixpkgs_68": { "locked": { "lastModified": 1660438583, "narHash": "sha256-rJUTYxFKlWUJI3njAwEc1pKAVooAViZGJvsgqfh/q/E=", @@ -13897,7 +14071,7 @@ "type": "github" } }, - "nixpkgs_68": { + "nixpkgs_69": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -13912,39 +14086,39 @@ "type": "github" } }, - "nixpkgs_69": { + "nixpkgs_7": { "locked": { - "lastModified": 1664328665, - "narHash": "sha256-MVUhaUYwzrmzD/RzTBEGIpYBmncP3JNvZMjGyXtuX/w=", + "lastModified": 1674091526, + "narHash": "sha256-eLhLKOpF1ix5xZeFF9g8uE1stdyxuBLJvWQ20gLbDto=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c97cb06a5b8f1a266fea43b7335de562ea16d3b", + "rev": "fc5b90fd72177d9bcf435b10c12bb943549748c6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11-small", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_70": { "locked": { - "lastModified": 1674091526, - "narHash": "sha256-eLhLKOpF1ix5xZeFF9g8uE1stdyxuBLJvWQ20gLbDto=", + "lastModified": 1664328665, + "narHash": "sha256-MVUhaUYwzrmzD/RzTBEGIpYBmncP3JNvZMjGyXtuX/w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc5b90fd72177d9bcf435b10c12bb943549748c6", + "rev": "0c97cb06a5b8f1a266fea43b7335de562ea16d3b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11-small", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_70": { + "nixpkgs_71": { "locked": { "lastModified": 1658311025, "narHash": "sha256-GqagY5YmaZB3YaO41kKcQhe5RcpS83wnsW8iCu5Znqo=", @@ -13960,7 +14134,7 @@ "type": "github" } }, - "nixpkgs_71": { + "nixpkgs_72": { "locked": { "lastModified": 1668504765, "narHash": "sha256-53JeBXa/p1L3FCN8SftDViceKuhw9UaOWXJgG0QQ6PY=", @@ -13975,7 +14149,7 @@ "type": "github" } }, - "nixpkgs_72": { + "nixpkgs_73": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -13990,7 +14164,7 @@ "type": "indirect" } }, - "nixpkgs_73": { + "nixpkgs_74": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -14006,7 +14180,7 @@ "type": "github" } }, - "nixpkgs_74": { + "nixpkgs_75": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -14021,7 +14195,7 @@ "type": "github" } }, - "nixpkgs_75": { + "nixpkgs_76": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -14037,7 +14211,7 @@ "type": "github" } }, - "nixpkgs_76": { + "nixpkgs_77": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -14053,7 +14227,7 @@ "type": "github" } }, - "nixpkgs_77": { + "nixpkgs_78": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -14068,7 +14242,7 @@ "type": "github" } }, - "nixpkgs_78": { + "nixpkgs_79": { "locked": { "lastModified": 1653920503, "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", @@ -14084,39 +14258,39 @@ "type": "github" } }, - "nixpkgs_79": { + "nixpkgs_8": { "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "lastModified": 1671313200, + "narHash": "sha256-itZTrtHeDJjV696+ur0/TzkTqb5y3Eb57WRLRPK3rwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "rev": "0938d73bb143f4ae037143572f11f4338c7b2d1c", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_80": { "locked": { - "lastModified": 1671313200, - "narHash": "sha256-itZTrtHeDJjV696+ur0/TzkTqb5y3Eb57WRLRPK3rwA=", + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0938d73bb143f4ae037143572f11f4338c7b2d1c", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.11", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_80": { + "nixpkgs_81": { "locked": { "lastModified": 1642336556, "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", @@ -14130,7 +14304,7 @@ "type": "indirect" } }, - "nixpkgs_81": { + "nixpkgs_82": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -14146,7 +14320,7 @@ "type": "github" } }, - "nixpkgs_82": { + "nixpkgs_83": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -14161,7 +14335,7 @@ "type": "github" } }, - "nixpkgs_83": { + "nixpkgs_84": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -14177,7 +14351,7 @@ "type": "github" } }, - "nixpkgs_84": { + "nixpkgs_85": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -14192,7 +14366,7 @@ "type": "github" } }, - "nixpkgs_85": { + "nixpkgs_86": { "locked": { "lastModified": 1674407282, "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", @@ -14208,7 +14382,7 @@ "type": "github" } }, - "nixpkgs_86": { + "nixpkgs_87": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -14224,7 +14398,7 @@ "type": "github" } }, - "nixpkgs_87": { + "nixpkgs_88": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -14240,7 +14414,7 @@ "type": "github" } }, - "nixpkgs_88": { + "nixpkgs_89": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -14255,39 +14429,39 @@ "type": "github" } }, - "nixpkgs_89": { + "nixpkgs_9": { "locked": { - "lastModified": 1653920503, - "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", + "lastModified": 1647350163, + "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", + "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.05", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_90": { "locked": { - "lastModified": 1647350163, - "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", + "lastModified": 1653920503, + "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", + "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_90": { + "nixpkgs_91": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -14303,7 +14477,7 @@ "type": "github" } }, - "nixpkgs_91": { + "nixpkgs_92": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -14319,7 +14493,7 @@ "type": "github" } }, - "nixpkgs_92": { + "nixpkgs_93": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -14335,7 +14509,7 @@ "type": "github" } }, - "nixpkgs_93": { + "nixpkgs_94": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -14350,7 +14524,7 @@ "type": "github" } }, - "nixpkgs_94": { + "nixpkgs_95": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -14366,7 +14540,7 @@ "type": "github" } }, - "nixpkgs_95": { + "nixpkgs_96": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -14382,7 +14556,7 @@ "type": "github" } }, - "nixpkgs_96": { + "nixpkgs_97": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -14397,7 +14571,7 @@ "type": "github" } }, - "nixpkgs_97": { + "nixpkgs_98": { "locked": { "lastModified": 1653920503, "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", @@ -14413,7 +14587,7 @@ "type": "github" } }, - "nixpkgs_98": { + "nixpkgs_99": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -14429,21 +14603,6 @@ "type": "github" } }, - "nixpkgs_99": { - "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" - } - }, "nomad-follower": { "inputs": { "devshell": "devshell", @@ -14482,11 +14641,11 @@ }, "nosys_2": { "locked": { - "lastModified": 1667881534, - "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", + "lastModified": 1668010795, + "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", "owner": "divnix", "repo": "nosys", - "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", + "rev": "feade0141487801c71ff55623b421ed535dbdefa", "type": "github" }, "original": { @@ -14497,11 +14656,11 @@ }, "nosys_3": { "locked": { - "lastModified": 1667881534, - "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", + "lastModified": 1668010795, + "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", "owner": "divnix", "repo": "nosys", - "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", + "rev": "feade0141487801c71ff55623b421ed535dbdefa", "type": "github" }, "original": { @@ -14570,6 +14729,21 @@ "type": "github" } }, + "nosys_8": { + "locked": { + "lastModified": 1667881534, + "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", + "owner": "divnix", + "repo": "nosys", + "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "nosys", + "type": "github" + } + }, "odbc": { "flake": false, "locked": { @@ -14915,7 +15089,7 @@ "flake-compat": "flake-compat_36", "flake-parts": "flake-parts_2", "napalm": "napalm", - "nixpkgs": "nixpkgs_100", + "nixpkgs": "nixpkgs_101", "nixpkgs-darwin": "nixpkgs-darwin", "zitiConsole": "zitiConsole" }, @@ -15120,6 +15294,114 @@ "type": "github" } }, + "paisano-tui_2": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "cardano-automation", + "tullia", + "std", + "blank" + ], + "std": [ + "cardano-node", + "cardano-automation", + "tullia", + "std" + ] + }, + "locked": { + "lastModified": 1677533603, + "narHash": "sha256-Nq1dH/qn7Wg/Tj1+id+ZM3o0fzqonW73jAgY3mCp35M=", + "owner": "paisano-nix", + "repo": "tui", + "rev": "802958d123b0a5437441be0cab1dee487b0ed3eb", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "repo": "tui", + "type": "github" + } + }, + "paisano-tui_3": { + "flake": false, + "locked": { + "lastModified": 1681847764, + "narHash": "sha256-mdd7PJW1BZvxy0cIKsPfAO+ohVl/V7heE5ZTAHzTdv8=", + "owner": "paisano-nix", + "repo": "tui", + "rev": "3096bad91cae73ab8ab3367d31f8a143d248a244", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "ref": "0.1.1", + "repo": "tui", + "type": "github" + } + }, + "paisano_2": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "cardano-automation", + "tullia", + "std", + "nixpkgs" + ], + "nosys": "nosys_2", + "yants": [ + "cardano-node", + "cardano-automation", + "tullia", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1677437285, + "narHash": "sha256-YGfMothgUq1T9wMJYEhOSvdIiD/8gLXO1YcZA6hyIWU=", + "owner": "paisano-nix", + "repo": "core", + "rev": "5f2fc05e98e001cb1cf9535ded09e05d90cec131", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "repo": "core", + "type": "github" + } + }, + "paisano_3": { + "inputs": { + "call-flake": "call-flake", + "nixpkgs": [ + "cardano-node", + "std", + "nixpkgs" + ], + "nosys": "nosys_3", + "yants": [ + "cardano-node", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1688099125, + "narHash": "sha256-j6LMz00orEKZrQb14wRRw7kMLm+aj7zBJt05AY4UcRI=", + "owner": "paisano-nix", + "repo": "core", + "rev": "10270dc46532c947de473ee88c8f5a3346a396fb", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "repo": "core", + "type": "github" + } + }, "poetry2nix": { "inputs": { "flake-utils": "flake-utils_19", @@ -15208,7 +15490,7 @@ "pre-commit-hooks_2": { "inputs": { "flake-utils": "flake-utils_30", - "nixpkgs": "nixpkgs_44" + "nixpkgs": "nixpkgs_45" }, "locked": { "lastModified": 1639823344, @@ -15227,7 +15509,7 @@ "pre-commit-hooks_3": { "inputs": { "flake-utils": "flake-utils_40", - "nixpkgs": "nixpkgs_58" + "nixpkgs": "nixpkgs_59" }, "locked": { "lastModified": 1639823344, @@ -15329,7 +15611,7 @@ "offchain-metadata-tools": "offchain-metadata-tools", "ogmios": "ogmios_2", "openziti": "openziti", - "std": "std_12", + "std": "std_13", "tullia": "tullia_10" } }, @@ -15754,11 +16036,11 @@ "stackage_16": { "flake": false, "locked": { - "lastModified": 1666835972, - "narHash": "sha256-r8XkSWgK22E0lWJNyorokyrISjHfIaL3i/4e301zgZ4=", + "lastModified": 1689639109, + "narHash": "sha256-Jy7nQuxmKsWuxQp7ztCZz3zeVFjVnySLU8zcj/OlPvI=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "d49dbfcf6ebdfa8461da57c3f8e8dda3226d7297", + "rev": "c2eec3ceb5fbe77fb6fa008460b9f64622a08ddf", "type": "github" }, "original": { @@ -15940,6 +16222,44 @@ } }, "std_10": { + "inputs": { + "blank": "blank_9", + "devshell": "devshell_19", + "dmerge": "dmerge_10", + "flake-utils": "flake-utils_65", + "makes": [ + "explorer-cardano-rosetta", + "tullia", + "std", + "blank" + ], + "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_5", + "microvm": [ + "explorer-cardano-rosetta", + "tullia", + "std", + "blank" + ], + "n2c": "n2c_10", + "nixago": "nixago_9", + "nixpkgs": "nixpkgs_91", + "yants": "yants_13" + }, + "locked": { + "lastModified": 1665513321, + "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", + "owner": "divnix", + "repo": "std", + "rev": "94a90eedb9cfc115b12ae8f6622d9904788559e4", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "std_11": { "inputs": { "arion": [ "explorer-ogmios", @@ -15948,11 +16268,11 @@ "std", "blank" ], - "blank": "blank_9", + "blank": "blank_10", "devshell": "devshell_20", - "dmerge": "dmerge_10", + "dmerge": "dmerge_11", "flake-utils": "flake-utils_70", - "incl": "incl_5", + "incl": "incl_6", "makes": [ "explorer-ogmios", "haskellNix", @@ -15969,9 +16289,9 @@ ], "n2c": "n2c_11", "nixago": "nixago_10", - "nixpkgs": "nixpkgs_94", - "nosys": "nosys_5", - "yants": "yants_13" + "nixpkgs": "nixpkgs_95", + "nosys": "nosys_6", + "yants": "yants_14" }, "locked": { "lastModified": 1674526466, @@ -15987,11 +16307,11 @@ "type": "github" } }, - "std_11": { + "std_12": { "inputs": { - "blank": "blank_10", + "blank": "blank_11", "devshell": "devshell_21", - "dmerge": "dmerge_11", + "dmerge": "dmerge_12", "flake-utils": "flake-utils_72", "makes": [ "explorer-ogmios", @@ -16008,8 +16328,8 @@ ], "n2c": "n2c_12", "nixago": "nixago_11", - "nixpkgs": "nixpkgs_98", - "yants": "yants_14" + "nixpkgs": "nixpkgs_99", + "yants": "yants_15" }, "locked": { "lastModified": 1665513321, @@ -16025,17 +16345,17 @@ "type": "github" } }, - "std_12": { + "std_13": { "inputs": { "arion": [ "std", "blank" ], - "blank": "blank_11", + "blank": "blank_12", "devshell": "devshell_22", - "dmerge": "dmerge_12", + "dmerge": "dmerge_13", "flake-utils": "flake-utils_76", - "incl": "incl_6", + "incl": "incl_7", "makes": [ "std", "blank" @@ -16046,9 +16366,9 @@ ], "n2c": "n2c_13", "nixago": "nixago_12", - "nixpkgs": "nixpkgs_101", - "nosys": "nosys_6", - "yants": "yants_15" + "nixpkgs": "nixpkgs_102", + "nosys": "nosys_7", + "yants": "yants_16" }, "locked": { "lastModified": 1674068571, @@ -16064,18 +16384,18 @@ "type": "github" } }, - "std_13": { + "std_14": { "inputs": { "arion": [ "tullia", "std", "blank" ], - "blank": "blank_12", + "blank": "blank_13", "devshell": "devshell_23", - "dmerge": "dmerge_13", + "dmerge": "dmerge_14", "flake-utils": "flake-utils_78", - "incl": "incl_7", + "incl": "incl_8", "makes": [ "tullia", "std", @@ -16086,11 +16406,11 @@ "std", "blank" ], - "n2c": "n2c_14", - "nixago": "nixago_13", - "nixpkgs": "nixpkgs_105", - "nosys": "nosys_7", - "yants": "yants_16" + "n2c": "n2c_14", + "nixago": "nixago_13", + "nixpkgs": "nixpkgs_106", + "nosys": "nosys_8", + "yants": "yants_17" }, "locked": { "lastModified": 1673226500, @@ -16134,6 +16454,7 @@ "inputs": { "arion": [ "cardano-node", + "cardano-automation", "tullia", "std", "blank" @@ -16141,32 +16462,35 @@ "blank": "blank_3", "devshell": "devshell_9", "dmerge": "dmerge_3", - "flake-utils": "flake-utils_28", + "flake-utils": "flake-utils_26", "incl": "incl_2", "makes": [ "cardano-node", + "cardano-automation", "tullia", "std", "blank" ], "microvm": [ "cardano-node", + "cardano-automation", "tullia", "std", "blank" ], "n2c": "n2c_4", "nixago": "nixago_3", - "nixpkgs": "nixpkgs_42", - "nosys": "nosys_2", + "nixpkgs": "nixpkgs_38", + "paisano": "paisano_2", + "paisano-tui": "paisano-tui_2", "yants": "yants_5" }, "locked": { - "lastModified": 1674526466, - "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=", + "lastModified": 1677533652, + "narHash": "sha256-H37dcuWAGZs6Yl9mewMNVcmSaUXR90/bABYFLT/nwhk=", "owner": "divnix", "repo": "std", - "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826", + "rev": "490542f624412662e0411d8cb5a9af988ef56633", "type": "github" }, "original": { @@ -16176,6 +16500,66 @@ } }, "std_4": { + "inputs": { + "arion": [ + "cardano-node", + "std", + "blank" + ], + "blank": "blank_4", + "devshell": [ + "cardano-node", + "std", + "blank" + ], + "dmerge": "dmerge_4", + "haumea": "haumea", + "incl": "incl_3", + "makes": [ + "cardano-node", + "std", + "blank" + ], + "microvm": [ + "cardano-node", + "std", + "blank" + ], + "n2c": [ + "cardano-node", + "std", + "blank" + ], + "nixago": [ + "cardano-node", + "std", + "blank" + ], + "nixpkgs": "nixpkgs_43", + "paisano": "paisano_3", + "paisano-tui": "paisano-tui_3", + "terranix": [ + "cardano-node", + "std", + "blank" + ], + "yants": "yants_6" + }, + "locked": { + "lastModified": 1689337213, + "narHash": "sha256-qa0B38ihDW1MuAshwgvlbkk3CgheWlvYr35oMpDrxJs=", + "owner": "divnix", + "repo": "std", + "rev": "17dc4eb9587517397dad00617b020769fece3cfe", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "std_5": { "inputs": { "arion": [ "explorer-cardano-db-sync", @@ -16183,11 +16567,11 @@ "std", "blank" ], - "blank": "blank_4", + "blank": "blank_5", "devshell": "devshell_10", - "dmerge": "dmerge_4", + "dmerge": "dmerge_5", "flake-utils": "flake-utils_36", - "incl": "incl_3", + "incl": "incl_4", "makes": [ "explorer-cardano-db-sync", "tullia", @@ -16202,9 +16586,9 @@ ], "n2c": "n2c_5", "nixago": "nixago_4", - "nixpkgs": "nixpkgs_54", - "nosys": "nosys_3", - "yants": "yants_6" + "nixpkgs": "nixpkgs_55", + "nosys": "nosys_4", + "yants": "yants_7" }, "locked": { "lastModified": 1674526466, @@ -16220,15 +16604,15 @@ "type": "github" } }, - "std_5": { + "std_6": { "inputs": { "devshell": "devshell_15", - "dmerge": "dmerge_5", + "dmerge": "dmerge_6", "flake-utils": "flake-utils_50", "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_2", "nixago": "nixago_5", - "nixpkgs": "nixpkgs_70", - "yants": "yants_8" + "nixpkgs": "nixpkgs_71", + "yants": "yants_9" }, "locked": { "lastModified": 1664063803, @@ -16244,11 +16628,11 @@ "type": "github" } }, - "std_6": { + "std_7": { "inputs": { - "blank": "blank_5", + "blank": "blank_6", "devshell": "devshell_16", - "dmerge": "dmerge_6", + "dmerge": "dmerge_7", "flake-utils": "flake-utils_54", "makes": [ "explorer-cardano-graphql", @@ -16267,8 +16651,8 @@ ], "n2c": "n2c_7", "nixago": "nixago_6", - "nixpkgs": "nixpkgs_75", - "yants": "yants_9" + "nixpkgs": "nixpkgs_76", + "yants": "yants_10" }, "locked": { "lastModified": 1665513321, @@ -16284,11 +16668,11 @@ "type": "github" } }, - "std_7": { + "std_8": { "inputs": { - "blank": "blank_6", + "blank": "blank_7", "devshell": "devshell_17", - "dmerge": "dmerge_7", + "dmerge": "dmerge_8", "flake-utils": "flake-utils_57", "makes": [ "explorer-cardano-graphql", @@ -16305,8 +16689,8 @@ ], "n2c": "n2c_8", "nixago": "nixago_7", - "nixpkgs": "nixpkgs_79", - "yants": "yants_10" + "nixpkgs": "nixpkgs_80", + "yants": "yants_11" }, "locked": { "lastModified": 1665513321, @@ -16322,7 +16706,7 @@ "type": "github" } }, - "std_8": { + "std_9": { "inputs": { "arion": [ "explorer-cardano-node", @@ -16330,11 +16714,11 @@ "std", "blank" ], - "blank": "blank_7", + "blank": "blank_8", "devshell": "devshell_18", - "dmerge": "dmerge_8", + "dmerge": "dmerge_9", "flake-utils": "flake-utils_63", - "incl": "incl_4", + "incl": "incl_5", "makes": [ "explorer-cardano-node", "tullia", @@ -16349,9 +16733,9 @@ ], "n2c": "n2c_9", "nixago": "nixago_8", - "nixpkgs": "nixpkgs_86", - "nosys": "nosys_4", - "yants": "yants_11" + "nixpkgs": "nixpkgs_87", + "nosys": "nosys_5", + "yants": "yants_12" }, "locked": { "lastModified": 1674526466, @@ -16367,44 +16751,6 @@ "type": "github" } }, - "std_9": { - "inputs": { - "blank": "blank_8", - "devshell": "devshell_19", - "dmerge": "dmerge_9", - "flake-utils": "flake-utils_65", - "makes": [ - "explorer-cardano-rosetta", - "tullia", - "std", - "blank" - ], - "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_5", - "microvm": [ - "explorer-cardano-rosetta", - "tullia", - "std", - "blank" - ], - "n2c": "n2c_10", - "nixago": "nixago_9", - "nixpkgs": "nixpkgs_90", - "yants": "yants_12" - }, - "locked": { - "lastModified": 1665513321, - "narHash": "sha256-D6Pacw9yf/HMs84KYuCxHXnNDL7v43gtcka5URagFqE=", - "owner": "divnix", - "repo": "std", - "rev": "94a90eedb9cfc115b12ae8f6622d9904788559e4", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" - } - }, "stdlib": { "locked": { "lastModified": 1590026685, @@ -16540,21 +16886,6 @@ "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tailwind-haskell": { "inputs": { "flake-compat": "flake-compat_6", @@ -16580,7 +16911,7 @@ "tailwind-haskell_2": { "inputs": { "flake-utils": "flake-utils_31", - "nixpkgs": "nixpkgs_47" + "nixpkgs": "nixpkgs_48" }, "locked": { "lastModified": 1654211622, @@ -16601,7 +16932,7 @@ "inputs": { "flake-compat": "flake-compat_20", "flake-utils": "flake-utils_42", - "nixpkgs": "nixpkgs_60", + "nixpkgs": "nixpkgs_61", "tailwind-nix": "tailwind-nix_2" }, "locked": { @@ -16643,7 +16974,7 @@ "inputs": { "flake-compat": "flake-compat_21", "flake-utils": "flake-utils_43", - "nixpkgs": "nixpkgs_61" + "nixpkgs": "nixpkgs_62" }, "locked": { "lastModified": 1641667991, @@ -16744,8 +17075,8 @@ "inputs": { "nix-nomad": "nix-nomad_10", "nix2container": "nix2container_12", - "nixpkgs": "nixpkgs_104", - "std": "std_13" + "nixpkgs": "nixpkgs_105", + "std": "std_14" }, "locked": { "lastModified": 1673967538, @@ -16764,16 +17095,20 @@ "tullia_2": { "inputs": { "nix-nomad": "nix-nomad_2", - "nix2container": "nix2container_3", - "nixpkgs": "nixpkgs_41", + "nix2container": "nix2container_2", + "nixpkgs": [ + "cardano-node", + "cardano-automation", + "nixpkgs" + ], "std": "std_3" }, "locked": { - "lastModified": 1675695930, - "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=", + "lastModified": 1684859161, + "narHash": "sha256-wOKutImA7CRL0rN+Ng80E72fD5FkVub7LLP2k9NICpg=", "owner": "input-output-hk", "repo": "tullia", - "rev": "621365f2c725608f381b3ad5b57afef389fd4c31", + "rev": "2964cff1a16eefe301bdddb508c49d94d04603d6", "type": "github" }, "original": { @@ -16786,8 +17121,8 @@ "inputs": { "nix-nomad": "nix-nomad_3", "nix2container": "nix2container_4", - "nixpkgs": "nixpkgs_53", - "std": "std_4" + "nixpkgs": "nixpkgs_54", + "std": "std_5" }, "locked": { "lastModified": 1675182051, @@ -16812,7 +17147,7 @@ "haskellNix", "nixpkgs" ], - "std": "std_6" + "std": "std_7" }, "locked": { "lastModified": 1668711738, @@ -16832,8 +17167,8 @@ "inputs": { "nix-nomad": "nix-nomad_5", "nix2container": "nix2container_6", - "nixpkgs": "nixpkgs_78", - "std": "std_7" + "nixpkgs": "nixpkgs_79", + "std": "std_8" }, "locked": { "lastModified": 1668711738, @@ -16853,8 +17188,8 @@ "inputs": { "nix-nomad": "nix-nomad_6", "nix2container": "nix2container_8", - "nixpkgs": "nixpkgs_85", - "std": "std_8" + "nixpkgs": "nixpkgs_86", + "std": "std_9" }, "locked": { "lastModified": 1675695930, @@ -16874,8 +17209,8 @@ "inputs": { "nix-nomad": "nix-nomad_7", "nix2container": "nix2container_9", - "nixpkgs": "nixpkgs_89", - "std": "std_9" + "nixpkgs": "nixpkgs_90", + "std": "std_10" }, "locked": { "lastModified": 1668711738, @@ -16900,7 +17235,7 @@ "haskellNix", "nixpkgs" ], - "std": "std_10" + "std": "std_11" }, "locked": { "lastModified": 1675695930, @@ -16920,8 +17255,8 @@ "inputs": { "nix-nomad": "nix-nomad_9", "nix2container": "nix2container_11", - "nixpkgs": "nixpkgs_97", - "std": "std_11" + "nixpkgs": "nixpkgs_98", + "std": "std_12" }, "locked": { "lastModified": 1665760843, @@ -17424,6 +17759,7 @@ "inputs": { "nixpkgs": [ "explorer-cardano-graphql", + "haskellNix", "tullia", "std", "nixpkgs" @@ -17444,6 +17780,29 @@ } }, "yants_11": { + "inputs": { + "nixpkgs": [ + "explorer-cardano-graphql", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660507851, + "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", + "owner": "divnix", + "repo": "yants", + "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } + }, + "yants_12": { "inputs": { "nixpkgs": [ "explorer-cardano-node", @@ -17466,7 +17825,7 @@ "type": "github" } }, - "yants_12": { + "yants_13": { "inputs": { "nixpkgs": [ "explorer-cardano-rosetta", @@ -17489,7 +17848,7 @@ "type": "github" } }, - "yants_13": { + "yants_14": { "inputs": { "nixpkgs": [ "explorer-ogmios", @@ -17513,7 +17872,7 @@ "type": "github" } }, - "yants_14": { + "yants_15": { "inputs": { "nixpkgs": [ "explorer-ogmios", @@ -17536,7 +17895,7 @@ "type": "github" } }, - "yants_15": { + "yants_16": { "inputs": { "nixpkgs": [ "std", @@ -17557,7 +17916,7 @@ "type": "github" } }, - "yants_16": { + "yants_17": { "inputs": { "nixpkgs": [ "tullia", @@ -17645,6 +18004,7 @@ "inputs": { "nixpkgs": [ "cardano-node", + "cardano-automation", "tullia", "std", "nixpkgs" @@ -17667,18 +18027,18 @@ "yants_6": { "inputs": { "nixpkgs": [ - "explorer-cardano-db-sync", - "tullia", + "cardano-node", "std", + "haumea", "nixpkgs" ] }, "locked": { - "lastModified": 1667096281, - "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", + "lastModified": 1686863218, + "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=", "owner": "divnix", "repo": "yants", - "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", + "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d", "type": "github" }, "original": { @@ -17689,14 +18049,19 @@ }, "yants_7": { "inputs": { - "nixpkgs": "nixpkgs_67" + "nixpkgs": [ + "explorer-cardano-db-sync", + "tullia", + "std", + "nixpkgs" + ] }, "locked": { - "lastModified": 1660507851, - "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", + "lastModified": 1667096281, + "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", "owner": "divnix", "repo": "yants", - "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", + "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", "type": "github" }, "original": { @@ -17707,19 +18072,14 @@ }, "yants_8": { "inputs": { - "nixpkgs": [ - "explorer-cardano-graphql", - "bitte-cells", - "std", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_68" }, "locked": { - "lastModified": 1645126146, - "narHash": "sha256-XQ1eg4gzXoc7Tl8iXak1uCt3KnsTyxqPtLE+vOoDnrQ=", + "lastModified": 1660507851, + "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", "owner": "divnix", "repo": "yants", - "rev": "77df2be1b3cce9f571c6cf451f786b266a6869cc", + "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", "type": "github" }, "original": { @@ -17732,18 +18092,17 @@ "inputs": { "nixpkgs": [ "explorer-cardano-graphql", - "haskellNix", - "tullia", + "bitte-cells", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1660507851, - "narHash": "sha256-BKjq7JnVuUR/xDtcv6Vm9GYGKAblisXrAgybor9hT/s=", + "lastModified": 1645126146, + "narHash": "sha256-XQ1eg4gzXoc7Tl8iXak1uCt3KnsTyxqPtLE+vOoDnrQ=", "owner": "divnix", "repo": "yants", - "rev": "0b895ca02a8fa72bad50b454cb3e7d8a66407c96", + "rev": "77df2be1b3cce9f571c6cf451f786b266a6869cc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5f6cd2d089..61490d6239 100644 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,7 @@ # --- Bridge Heads---------------------------------------------- cardano-db-sync.url = "github:input-output-hk/cardano-db-sync/13.0.4"; - cardano-node.url = "github:input-output-hk/cardano-node?ref=8.1.1"; + cardano-node.url = "github:input-output-hk/cardano-node"; cardano-wallet.url = "github:input-output-hk/cardano-wallet/v2022-07-01"; offchain-metadata-tools = { url = "github:input-output-hk/offchain-metadata-tools/pg-cli-mods"; diff --git a/src/cardano-faucet/cardano-faucet.cabal b/src/cardano-faucet/cardano-faucet.cabal index a012b0a5af..a2cec0ac1c 100644 --- a/src/cardano-faucet/cardano-faucet.cabal +++ b/src/cardano-faucet/cardano-faucet.cabal @@ -34,6 +34,8 @@ common project-config -Wredundant-constraints -Wunused-packages -Wno-orphans + -- for the cardano-cli hack below + -Wno-unused-packages common maybe-unix if !os(windows) @@ -64,6 +66,8 @@ library build-depends: aeson >= 1.5.6.0 , MissingH , bytestring + -- should be in cardano-cli + , optparse-applicative-fork == 0.16.1.0 , cardano-addresses , cardano-api , cardano-cli From ef62aeb3110cf38d2ebb22d5dff0038668129d68 Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Tue, 18 Jul 2023 13:17:21 -0300 Subject: [PATCH 09/13] bump cardano-node --- flake.lock | 1440 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 862 insertions(+), 578 deletions(-) diff --git a/flake.lock b/flake.lock index a30163dca6..b35b774d82 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ "CHaP_2": { "flake": false, "locked": { - "lastModified": 1686070892, - "narHash": "sha256-0yAYqvCg2/aby4AmW0QQK9RKnU1siQczfbUC6hOU02w=", + "lastModified": 1689478915, + "narHash": "sha256-zXSRZ+xP1edVSC4eWXRV2CJQ+NAsnNDP3edOgYBTD/s=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "596cf203a0a1ba252a083a79d384325000faeb49", + "rev": "d4981b111a1485879a53104342136612837f6bcb", "type": "github" }, "original": { @@ -444,7 +444,7 @@ "alejandra_2": { "inputs": { "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_63" + "nixpkgs": "nixpkgs_64" }, "locked": { "lastModified": 1646360966, @@ -567,8 +567,8 @@ "cardano-wallet": "cardano-wallet_3", "cicero": "cicero_2", "data-merge": "data-merge_5", - "n2c": "n2c_6", - "nixpkgs": "nixpkgs_70", + "n2c": "n2c_7", + "nixpkgs": "nixpkgs_71", "std": "std_6" }, "locked": { @@ -1663,21 +1663,6 @@ "type": "github" } }, - "call-flake": { - "locked": { - "lastModified": 1687380775, - "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=", - "owner": "divnix", - "repo": "call-flake", - "rev": "74061f6c241227cd05e79b702db9a300a2e4131a", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "call-flake", - "type": "github" - } - }, "capsules": { "inputs": { "bitte": [ @@ -1730,7 +1715,7 @@ }, "cardano-automation_2": { "inputs": { - "flake-utils": "flake-utils_59", + "flake-utils": "flake-utils_61", "haskellNix": [ "explorer-cardano-node", "haskellNix" @@ -1897,7 +1882,7 @@ }, "cardano-iohk-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_56" + "nixpkgs": "nixpkgs_57" }, "locked": { "lastModified": 1649070135, @@ -1953,7 +1938,7 @@ }, "cardano-mainnet-mirror_3": { "inputs": { - "nixpkgs": "nixpkgs_57" + "nixpkgs": "nixpkgs_58" }, "locked": { "lastModified": 1642701714, @@ -1972,7 +1957,7 @@ }, "cardano-mainnet-mirror_4": { "inputs": { - "nixpkgs": "nixpkgs_81" + "nixpkgs": "nixpkgs_82" }, "locked": { "lastModified": 1642701714, @@ -2383,8 +2368,8 @@ "customConfig": "customConfig_6", "ema": "ema_2", "emanote": "emanote_2", - "flake-compat": "flake-compat_13", - "flake-utils": "flake-utils_32", + "flake-compat": "flake-compat_14", + "flake-utils": "flake-utils_34", "haskellNix": "haskellNix_6", "hostNixpkgs": [ "cardano-wallet", @@ -2416,8 +2401,8 @@ "inputs": { "customConfig": "customConfig_10", "emanote": "emanote_3", - "flake-compat": "flake-compat_22", - "flake-utils": "flake-utils_44", + "flake-compat": "flake-compat_23", + "flake-utils": "flake-utils_46", "haskellNix": "haskellNix_10", "hostNixpkgs": [ "explorer-cardano-graphql", @@ -2498,14 +2483,14 @@ "inputs": { "alejandra": "alejandra_2", "data-merge": "data-merge_4", - "devshell": "devshell_11", + "devshell": "devshell_12", "driver": "driver_2", "follower": "follower_2", "haskell-nix": "haskell-nix_2", "inclusive": "inclusive_8", "nix": "nix_9", "nix-cache-proxy": "nix-cache-proxy_2", - "nixpkgs": "nixpkgs_67", + "nixpkgs": "nixpkgs_68", "poetry2nix": "poetry2nix_2", "utils": "utils_23" }, @@ -2564,6 +2549,32 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "flake-compat": "flake-compat_12", + "flake-utils": "flake-utils_30", + "nixpkgs": [ + "cardano-node", + "std", + "paisano-mdbook-preprocessor", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_4" + }, + "locked": { + "lastModified": 1676162383, + "narHash": "sha256-krUCKdz7ebHlFYm/A7IbKDnj2ZmMMm3yIEQcooqm7+E=", + "owner": "ipetkov", + "repo": "crane", + "rev": "6fb400ec631b22ccdbc7090b38207f7fb5cfb5f2", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "customConfig": { "locked": { "narHash": "sha256-Zd5w1I1Dwt783Q4WuBuCpedcwG1DrIgQGqabyF87prM=", @@ -2838,8 +2849,8 @@ }, "deploy-rs": { "inputs": { - "flake-compat": "flake-compat_14", - "nixpkgs": "nixpkgs_50", + "flake-compat": "flake-compat_15", + "nixpkgs": "nixpkgs_51", "utils": "utils_15" }, "locked": { @@ -2872,6 +2883,29 @@ } }, "devshell_10": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "std", + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1686680692, + "narHash": "sha256-SsLZz3TDleraAiJq4EkmdyewSyiv5g0LZYc6vaLZOMQ=", + "owner": "numtide", + "repo": "devshell", + "rev": "fd6223370774dd9c33354e87a007004b5fd36442", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_11": { "inputs": { "flake-utils": [ "explorer-cardano-db-sync", @@ -2900,10 +2934,10 @@ "type": "github" } }, - "devshell_11": { + "devshell_12": { "inputs": { - "flake-utils": "flake-utils_46", - "nixpkgs": "nixpkgs_64" + "flake-utils": "flake-utils_48", + "nixpkgs": "nixpkgs_65" }, "locked": { "lastModified": 1644227066, @@ -2919,7 +2953,7 @@ "type": "github" } }, - "devshell_12": { + "devshell_13": { "locked": { "lastModified": 1632436039, "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=", @@ -2934,7 +2968,7 @@ "type": "github" } }, - "devshell_13": { + "devshell_14": { "locked": { "lastModified": 1636119665, "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", @@ -2949,7 +2983,7 @@ "type": "github" } }, - "devshell_14": { + "devshell_15": { "locked": { "lastModified": 1636119665, "narHash": "sha256-e11Z9PyH9hdgTm4Vyl8S5iTwrv0um6+srzb1Ba+YUHA=", @@ -2964,7 +2998,7 @@ "type": "github" } }, - "devshell_15": { + "devshell_16": { "inputs": { "flake-utils": [ "explorer-cardano-graphql", @@ -2993,7 +3027,7 @@ "type": "github" } }, - "devshell_16": { + "devshell_17": { "inputs": { "flake-utils": [ "explorer-cardano-graphql", @@ -3024,7 +3058,7 @@ "type": "github" } }, - "devshell_17": { + "devshell_18": { "inputs": { "flake-utils": [ "explorer-cardano-graphql", @@ -3053,7 +3087,7 @@ "type": "github" } }, - "devshell_18": { + "devshell_19": { "inputs": { "flake-utils": [ "explorer-cardano-node", @@ -3082,27 +3116,25 @@ "type": "github" } }, - "devshell_19": { + "devshell_2": { "inputs": { "flake-utils": [ - "explorer-cardano-rosetta", - "tullia", + "bitte", "std", "flake-utils" ], "nixpkgs": [ - "explorer-cardano-rosetta", - "tullia", + "bitte", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1663445644, - "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "lastModified": 1678957337, + "narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=", "owner": "numtide", "repo": "devshell", - "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47", "type": "github" }, "original": { @@ -3111,25 +3143,27 @@ "type": "github" } }, - "devshell_2": { + "devshell_20": { "inputs": { "flake-utils": [ - "bitte", + "explorer-cardano-rosetta", + "tullia", "std", "flake-utils" ], "nixpkgs": [ - "bitte", + "explorer-cardano-rosetta", + "tullia", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1678957337, - "narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=", + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", "owner": "numtide", "repo": "devshell", - "rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", "type": "github" }, "original": { @@ -3138,7 +3172,7 @@ "type": "github" } }, - "devshell_20": { + "devshell_21": { "inputs": { "flake-utils": [ "explorer-ogmios", @@ -3169,7 +3203,7 @@ "type": "github" } }, - "devshell_21": { + "devshell_22": { "inputs": { "flake-utils": [ "explorer-ogmios", @@ -3198,7 +3232,7 @@ "type": "github" } }, - "devshell_22": { + "devshell_23": { "inputs": { "flake-utils": [ "std", @@ -3223,7 +3257,7 @@ "type": "github" } }, - "devshell_23": { + "devshell_24": { "inputs": { "flake-utils": [ "tullia", @@ -3822,7 +3856,7 @@ }, "driver_2": { "inputs": { - "devshell": "devshell_12", + "devshell": "devshell_13", "inclusive": "inclusive_6", "nix": "nix_8", "nixpkgs": [ @@ -3954,9 +3988,9 @@ }, "ema_2": { "inputs": { - "flake-compat": "flake-compat_12", - "flake-utils": "flake-utils_29", - "nixpkgs": "nixpkgs_44", + "flake-compat": "flake-compat_13", + "flake-utils": "flake-utils_31", + "nixpkgs": "nixpkgs_45", "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { @@ -3992,9 +4026,9 @@ }, "ema_4": { "inputs": { - "flake-compat": "flake-compat_18", - "flake-utils": "flake-utils_39", - "nixpkgs": "nixpkgs_58", + "flake-compat": "flake-compat_19", + "flake-utils": "flake-utils_41", + "nixpkgs": "nixpkgs_59", "pre-commit-hooks": "pre-commit-hooks_3" }, "locked": { @@ -4040,7 +4074,7 @@ "ema": "ema_3", "flake-parts": "flake-parts", "haskell-flake": "haskell-flake", - "nixpkgs": "nixpkgs_47", + "nixpkgs": "nixpkgs_48", "tailwind-haskell": "tailwind-haskell_2" }, "locked": { @@ -4060,10 +4094,10 @@ "emanote_3": { "inputs": { "ema": "ema_4", - "flake-compat": "flake-compat_19", - "flake-utils": "flake-utils_41", + "flake-compat": "flake-compat_20", + "flake-utils": "flake-utils_43", "heist": "heist_2", - "nixpkgs": "nixpkgs_60", + "nixpkgs": "nixpkgs_61", "tailwind-haskell": "tailwind-haskell_3" }, "locked": { @@ -4114,7 +4148,7 @@ "inputs": { "CHaP": "CHaP_3", "customConfig": "customConfig_7", - "flake-compat": "flake-compat_15", + "flake-compat": "flake-compat_16", "haskellNix": "haskellNix_7", "iohkNix": "iohkNix_7", "nixpkgs": [ @@ -4168,7 +4202,7 @@ "ekg-core": "ekg-core", "ekg-json": "ekg-json", "ekg-prometheus": "ekg-prometheus", - "flake-compat": "flake-compat_23", + "flake-compat": "flake-compat_24", "graphql-engine": "graphql-engine", "haskellNix": "haskellNix_11", "kriti-lang": "kriti-lang", @@ -4209,7 +4243,7 @@ "customConfig": "customConfig_11", "em": "em_2", "empty-flake": "empty-flake_2", - "flake-compat": "flake-compat_27", + "flake-compat": "flake-compat_28", "hackageNix": "hackageNix_3", "haskellNix": "haskellNix_12", "hostNixpkgs": [ @@ -4296,7 +4330,7 @@ "inputs": { "CHaP": "CHaP_5", "config": "config", - "flake-utils": "flake-utils_67", + "flake-utils": "flake-utils_69", "haskellNix": "haskellNix_13", "iohkNix": "iohkNix_12", "nixpkgs": [ @@ -4378,6 +4412,25 @@ "type": "github" } }, + "fenix_4": { + "inputs": { + "nixpkgs": "nixpkgs_44", + "rust-analyzer-src": "rust-analyzer-src_4" + }, + "locked": { + "lastModified": 1677306201, + "narHash": "sha256-VZ9x7qdTosFvVsrpgFHrtYfT6PU3yMIs7NRYn9ELapI=", + "owner": "nix-community", + "repo": "fenix", + "rev": "0923f0c162f65ae40261ec940406049726cfeab4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-arch": { "locked": { "lastModified": 1660158125, @@ -4444,6 +4497,22 @@ } }, "flake-compat_12": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_13": { "flake": false, "locked": { "lastModified": 1641205782, @@ -4459,7 +4528,7 @@ "type": "github" } }, - "flake-compat_13": { + "flake-compat_14": { "flake": false, "locked": { "lastModified": 1635892615, @@ -4475,7 +4544,7 @@ "type": "github" } }, - "flake-compat_14": { + "flake-compat_15": { "flake": false, "locked": { "lastModified": 1668681692, @@ -4491,7 +4560,7 @@ "type": "github" } }, - "flake-compat_15": { + "flake-compat_16": { "flake": false, "locked": { "lastModified": 1647532380, @@ -4508,7 +4577,7 @@ "type": "github" } }, - "flake-compat_16": { + "flake-compat_17": { "flake": false, "locked": { "lastModified": 1672831974, @@ -4525,7 +4594,7 @@ "type": "github" } }, - "flake-compat_17": { + "flake-compat_18": { "flake": false, "locked": { "lastModified": 1650374568, @@ -4541,7 +4610,7 @@ "type": "github" } }, - "flake-compat_18": { + "flake-compat_19": { "flake": false, "locked": { "lastModified": 1641205782, @@ -4557,14 +4626,14 @@ "type": "github" } }, - "flake-compat_19": { + "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -4573,14 +4642,14 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_20": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", "type": "github" }, "original": { @@ -4589,7 +4658,7 @@ "type": "github" } }, - "flake-compat_20": { + "flake-compat_21": { "flake": false, "locked": { "lastModified": 1641205782, @@ -4605,7 +4674,7 @@ "type": "github" } }, - "flake-compat_21": { + "flake-compat_22": { "flake": false, "locked": { "lastModified": 1641205782, @@ -4621,7 +4690,7 @@ "type": "github" } }, - "flake-compat_22": { + "flake-compat_23": { "flake": false, "locked": { "lastModified": 1638445031, @@ -4638,7 +4707,7 @@ "type": "github" } }, - "flake-compat_23": { + "flake-compat_24": { "flake": false, "locked": { "lastModified": 1647532380, @@ -4655,7 +4724,7 @@ "type": "github" } }, - "flake-compat_24": { + "flake-compat_25": { "flake": false, "locked": { "lastModified": 1635892615, @@ -4671,7 +4740,7 @@ "type": "github" } }, - "flake-compat_25": { + "flake-compat_26": { "flake": false, "locked": { "lastModified": 1650374568, @@ -4687,7 +4756,7 @@ "type": "github" } }, - "flake-compat_26": { + "flake-compat_27": { "flake": false, "locked": { "lastModified": 1650374568, @@ -4703,7 +4772,7 @@ "type": "github" } }, - "flake-compat_27": { + "flake-compat_28": { "flake": false, "locked": { "lastModified": 1647532380, @@ -4720,7 +4789,7 @@ "type": "github" } }, - "flake-compat_28": { + "flake-compat_29": { "flake": false, "locked": { "lastModified": 1672831974, @@ -4737,7 +4806,7 @@ "type": "github" } }, - "flake-compat_29": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1650374568, @@ -4753,7 +4822,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_30": { "flake": false, "locked": { "lastModified": 1650374568, @@ -4769,7 +4838,7 @@ "type": "github" } }, - "flake-compat_30": { + "flake-compat_31": { "flake": false, "locked": { "lastModified": 1650374568, @@ -4785,7 +4854,7 @@ "type": "github" } }, - "flake-compat_31": { + "flake-compat_32": { "flake": false, "locked": { "lastModified": 1672831974, @@ -4802,7 +4871,7 @@ "type": "github" } }, - "flake-compat_32": { + "flake-compat_33": { "flake": false, "locked": { "lastModified": 1650374568, @@ -4818,7 +4887,7 @@ "type": "github" } }, - "flake-compat_33": { + "flake-compat_34": { "flake": false, "locked": { "lastModified": 1650374568, @@ -4834,7 +4903,7 @@ "type": "github" } }, - "flake-compat_34": { + "flake-compat_35": { "flake": false, "locked": { "lastModified": 1650374568, @@ -4850,7 +4919,7 @@ "type": "github" } }, - "flake-compat_35": { + "flake-compat_36": { "flake": false, "locked": { "lastModified": 1672831974, @@ -4867,7 +4936,7 @@ "type": "github" } }, - "flake-compat_36": { + "flake-compat_37": { "flake": false, "locked": { "lastModified": 1650374568, @@ -4883,7 +4952,7 @@ "type": "github" } }, - "flake-compat_37": { + "flake-compat_38": { "flake": false, "locked": { "lastModified": 1650374568, @@ -4998,7 +5067,7 @@ }, "flake-parts": { "inputs": { - "nixpkgs": "nixpkgs_46" + "nixpkgs": "nixpkgs_47" }, "locked": { "lastModified": 1655570068, @@ -5350,11 +5419,11 @@ }, "flake-utils_29": { "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -5379,6 +5448,36 @@ } }, "flake-utils_30": { + "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_31": { + "locked": { + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_32": { "locked": { "lastModified": 1619345332, "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", @@ -5393,7 +5492,7 @@ "type": "github" } }, - "flake-utils_31": { + "flake-utils_33": { "locked": { "lastModified": 1652776076, "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", @@ -5409,7 +5508,7 @@ "type": "github" } }, - "flake-utils_32": { + "flake-utils_34": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -5424,7 +5523,7 @@ "type": "github" } }, - "flake-utils_33": { + "flake-utils_35": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -5439,7 +5538,7 @@ "type": "github" } }, - "flake-utils_34": { + "flake-utils_36": { "locked": { "lastModified": 1679360468, "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", @@ -5455,7 +5554,7 @@ "type": "github" } }, - "flake-utils_35": { + "flake-utils_37": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -5470,7 +5569,7 @@ "type": "github" } }, - "flake-utils_36": { + "flake-utils_38": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -5485,7 +5584,7 @@ "type": "github" } }, - "flake-utils_37": { + "flake-utils_39": { "locked": { "lastModified": 1623875721, "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", @@ -5500,13 +5599,13 @@ "type": "github" } }, - "flake-utils_38": { + "flake-utils_4": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -5515,13 +5614,13 @@ "type": "github" } }, - "flake-utils_39": { + "flake-utils_40": { "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", "owner": "numtide", "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", "type": "github" }, "original": { @@ -5530,13 +5629,13 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_41": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "type": "github" }, "original": { @@ -5545,7 +5644,7 @@ "type": "github" } }, - "flake-utils_40": { + "flake-utils_42": { "locked": { "lastModified": 1619345332, "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", @@ -5560,7 +5659,7 @@ "type": "github" } }, - "flake-utils_41": { + "flake-utils_43": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -5575,7 +5674,7 @@ "type": "github" } }, - "flake-utils_42": { + "flake-utils_44": { "locked": { "lastModified": 1642700792, "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", @@ -5590,7 +5689,7 @@ "type": "github" } }, - "flake-utils_43": { + "flake-utils_45": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -5605,7 +5704,7 @@ "type": "github" } }, - "flake-utils_44": { + "flake-utils_46": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -5620,7 +5719,7 @@ "type": "github" } }, - "flake-utils_45": { + "flake-utils_47": { "locked": { "lastModified": 1623875721, "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", @@ -5635,7 +5734,7 @@ "type": "github" } }, - "flake-utils_46": { + "flake-utils_48": { "locked": { "lastModified": 1642700792, "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", @@ -5650,7 +5749,7 @@ "type": "github" } }, - "flake-utils_47": { + "flake-utils_49": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -5665,13 +5764,13 @@ "type": "github" } }, - "flake-utils_48": { + "flake-utils_5": { "locked": { - "lastModified": 1610051610, - "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -5680,13 +5779,13 @@ "type": "github" } }, - "flake-utils_49": { + "flake-utils_50": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", "type": "github" }, "original": { @@ -5695,13 +5794,13 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_51": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -5710,7 +5809,7 @@ "type": "github" } }, - "flake-utils_50": { + "flake-utils_52": { "locked": { "lastModified": 1656928814, "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", @@ -5725,7 +5824,7 @@ "type": "github" } }, - "flake-utils_51": { + "flake-utils_53": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -5740,7 +5839,7 @@ "type": "github" } }, - "flake-utils_52": { + "flake-utils_54": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -5755,7 +5854,7 @@ "type": "github" } }, - "flake-utils_53": { + "flake-utils_55": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -5770,7 +5869,7 @@ "type": "github" } }, - "flake-utils_54": { + "flake-utils_56": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -5785,7 +5884,7 @@ "type": "github" } }, - "flake-utils_55": { + "flake-utils_57": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -5800,7 +5899,7 @@ "type": "github" } }, - "flake-utils_56": { + "flake-utils_58": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -5815,7 +5914,7 @@ "type": "github" } }, - "flake-utils_57": { + "flake-utils_59": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -5830,13 +5929,13 @@ "type": "github" } }, - "flake-utils_58": { + "flake-utils_6": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", "type": "github" }, "original": { @@ -5845,13 +5944,13 @@ "type": "github" } }, - "flake-utils_59": { + "flake-utils_60": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -5860,13 +5959,13 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_61": { "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -5875,7 +5974,7 @@ "type": "github" } }, - "flake-utils_60": { + "flake-utils_62": { "locked": { "lastModified": 1679360468, "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", @@ -5891,7 +5990,7 @@ "type": "github" } }, - "flake-utils_61": { + "flake-utils_63": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -5906,7 +6005,7 @@ "type": "github" } }, - "flake-utils_62": { + "flake-utils_64": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -5921,7 +6020,7 @@ "type": "github" } }, - "flake-utils_63": { + "flake-utils_65": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -5936,7 +6035,7 @@ "type": "github" } }, - "flake-utils_64": { + "flake-utils_66": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -5951,7 +6050,7 @@ "type": "github" } }, - "flake-utils_65": { + "flake-utils_67": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -5966,7 +6065,7 @@ "type": "github" } }, - "flake-utils_66": { + "flake-utils_68": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -5981,7 +6080,7 @@ "type": "github" } }, - "flake-utils_67": { + "flake-utils_69": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -5996,38 +6095,38 @@ "type": "github" } }, - "flake-utils_68": { + "flake-utils_7": { "locked": { - "lastModified": 1679360468, - "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", - "owner": "hamishmack", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", "repo": "flake-utils", - "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { - "owner": "hamishmack", - "ref": "hkm/nested-hydraJobs", + "owner": "numtide", "repo": "flake-utils", "type": "github" } }, - "flake-utils_69": { + "flake-utils_70": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", + "lastModified": 1679360468, + "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", + "owner": "hamishmack", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5", "type": "github" }, "original": { - "owner": "numtide", + "owner": "hamishmack", + "ref": "hkm/nested-hydraJobs", "repo": "flake-utils", "type": "github" } }, - "flake-utils_7": { + "flake-utils_71": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -6042,7 +6141,7 @@ "type": "github" } }, - "flake-utils_70": { + "flake-utils_72": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -6057,7 +6156,7 @@ "type": "github" } }, - "flake-utils_71": { + "flake-utils_73": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -6072,7 +6171,7 @@ "type": "github" } }, - "flake-utils_72": { + "flake-utils_74": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -6087,7 +6186,7 @@ "type": "github" } }, - "flake-utils_73": { + "flake-utils_75": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -6102,7 +6201,7 @@ "type": "github" } }, - "flake-utils_74": { + "flake-utils_76": { "locked": { "lastModified": 1679360468, "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", @@ -6118,7 +6217,7 @@ "type": "github" } }, - "flake-utils_75": { + "flake-utils_77": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -6133,7 +6232,7 @@ "type": "github" } }, - "flake-utils_76": { + "flake-utils_78": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -6148,7 +6247,7 @@ "type": "github" } }, - "flake-utils_77": { + "flake-utils_79": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -6163,13 +6262,13 @@ "type": "github" } }, - "flake-utils_78": { + "flake-utils_8": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", "type": "github" }, "original": { @@ -6178,13 +6277,13 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_80": { "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -6267,7 +6366,7 @@ }, "follower_2": { "inputs": { - "devshell": "devshell_13", + "devshell": "devshell_14", "inclusive": "inclusive_7", "nixpkgs": [ "explorer-cardano-graphql", @@ -6584,7 +6683,7 @@ }, "gomod2nix_10": { "inputs": { - "nixpkgs": "nixpkgs_103", + "nixpkgs": "nixpkgs_104", "utils": "utils_31" }, "locked": { @@ -6622,7 +6721,7 @@ }, "gomod2nix_3": { "inputs": { - "nixpkgs": "nixpkgs_52", + "nixpkgs": "nixpkgs_53", "utils": "utils_16" }, "locked": { @@ -6641,7 +6740,7 @@ }, "gomod2nix_4": { "inputs": { - "nixpkgs": "nixpkgs_74", + "nixpkgs": "nixpkgs_75", "utils": "utils_24" }, "locked": { @@ -6660,7 +6759,7 @@ }, "gomod2nix_5": { "inputs": { - "nixpkgs": "nixpkgs_77", + "nixpkgs": "nixpkgs_78", "utils": "utils_25" }, "locked": { @@ -6679,7 +6778,7 @@ }, "gomod2nix_6": { "inputs": { - "nixpkgs": "nixpkgs_84", + "nixpkgs": "nixpkgs_85", "utils": "utils_26" }, "locked": { @@ -6698,7 +6797,7 @@ }, "gomod2nix_7": { "inputs": { - "nixpkgs": "nixpkgs_88", + "nixpkgs": "nixpkgs_89", "utils": "utils_28" }, "locked": { @@ -6717,7 +6816,7 @@ }, "gomod2nix_8": { "inputs": { - "nixpkgs": "nixpkgs_93", + "nixpkgs": "nixpkgs_94", "utils": "utils_29" }, "locked": { @@ -6736,7 +6835,7 @@ }, "gomod2nix_9": { "inputs": { - "nixpkgs": "nixpkgs_96", + "nixpkgs": "nixpkgs_97", "utils": "utils_30" }, "locked": { @@ -6755,8 +6854,8 @@ }, "graphql-engine": { "inputs": { - "flake-utils": "flake-utils_51", - "nixpkgs": "nixpkgs_72" + "flake-utils": "flake-utils_53", + "nixpkgs": "nixpkgs_73" }, "locked": { "lastModified": 1671006554, @@ -6808,11 +6907,11 @@ "hackageNix_2": { "flake": false, "locked": { - "lastModified": 1685492843, - "narHash": "sha256-X8dNs5Gfc2ucfaWAgZ1VmkpBB4Cb44EQZu0b7tkvz2Y=", + "lastModified": 1688948952, + "narHash": "sha256-q0MqLCLYZafs1V55MPcE1ywl68/gfObjGnDYINI1yek=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "e7407bab324eb2445bda58c5ffac393e80dda1e4", + "rev": "0dfc30a014e08278f3a34f43dbb3fff86b86e741", "type": "github" }, "original": { @@ -7110,7 +7209,7 @@ "cabal-34": "cabal-34_12", "cabal-36": "cabal-36_10", "cardano-shell": "cardano-shell_12", - "flake-utils": "flake-utils_47", + "flake-utils": "flake-utils_49", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_12", "hackage": "hackage_11", "hpc-coveralls": "hpc-coveralls_12", @@ -7155,8 +7254,8 @@ "cabal-34": "cabal-34_16", "cabal-36": "cabal-36_14", "cardano-shell": "cardano-shell_16", - "flake-compat": "flake-compat_35", - "flake-utils": "flake-utils_74", + "flake-compat": "flake-compat_36", + "flake-utils": "flake-utils_76", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_16", "hackage": [ "hackage" @@ -7239,7 +7338,7 @@ "cabal-34": "cabal-34_11", "cabal-36": "cabal-36_9", "cardano-shell": "cardano-shell_11", - "flake-utils": "flake-utils_45", + "flake-utils": "flake-utils_47", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_11", "hackage": "hackage_10", "hpc-coveralls": "hpc-coveralls_11", @@ -7278,8 +7377,8 @@ "cabal-34": "cabal-34_13", "cabal-36": "cabal-36_11", "cardano-shell": "cardano-shell_13", - "flake-compat": "flake-compat_24", - "flake-utils": "flake-utils_52", + "flake-compat": "flake-compat_25", + "flake-utils": "flake-utils_54", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_13", "hackage": "hackage_12", "hpc-coveralls": "hpc-coveralls_13", @@ -7322,8 +7421,8 @@ "cabal-34": "cabal-34_14", "cabal-36": "cabal-36_12", "cardano-shell": "cardano-shell_14", - "flake-compat": "flake-compat_28", - "flake-utils": "flake-utils_60", + "flake-compat": "flake-compat_29", + "flake-utils": "flake-utils_62", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_14", "hackage": [ "explorer-cardano-node", @@ -7367,8 +7466,8 @@ "cabal-34": "cabal-34_15", "cabal-36": "cabal-36_13", "cardano-shell": "cardano-shell_15", - "flake-compat": "flake-compat_31", - "flake-utils": "flake-utils_68", + "flake-compat": "flake-compat_32", + "flake-utils": "flake-utils_70", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_15", "hackage": "hackage_13", "hpc-coveralls": "hpc-coveralls_15", @@ -7570,7 +7669,7 @@ "cabal-34": "cabal-34_7", "cabal-36": "cabal-36_6", "cardano-shell": "cardano-shell_7", - "flake-utils": "flake-utils_33", + "flake-utils": "flake-utils_35", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_7", "hackage": "hackage_6", "hpc-coveralls": "hpc-coveralls_7", @@ -7608,8 +7707,8 @@ "cabal-34": "cabal-34_8", "cabal-36": "cabal-36_7", "cardano-shell": "cardano-shell_8", - "flake-compat": "flake-compat_16", - "flake-utils": "flake-utils_34", + "flake-compat": "flake-compat_17", + "flake-utils": "flake-utils_36", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_8", "hackage": "hackage_7", "hls-1.10": "hls-1.10_2", @@ -7650,7 +7749,7 @@ "cabal-32": "cabal-32_9", "cabal-34": "cabal-34_9", "cardano-shell": "cardano-shell_9", - "flake-utils": "flake-utils_37", + "flake-utils": "flake-utils_39", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_9", "hackage": "hackage_8", "hpc-coveralls": "hpc-coveralls_9", @@ -7690,7 +7789,7 @@ "cabal-34": "cabal-34_10", "cabal-36": "cabal-36_8", "cardano-shell": "cardano-shell_10", - "flake-utils": "flake-utils_38", + "flake-utils": "flake-utils_40", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_10", "hackage": "hackage_9", "hpc-coveralls": "hpc-coveralls_10", @@ -9469,9 +9568,14 @@ }, "n2c_10": { "inputs": { - "flake-utils": "flake-utils_66", + "flake-utils": [ + "explorer-cardano-node", + "tullia", + "std", + "flake-utils" + ], "nixpkgs": [ - "explorer-cardano-rosetta", + "explorer-cardano-node", "tullia", "std", "nixpkgs" @@ -9492,6 +9596,30 @@ } }, "n2c_11": { + "inputs": { + "flake-utils": "flake-utils_68", + "nixpkgs": [ + "explorer-cardano-rosetta", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "n2c_12": { "inputs": { "flake-utils": [ "explorer-ogmios", @@ -9522,9 +9650,9 @@ "type": "github" } }, - "n2c_12": { + "n2c_13": { "inputs": { - "flake-utils": "flake-utils_73", + "flake-utils": "flake-utils_75", "nixpkgs": [ "explorer-ogmios", "tullia", @@ -9546,7 +9674,7 @@ "type": "github" } }, - "n2c_13": { + "n2c_14": { "inputs": { "flake-utils": [ "std", @@ -9571,7 +9699,7 @@ "type": "github" } }, - "n2c_14": { + "n2c_15": { "inputs": { "flake-utils": [ "tullia", @@ -9678,24 +9806,22 @@ "n2c_5": { "inputs": { "flake-utils": [ - "explorer-cardano-db-sync", - "tullia", + "cardano-node", "std", "flake-utils" ], "nixpkgs": [ - "explorer-cardano-db-sync", - "tullia", + "cardano-node", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1665039323, - "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "lastModified": 1685771919, + "narHash": "sha256-3lVKWrhNXjHJB6QkZ2SJaOs4X/mmYXtY6ovPVpDMOHc=", "owner": "nlewo", "repo": "nix2container", - "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "rev": "95e2220911874064b5d809f8d35f7835184c4ddf", "type": "github" }, "original": { @@ -9706,15 +9832,25 @@ }, "n2c_6": { "inputs": { - "flake-utils": "flake-utils_49", - "nixpkgs": "nixpkgs_69" + "flake-utils": [ + "explorer-cardano-db-sync", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "explorer-cardano-db-sync", + "tullia", + "std", + "nixpkgs" + ] }, "locked": { - "lastModified": 1664348923, - "narHash": "sha256-9SHHh6Dv2nceu/p7De3JF4Nt1Zw/2roH7xn7+0jNCXs=", + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", "owner": "nlewo", "repo": "nix2container", - "rev": "686213e7938123a0558737ddc82567e91ecb28db", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", "type": "github" }, "original": { @@ -9725,21 +9861,15 @@ }, "n2c_7": { "inputs": { - "flake-utils": "flake-utils_55", - "nixpkgs": [ - "explorer-cardano-graphql", - "haskellNix", - "tullia", - "std", - "nixpkgs" - ] + "flake-utils": "flake-utils_51", + "nixpkgs": "nixpkgs_70" }, "locked": { - "lastModified": 1665039323, - "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "lastModified": 1664348923, + "narHash": "sha256-9SHHh6Dv2nceu/p7De3JF4Nt1Zw/2roH7xn7+0jNCXs=", "owner": "nlewo", "repo": "nix2container", - "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "rev": "686213e7938123a0558737ddc82567e91ecb28db", "type": "github" }, "original": { @@ -9750,9 +9880,10 @@ }, "n2c_8": { "inputs": { - "flake-utils": "flake-utils_58", + "flake-utils": "flake-utils_57", "nixpkgs": [ "explorer-cardano-graphql", + "haskellNix", "tullia", "std", "nixpkgs" @@ -9774,14 +9905,9 @@ }, "n2c_9": { "inputs": { - "flake-utils": [ - "explorer-cardano-node", - "tullia", - "std", - "flake-utils" - ], + "flake-utils": "flake-utils_60", "nixpkgs": [ - "explorer-cardano-node", + "explorer-cardano-graphql", "tullia", "std", "nixpkgs" @@ -9803,7 +9929,7 @@ }, "napalm": { "inputs": { - "flake-utils": "flake-utils_75", + "flake-utils": "flake-utils_77", "nixpkgs": [ "openziti", "nixpkgs" @@ -9875,7 +10001,7 @@ }, "nix-cache-proxy_2": { "inputs": { - "devshell": "devshell_14", + "devshell": "devshell_15", "inclusive": [ "explorer-cardano-graphql", "bitte-cells", @@ -9959,7 +10085,7 @@ }, "nix-nomad_10": { "inputs": { - "flake-compat": "flake-compat_37", + "flake-compat": "flake-compat_38", "flake-utils": [ "tullia", "nix2container", @@ -10029,7 +10155,7 @@ }, "nix-nomad_3": { "inputs": { - "flake-compat": "flake-compat_17", + "flake-compat": "flake-compat_18", "flake-utils": [ "explorer-cardano-db-sync", "tullia", @@ -10064,7 +10190,7 @@ }, "nix-nomad_4": { "inputs": { - "flake-compat": "flake-compat_25", + "flake-compat": "flake-compat_26", "flake-utils": [ "explorer-cardano-graphql", "haskellNix", @@ -10102,7 +10228,7 @@ }, "nix-nomad_5": { "inputs": { - "flake-compat": "flake-compat_26", + "flake-compat": "flake-compat_27", "flake-utils": [ "explorer-cardano-graphql", "tullia", @@ -10137,7 +10263,7 @@ }, "nix-nomad_6": { "inputs": { - "flake-compat": "flake-compat_29", + "flake-compat": "flake-compat_30", "flake-utils": [ "explorer-cardano-node", "tullia", @@ -10172,7 +10298,7 @@ }, "nix-nomad_7": { "inputs": { - "flake-compat": "flake-compat_30", + "flake-compat": "flake-compat_31", "flake-utils": [ "explorer-cardano-rosetta", "tullia", @@ -10207,7 +10333,7 @@ }, "nix-nomad_8": { "inputs": { - "flake-compat": "flake-compat_32", + "flake-compat": "flake-compat_33", "flake-utils": [ "explorer-ogmios", "haskellNix", @@ -10245,7 +10371,7 @@ }, "nix-nomad_9": { "inputs": { - "flake-compat": "flake-compat_33", + "flake-compat": "flake-compat_34", "flake-utils": [ "explorer-ogmios", "tullia", @@ -10459,8 +10585,8 @@ }, "nix2container_10": { "inputs": { - "flake-utils": "flake-utils_69", - "nixpkgs": "nixpkgs_94" + "flake-utils": "flake-utils_71", + "nixpkgs": "nixpkgs_95" }, "locked": { "lastModified": 1658567952, @@ -10478,8 +10604,8 @@ }, "nix2container_11": { "inputs": { - "flake-utils": "flake-utils_71", - "nixpkgs": "nixpkgs_97" + "flake-utils": "flake-utils_73", + "nixpkgs": "nixpkgs_98" }, "locked": { "lastModified": 1658567952, @@ -10497,8 +10623,8 @@ }, "nix2container_12": { "inputs": { - "flake-utils": "flake-utils_77", - "nixpkgs": "nixpkgs_104" + "flake-utils": "flake-utils_79", + "nixpkgs": "nixpkgs_105" }, "locked": { "lastModified": 1658567952, @@ -10554,8 +10680,8 @@ }, "nix2container_4": { "inputs": { - "flake-utils": "flake-utils_35", - "nixpkgs": "nixpkgs_53" + "flake-utils": "flake-utils_37", + "nixpkgs": "nixpkgs_54" }, "locked": { "lastModified": 1658567952, @@ -10573,8 +10699,8 @@ }, "nix2container_5": { "inputs": { - "flake-utils": "flake-utils_53", - "nixpkgs": "nixpkgs_75" + "flake-utils": "flake-utils_55", + "nixpkgs": "nixpkgs_76" }, "locked": { "lastModified": 1658567952, @@ -10592,8 +10718,8 @@ }, "nix2container_6": { "inputs": { - "flake-utils": "flake-utils_56", - "nixpkgs": "nixpkgs_78" + "flake-utils": "flake-utils_58", + "nixpkgs": "nixpkgs_79" }, "locked": { "lastModified": 1658567952, @@ -10611,8 +10737,8 @@ }, "nix2container_7": { "inputs": { - "flake-utils": "flake-utils_61", - "nixpkgs": "nixpkgs_83" + "flake-utils": "flake-utils_63", + "nixpkgs": "nixpkgs_84" }, "locked": { "lastModified": 1671269339, @@ -10630,8 +10756,8 @@ }, "nix2container_8": { "inputs": { - "flake-utils": "flake-utils_62", - "nixpkgs": "nixpkgs_85" + "flake-utils": "flake-utils_64", + "nixpkgs": "nixpkgs_86" }, "locked": { "lastModified": 1658567952, @@ -10649,8 +10775,8 @@ }, "nix2container_9": { "inputs": { - "flake-utils": "flake-utils_64", - "nixpkgs": "nixpkgs_89" + "flake-utils": "flake-utils_66", + "nixpkgs": "nixpkgs_90" }, "locked": { "lastModified": 1658567952, @@ -10685,7 +10811,7 @@ "nix_10": { "inputs": { "lowdown-src": "lowdown-src_10", - "nixpkgs": "nixpkgs_73", + "nixpkgs": "nixpkgs_74", "nixpkgs-regression": "nixpkgs-regression_10" }, "locked": { @@ -10706,7 +10832,7 @@ "nix_11": { "inputs": { "lowdown-src": "lowdown-src_11", - "nixpkgs": "nixpkgs_82", + "nixpkgs": "nixpkgs_83", "nixpkgs-regression": "nixpkgs-regression_11" }, "locked": { @@ -10727,7 +10853,7 @@ "nix_12": { "inputs": { "lowdown-src": "lowdown-src_12", - "nixpkgs": "nixpkgs_92", + "nixpkgs": "nixpkgs_93", "nixpkgs-regression": "nixpkgs-regression_12" }, "locked": { @@ -10748,7 +10874,7 @@ "nix_13": { "inputs": { "lowdown-src": "lowdown-src_13", - "nixpkgs": "nixpkgs_100", + "nixpkgs": "nixpkgs_101", "nixpkgs-regression": "nixpkgs-regression_13" }, "locked": { @@ -10853,7 +10979,7 @@ "nix_6": { "inputs": { "lowdown-src": "lowdown-src_6", - "nixpkgs": "nixpkgs_49", + "nixpkgs": "nixpkgs_50", "nixpkgs-regression": "nixpkgs-regression_6" }, "locked": { @@ -10874,7 +11000,7 @@ "nix_7": { "inputs": { "lowdown-src": "lowdown-src_7", - "nixpkgs": "nixpkgs_51", + "nixpkgs": "nixpkgs_52", "nixpkgs-regression": "nixpkgs-regression_7" }, "locked": { @@ -10895,7 +11021,7 @@ "nix_8": { "inputs": { "lowdown-src": "lowdown-src_8", - "nixpkgs": "nixpkgs_65", + "nixpkgs": "nixpkgs_66", "nixpkgs-regression": "nixpkgs-regression_8" }, "locked": { @@ -10916,7 +11042,7 @@ "nix_9": { "inputs": { "lowdown-src": "lowdown-src_9", - "nixpkgs": "nixpkgs_66", + "nixpkgs": "nixpkgs_67", "nixpkgs-regression": "nixpkgs-regression_9" }, "locked": { @@ -10997,6 +11123,41 @@ } }, "nixago_10": { + "inputs": { + "flake-utils": [ + "explorer-cardano-rosetta", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "explorer-cardano-rosetta", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "explorer-cardano-rosetta", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "owner": "nix-community", + "repo": "nixago", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixago", + "type": "github" + } + }, + "nixago_11": { "inputs": { "flake-utils": [ "explorer-ogmios", @@ -11034,7 +11195,7 @@ "type": "github" } }, - "nixago_11": { + "nixago_12": { "inputs": { "flake-utils": [ "explorer-ogmios", @@ -11069,7 +11230,7 @@ "type": "github" } }, - "nixago_12": { + "nixago_13": { "inputs": { "flake-utils": [ "std", @@ -11098,7 +11259,7 @@ "type": "github" } }, - "nixago_13": { + "nixago_14": { "inputs": { "flake-utils": [ "tullia", @@ -11199,30 +11360,27 @@ "nixago_4": { "inputs": { "flake-utils": [ - "explorer-cardano-db-sync", - "tullia", + "cardano-node", "std", "flake-utils" ], "nixago-exts": [ - "explorer-cardano-db-sync", - "tullia", + "cardano-node", "std", "blank" ], "nixpkgs": [ - "explorer-cardano-db-sync", - "tullia", + "cardano-node", "std", "nixpkgs" ] }, "locked": { - "lastModified": 1661824785, - "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "lastModified": 1683210100, + "narHash": "sha256-bhGDOlkWtlhVECpoOog4fWiFJmLCpVEg09a40aTjCbw=", "owner": "nix-community", "repo": "nixago", - "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", + "rev": "1da60ad9412135f9ed7a004669fdcf3d378ec630", "type": "github" }, "original": { @@ -11234,15 +11392,20 @@ "nixago_5": { "inputs": { "flake-utils": [ - "explorer-cardano-graphql", - "bitte-cells", + "explorer-cardano-db-sync", + "tullia", "std", "flake-utils" ], - "nixago-exts": "nixago-exts_2", + "nixago-exts": [ + "explorer-cardano-db-sync", + "tullia", + "std", + "blank" + ], "nixpkgs": [ - "explorer-cardano-graphql", - "bitte-cells", + "explorer-cardano-db-sync", + "tullia", "std", "nixpkgs" ] @@ -11265,22 +11428,14 @@ "inputs": { "flake-utils": [ "explorer-cardano-graphql", - "haskellNix", - "tullia", + "bitte-cells", "std", "flake-utils" ], - "nixago-exts": [ - "explorer-cardano-graphql", - "haskellNix", - "tullia", - "std", - "blank" - ], + "nixago-exts": "nixago-exts_2", "nixpkgs": [ "explorer-cardano-graphql", - "haskellNix", - "tullia", + "bitte-cells", "std", "nixpkgs" ] @@ -11303,18 +11458,21 @@ "inputs": { "flake-utils": [ "explorer-cardano-graphql", + "haskellNix", "tullia", "std", "flake-utils" ], "nixago-exts": [ "explorer-cardano-graphql", + "haskellNix", "tullia", "std", "blank" ], "nixpkgs": [ "explorer-cardano-graphql", + "haskellNix", "tullia", "std", "nixpkgs" @@ -11337,19 +11495,19 @@ "nixago_8": { "inputs": { "flake-utils": [ - "explorer-cardano-node", + "explorer-cardano-graphql", "tullia", "std", "flake-utils" ], "nixago-exts": [ - "explorer-cardano-node", + "explorer-cardano-graphql", "tullia", "std", "blank" ], "nixpkgs": [ - "explorer-cardano-node", + "explorer-cardano-graphql", "tullia", "std", "nixpkgs" @@ -11372,19 +11530,19 @@ "nixago_9": { "inputs": { "flake-utils": [ - "explorer-cardano-rosetta", + "explorer-cardano-node", "tullia", "std", "flake-utils" ], "nixago-exts": [ - "explorer-cardano-rosetta", + "explorer-cardano-node", "tullia", "std", "blank" ], "nixpkgs": [ - "explorer-cardano-rosetta", + "explorer-cardano-node", "tullia", "std", "nixpkgs" @@ -12994,7 +13152,23 @@ }, "nixpkgs_100": { "locked": { - "lastModified": 1657693803, + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_101": { + "locked": { + "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "owner": "NixOS", "repo": "nixpkgs", @@ -13008,7 +13182,7 @@ "type": "github" } }, - "nixpkgs_101": { + "nixpkgs_102": { "locked": { "lastModified": 1676300157, "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", @@ -13024,7 +13198,7 @@ "type": "github" } }, - "nixpkgs_102": { + "nixpkgs_103": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -13040,7 +13214,7 @@ "type": "github" } }, - "nixpkgs_103": { + "nixpkgs_104": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -13056,7 +13230,7 @@ "type": "github" } }, - "nixpkgs_104": { + "nixpkgs_105": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -13071,7 +13245,7 @@ "type": "github" } }, - "nixpkgs_105": { + "nixpkgs_106": { "locked": { "lastModified": 1653920503, "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", @@ -13087,7 +13261,7 @@ "type": "github" } }, - "nixpkgs_106": { + "nixpkgs_107": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -13660,6 +13834,22 @@ } }, "nixpkgs_44": { + "locked": { + "lastModified": 1677063315, + "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "988cc958c57ce4350ec248d2d53087777f9e1949", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_45": { "locked": { "lastModified": 1646470760, "narHash": "sha256-dQISyucVCCPaFioUhy5ZgfBz8rOMKGI8k13aPDFTqEs=", @@ -13675,7 +13865,7 @@ "type": "github" } }, - "nixpkgs_45": { + "nixpkgs_46": { "locked": { "lastModified": 1619531122, "narHash": "sha256-ovm5bo6PkZzNKh2YGXbRKYIjega0EjiEP0YDwyeXEYU=", @@ -13689,7 +13879,7 @@ "type": "indirect" } }, - "nixpkgs_46": { + "nixpkgs_47": { "locked": { "lastModified": 1656461576, "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=", @@ -13705,7 +13895,7 @@ "type": "github" } }, - "nixpkgs_47": { + "nixpkgs_48": { "locked": { "lastModified": 1655567057, "narHash": "sha256-Cc5hQSMsTzOHmZnYm8OSJ5RNUp22bd5NADWLHorULWQ=", @@ -13719,7 +13909,7 @@ "type": "indirect" } }, - "nixpkgs_48": { + "nixpkgs_49": { "locked": { "lastModified": 1656401090, "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=", @@ -13733,21 +13923,6 @@ "type": "indirect" } }, - "nixpkgs_49": { - "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" - } - }, "nixpkgs_5": { "locked": { "lastModified": 1673796341, @@ -13765,6 +13940,21 @@ } }, "nixpkgs_50": { + "locked": { + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" + } + }, + "nixpkgs_51": { "locked": { "lastModified": 1671417167, "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", @@ -13780,7 +13970,7 @@ "type": "github" } }, - "nixpkgs_51": { + "nixpkgs_52": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -13796,7 +13986,7 @@ "type": "github" } }, - "nixpkgs_52": { + "nixpkgs_53": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -13812,7 +14002,7 @@ "type": "github" } }, - "nixpkgs_53": { + "nixpkgs_54": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -13827,7 +14017,7 @@ "type": "github" } }, - "nixpkgs_54": { + "nixpkgs_55": { "locked": { "lastModified": 1674407282, "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", @@ -13843,7 +14033,7 @@ "type": "github" } }, - "nixpkgs_55": { + "nixpkgs_56": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -13859,7 +14049,7 @@ "type": "github" } }, - "nixpkgs_56": { + "nixpkgs_57": { "locked": { "lastModified": 1648219316, "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", @@ -13873,7 +14063,7 @@ "type": "indirect" } }, - "nixpkgs_57": { + "nixpkgs_58": { "locked": { "lastModified": 1642336556, "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", @@ -13887,7 +14077,7 @@ "type": "indirect" } }, - "nixpkgs_58": { + "nixpkgs_59": { "locked": { "lastModified": 1641521701, "narHash": "sha256-IuW+4EqqKjNdJ4yO0Qr8k63OkyV1TaF5vsrZzU3GCfI=", @@ -13903,20 +14093,6 @@ "type": "github" } }, - "nixpkgs_59": { - "locked": { - "lastModified": 1619531122, - "narHash": "sha256-ovm5bo6PkZzNKh2YGXbRKYIjega0EjiEP0YDwyeXEYU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bb80d578e8ad3cb5a607f468ac00cc546d0396dc", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_6": { "locked": { "lastModified": 1642451377, @@ -13933,6 +14109,20 @@ } }, "nixpkgs_60": { + "locked": { + "lastModified": 1619531122, + "narHash": "sha256-ovm5bo6PkZzNKh2YGXbRKYIjega0EjiEP0YDwyeXEYU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bb80d578e8ad3cb5a607f468ac00cc546d0396dc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_61": { "locked": { "lastModified": 1641521701, "narHash": "sha256-IuW+4EqqKjNdJ4yO0Qr8k63OkyV1TaF5vsrZzU3GCfI=", @@ -13948,7 +14138,7 @@ "type": "github" } }, - "nixpkgs_61": { + "nixpkgs_62": { "locked": { "lastModified": 1641577433, "narHash": "sha256-T7lS8vpbC3dgtrkb2ueC9HWaX4RYUwdP7IEttnvKQ8Y=", @@ -13964,7 +14154,7 @@ "type": "github" } }, - "nixpkgs_62": { + "nixpkgs_63": { "locked": { "lastModified": 1641521701, "narHash": "sha256-IuW+4EqqKjNdJ4yO0Qr8k63OkyV1TaF5vsrZzU3GCfI=", @@ -13978,7 +14168,7 @@ "type": "indirect" } }, - "nixpkgs_63": { + "nixpkgs_64": { "locked": { "lastModified": 1646331602, "narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=", @@ -13994,7 +14184,7 @@ "type": "github" } }, - "nixpkgs_64": { + "nixpkgs_65": { "locked": { "lastModified": 1643381941, "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", @@ -14010,7 +14200,7 @@ "type": "github" } }, - "nixpkgs_65": { + "nixpkgs_66": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -14025,7 +14215,7 @@ "type": "indirect" } }, - "nixpkgs_66": { + "nixpkgs_67": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -14040,7 +14230,7 @@ "type": "indirect" } }, - "nixpkgs_67": { + "nixpkgs_68": { "locked": { "lastModified": 1644486793, "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", @@ -14056,7 +14246,7 @@ "type": "github" } }, - "nixpkgs_68": { + "nixpkgs_69": { "locked": { "lastModified": 1660438583, "narHash": "sha256-rJUTYxFKlWUJI3njAwEc1pKAVooAViZGJvsgqfh/q/E=", @@ -14071,38 +14261,38 @@ "type": "github" } }, - "nixpkgs_69": { + "nixpkgs_7": { "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "lastModified": 1674091526, + "narHash": "sha256-eLhLKOpF1ix5xZeFF9g8uE1stdyxuBLJvWQ20gLbDto=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "rev": "fc5b90fd72177d9bcf435b10c12bb943549748c6", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-22.11-small", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_70": { "locked": { - "lastModified": 1674091526, - "narHash": "sha256-eLhLKOpF1ix5xZeFF9g8uE1stdyxuBLJvWQ20gLbDto=", + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc5b90fd72177d9bcf435b10c12bb943549748c6", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11-small", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_70": { + "nixpkgs_71": { "locked": { "lastModified": 1664328665, "narHash": "sha256-MVUhaUYwzrmzD/RzTBEGIpYBmncP3JNvZMjGyXtuX/w=", @@ -14118,7 +14308,7 @@ "type": "github" } }, - "nixpkgs_71": { + "nixpkgs_72": { "locked": { "lastModified": 1658311025, "narHash": "sha256-GqagY5YmaZB3YaO41kKcQhe5RcpS83wnsW8iCu5Znqo=", @@ -14134,7 +14324,7 @@ "type": "github" } }, - "nixpkgs_72": { + "nixpkgs_73": { "locked": { "lastModified": 1668504765, "narHash": "sha256-53JeBXa/p1L3FCN8SftDViceKuhw9UaOWXJgG0QQ6PY=", @@ -14149,7 +14339,7 @@ "type": "github" } }, - "nixpkgs_73": { + "nixpkgs_74": { "locked": { "lastModified": 1632864508, "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", @@ -14164,7 +14354,7 @@ "type": "indirect" } }, - "nixpkgs_74": { + "nixpkgs_75": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -14180,7 +14370,7 @@ "type": "github" } }, - "nixpkgs_75": { + "nixpkgs_76": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -14195,7 +14385,7 @@ "type": "github" } }, - "nixpkgs_76": { + "nixpkgs_77": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -14211,7 +14401,7 @@ "type": "github" } }, - "nixpkgs_77": { + "nixpkgs_78": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -14227,7 +14417,7 @@ "type": "github" } }, - "nixpkgs_78": { + "nixpkgs_79": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -14242,39 +14432,39 @@ "type": "github" } }, - "nixpkgs_79": { + "nixpkgs_8": { "locked": { - "lastModified": 1653920503, - "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", + "lastModified": 1671313200, + "narHash": "sha256-itZTrtHeDJjV696+ur0/TzkTqb5y3Eb57WRLRPK3rwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", + "rev": "0938d73bb143f4ae037143572f11f4338c7b2d1c", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_80": { "locked": { - "lastModified": 1671313200, - "narHash": "sha256-itZTrtHeDJjV696+ur0/TzkTqb5y3Eb57WRLRPK3rwA=", + "lastModified": 1653920503, + "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0938d73bb143f4ae037143572f11f4338c7b2d1c", + "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.11", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_80": { + "nixpkgs_81": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -14290,7 +14480,7 @@ "type": "github" } }, - "nixpkgs_81": { + "nixpkgs_82": { "locked": { "lastModified": 1642336556, "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", @@ -14304,7 +14494,7 @@ "type": "indirect" } }, - "nixpkgs_82": { + "nixpkgs_83": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -14320,7 +14510,7 @@ "type": "github" } }, - "nixpkgs_83": { + "nixpkgs_84": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -14335,7 +14525,7 @@ "type": "github" } }, - "nixpkgs_84": { + "nixpkgs_85": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -14351,7 +14541,7 @@ "type": "github" } }, - "nixpkgs_85": { + "nixpkgs_86": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -14366,7 +14556,7 @@ "type": "github" } }, - "nixpkgs_86": { + "nixpkgs_87": { "locked": { "lastModified": 1674407282, "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", @@ -14382,7 +14572,7 @@ "type": "github" } }, - "nixpkgs_87": { + "nixpkgs_88": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -14398,7 +14588,7 @@ "type": "github" } }, - "nixpkgs_88": { + "nixpkgs_89": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -14414,38 +14604,38 @@ "type": "github" } }, - "nixpkgs_89": { + "nixpkgs_9": { "locked": { - "lastModified": 1654807842, - "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", - "owner": "NixOS", + "lastModified": 1647350163, + "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_90": { "locked": { - "lastModified": 1647350163, - "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", - "owner": "nixos", + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_90": { + "nixpkgs_91": { "locked": { "lastModified": 1653920503, "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", @@ -14461,7 +14651,7 @@ "type": "github" } }, - "nixpkgs_91": { + "nixpkgs_92": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -14477,7 +14667,7 @@ "type": "github" } }, - "nixpkgs_92": { + "nixpkgs_93": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -14493,7 +14683,7 @@ "type": "github" } }, - "nixpkgs_93": { + "nixpkgs_94": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -14509,7 +14699,7 @@ "type": "github" } }, - "nixpkgs_94": { + "nixpkgs_95": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -14524,7 +14714,7 @@ "type": "github" } }, - "nixpkgs_95": { + "nixpkgs_96": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -14540,7 +14730,7 @@ "type": "github" } }, - "nixpkgs_96": { + "nixpkgs_97": { "locked": { "lastModified": 1653581809, "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", @@ -14556,7 +14746,7 @@ "type": "github" } }, - "nixpkgs_97": { + "nixpkgs_98": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -14571,7 +14761,7 @@ "type": "github" } }, - "nixpkgs_98": { + "nixpkgs_99": { "locked": { "lastModified": 1653920503, "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", @@ -14582,23 +14772,7 @@ }, "original": { "owner": "nixos", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_99": { - "locked": { - "lastModified": 1665087388, - "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } @@ -15086,10 +15260,10 @@ }, "openziti": { "inputs": { - "flake-compat": "flake-compat_36", + "flake-compat": "flake-compat_37", "flake-parts": "flake-parts_2", "napalm": "napalm", - "nixpkgs": "nixpkgs_101", + "nixpkgs": "nixpkgs_102", "nixpkgs-darwin": "nixpkgs-darwin", "zitiConsole": "zitiConsole" }, @@ -15239,6 +15413,29 @@ "type": "github" } }, + "paisano-actions_2": { + "inputs": { + "nixpkgs": [ + "cardano-node", + "std", + "paisano-mdbook-preprocessor", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677306424, + "narHash": "sha256-H9/dI2rGEbKo4KEisqbRPHFG2ajF8Tm111NPdKGIf28=", + "owner": "paisano-nix", + "repo": "actions", + "rev": "65ec4e080b3480167fc1a748c89a05901eea9a9b", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "repo": "actions", + "type": "github" + } + }, "paisano-mdbook-preprocessor": { "inputs": { "crane": "crane", @@ -15268,6 +15465,35 @@ "type": "github" } }, + "paisano-mdbook-preprocessor_2": { + "inputs": { + "crane": "crane_2", + "fenix": "fenix_4", + "nixpkgs": [ + "cardano-node", + "std", + "nixpkgs" + ], + "paisano-actions": "paisano-actions_2", + "std": [ + "cardano-node", + "std" + ] + }, + "locked": { + "lastModified": 1680654400, + "narHash": "sha256-Qdpio+ldhUK3zfl22Mhf8HUULdUOJXDWDdO7MIK69OU=", + "owner": "paisano-nix", + "repo": "mdbook-paisano-preprocessor", + "rev": "11a8fc47f574f194a7ae7b8b98001f6143ba4cf1", + "type": "github" + }, + "original": { + "owner": "paisano-nix", + "repo": "mdbook-paisano-preprocessor", + "type": "github" + } + }, "paisano-tui": { "inputs": { "nixpkgs": [ @@ -15325,7 +15551,17 @@ } }, "paisano-tui_3": { - "flake": false, + "inputs": { + "nixpkgs": [ + "cardano-node", + "std", + "blank" + ], + "std": [ + "cardano-node", + "std" + ] + }, "locked": { "lastModified": 1681847764, "narHash": "sha256-mdd7PJW1BZvxy0cIKsPfAO+ohVl/V7heE5ZTAHzTdv8=", @@ -15375,7 +15611,6 @@ }, "paisano_3": { "inputs": { - "call-flake": "call-flake", "nixpkgs": [ "cardano-node", "std", @@ -15389,15 +15624,16 @@ ] }, "locked": { - "lastModified": 1688099125, - "narHash": "sha256-j6LMz00orEKZrQb14wRRw7kMLm+aj7zBJt05AY4UcRI=", + "lastModified": 1686862844, + "narHash": "sha256-m8l/HpRBJnZ3c0F1u0IyQ3nYGWE0R9V5kfORuqZPzgk=", "owner": "paisano-nix", "repo": "core", - "rev": "10270dc46532c947de473ee88c8f5a3346a396fb", + "rev": "6674b3d3577212c1eeecd30d62d52edbd000e726", "type": "github" }, "original": { "owner": "paisano-nix", + "ref": "0.1.1", "repo": "core", "type": "github" } @@ -15428,7 +15664,7 @@ }, "poetry2nix_2": { "inputs": { - "flake-utils": "flake-utils_48", + "flake-utils": "flake-utils_50", "nixpkgs": [ "explorer-cardano-graphql", "bitte-cells", @@ -15489,8 +15725,8 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-utils": "flake-utils_30", - "nixpkgs": "nixpkgs_45" + "flake-utils": "flake-utils_32", + "nixpkgs": "nixpkgs_46" }, "locked": { "lastModified": 1639823344, @@ -15508,8 +15744,8 @@ }, "pre-commit-hooks_3": { "inputs": { - "flake-utils": "flake-utils_40", - "nixpkgs": "nixpkgs_59" + "flake-utils": "flake-utils_42", + "nixpkgs": "nixpkgs_60" }, "locked": { "lastModified": 1639823344, @@ -15591,7 +15827,7 @@ "explorer-cardano-ops": "explorer-cardano-ops", "explorer-cardano-rosetta": "explorer-cardano-rosetta", "explorer-ogmios": "explorer-ogmios", - "flake-compat": "flake-compat_34", + "flake-compat": "flake-compat_35", "hackage": "hackage_14", "haskell-nix": "haskell-nix_3", "iohk-nix": "iohk-nix", @@ -15666,6 +15902,23 @@ "type": "github" } }, + "rust-analyzer-src_4": { + "flake": false, + "locked": { + "lastModified": 1677221702, + "narHash": "sha256-1M+58rC4eTCWNmmX0hQVZP20t3tfYNunl9D/PrGUyGE=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "f5401f620699b26ed9d47a1d2e838143a18dbe3b", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "flake-utils": [ @@ -15751,6 +16004,37 @@ "type": "github" } }, + "rust-overlay_4": { + "inputs": { + "flake-utils": [ + "cardano-node", + "std", + "paisano-mdbook-preprocessor", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "cardano-node", + "std", + "paisano-mdbook-preprocessor", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675391458, + "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "secp256k1": { "flake": false, "locked": { @@ -16224,9 +16508,9 @@ "std_10": { "inputs": { "blank": "blank_9", - "devshell": "devshell_19", + "devshell": "devshell_20", "dmerge": "dmerge_10", - "flake-utils": "flake-utils_65", + "flake-utils": "flake-utils_67", "makes": [ "explorer-cardano-rosetta", "tullia", @@ -16240,9 +16524,9 @@ "std", "blank" ], - "n2c": "n2c_10", - "nixago": "nixago_9", - "nixpkgs": "nixpkgs_91", + "n2c": "n2c_11", + "nixago": "nixago_10", + "nixpkgs": "nixpkgs_92", "yants": "yants_13" }, "locked": { @@ -16269,9 +16553,9 @@ "blank" ], "blank": "blank_10", - "devshell": "devshell_20", + "devshell": "devshell_21", "dmerge": "dmerge_11", - "flake-utils": "flake-utils_70", + "flake-utils": "flake-utils_72", "incl": "incl_6", "makes": [ "explorer-ogmios", @@ -16287,9 +16571,9 @@ "std", "blank" ], - "n2c": "n2c_11", - "nixago": "nixago_10", - "nixpkgs": "nixpkgs_95", + "n2c": "n2c_12", + "nixago": "nixago_11", + "nixpkgs": "nixpkgs_96", "nosys": "nosys_6", "yants": "yants_14" }, @@ -16310,9 +16594,9 @@ "std_12": { "inputs": { "blank": "blank_11", - "devshell": "devshell_21", + "devshell": "devshell_22", "dmerge": "dmerge_12", - "flake-utils": "flake-utils_72", + "flake-utils": "flake-utils_74", "makes": [ "explorer-ogmios", "tullia", @@ -16326,9 +16610,9 @@ "std", "blank" ], - "n2c": "n2c_12", - "nixago": "nixago_11", - "nixpkgs": "nixpkgs_99", + "n2c": "n2c_13", + "nixago": "nixago_12", + "nixpkgs": "nixpkgs_100", "yants": "yants_15" }, "locked": { @@ -16352,9 +16636,9 @@ "blank" ], "blank": "blank_12", - "devshell": "devshell_22", + "devshell": "devshell_23", "dmerge": "dmerge_13", - "flake-utils": "flake-utils_76", + "flake-utils": "flake-utils_78", "incl": "incl_7", "makes": [ "std", @@ -16364,9 +16648,9 @@ "std", "blank" ], - "n2c": "n2c_13", - "nixago": "nixago_12", - "nixpkgs": "nixpkgs_102", + "n2c": "n2c_14", + "nixago": "nixago_13", + "nixpkgs": "nixpkgs_103", "nosys": "nosys_7", "yants": "yants_16" }, @@ -16392,9 +16676,9 @@ "blank" ], "blank": "blank_13", - "devshell": "devshell_23", + "devshell": "devshell_24", "dmerge": "dmerge_14", - "flake-utils": "flake-utils_78", + "flake-utils": "flake-utils_80", "incl": "incl_8", "makes": [ "tullia", @@ -16406,9 +16690,9 @@ "std", "blank" ], - "n2c": "n2c_14", - "nixago": "nixago_13", - "nixpkgs": "nixpkgs_106", + "n2c": "n2c_15", + "nixago": "nixago_14", + "nixpkgs": "nixpkgs_107", "nosys": "nosys_8", "yants": "yants_17" }, @@ -16507,12 +16791,9 @@ "blank" ], "blank": "blank_4", - "devshell": [ - "cardano-node", - "std", - "blank" - ], + "devshell": "devshell_10", "dmerge": "dmerge_4", + "flake-utils": "flake-utils_29", "haumea": "haumea", "incl": "incl_3", "makes": [ @@ -16525,32 +16806,20 @@ "std", "blank" ], - "n2c": [ - "cardano-node", - "std", - "blank" - ], - "nixago": [ - "cardano-node", - "std", - "blank" - ], + "n2c": "n2c_5", + "nixago": "nixago_4", "nixpkgs": "nixpkgs_43", "paisano": "paisano_3", + "paisano-mdbook-preprocessor": "paisano-mdbook-preprocessor_2", "paisano-tui": "paisano-tui_3", - "terranix": [ - "cardano-node", - "std", - "blank" - ], "yants": "yants_6" }, "locked": { - "lastModified": 1689337213, - "narHash": "sha256-qa0B38ihDW1MuAshwgvlbkk3CgheWlvYr35oMpDrxJs=", + "lastModified": 1687300684, + "narHash": "sha256-oBqbss0j+B568GoO3nF2BCoPEgPxUjxfZQGynW6mhEk=", "owner": "divnix", "repo": "std", - "rev": "17dc4eb9587517397dad00617b020769fece3cfe", + "rev": "80e5792eae98353a97ab1e85f3fba2784e4a3690", "type": "github" }, "original": { @@ -16568,9 +16837,9 @@ "blank" ], "blank": "blank_5", - "devshell": "devshell_10", + "devshell": "devshell_11", "dmerge": "dmerge_5", - "flake-utils": "flake-utils_36", + "flake-utils": "flake-utils_38", "incl": "incl_4", "makes": [ "explorer-cardano-db-sync", @@ -16584,9 +16853,9 @@ "std", "blank" ], - "n2c": "n2c_5", - "nixago": "nixago_4", - "nixpkgs": "nixpkgs_55", + "n2c": "n2c_6", + "nixago": "nixago_5", + "nixpkgs": "nixpkgs_56", "nosys": "nosys_4", "yants": "yants_7" }, @@ -16606,12 +16875,12 @@ }, "std_6": { "inputs": { - "devshell": "devshell_15", + "devshell": "devshell_16", "dmerge": "dmerge_6", - "flake-utils": "flake-utils_50", + "flake-utils": "flake-utils_52", "mdbook-kroki-preprocessor": "mdbook-kroki-preprocessor_2", - "nixago": "nixago_5", - "nixpkgs": "nixpkgs_71", + "nixago": "nixago_6", + "nixpkgs": "nixpkgs_72", "yants": "yants_9" }, "locked": { @@ -16631,9 +16900,9 @@ "std_7": { "inputs": { "blank": "blank_6", - "devshell": "devshell_16", + "devshell": "devshell_17", "dmerge": "dmerge_7", - "flake-utils": "flake-utils_54", + "flake-utils": "flake-utils_56", "makes": [ "explorer-cardano-graphql", "haskellNix", @@ -16649,9 +16918,9 @@ "std", "blank" ], - "n2c": "n2c_7", - "nixago": "nixago_6", - "nixpkgs": "nixpkgs_76", + "n2c": "n2c_8", + "nixago": "nixago_7", + "nixpkgs": "nixpkgs_77", "yants": "yants_10" }, "locked": { @@ -16671,9 +16940,9 @@ "std_8": { "inputs": { "blank": "blank_7", - "devshell": "devshell_17", + "devshell": "devshell_18", "dmerge": "dmerge_8", - "flake-utils": "flake-utils_57", + "flake-utils": "flake-utils_59", "makes": [ "explorer-cardano-graphql", "tullia", @@ -16687,9 +16956,9 @@ "std", "blank" ], - "n2c": "n2c_8", - "nixago": "nixago_7", - "nixpkgs": "nixpkgs_80", + "n2c": "n2c_9", + "nixago": "nixago_8", + "nixpkgs": "nixpkgs_81", "yants": "yants_11" }, "locked": { @@ -16715,9 +16984,9 @@ "blank" ], "blank": "blank_8", - "devshell": "devshell_18", + "devshell": "devshell_19", "dmerge": "dmerge_9", - "flake-utils": "flake-utils_63", + "flake-utils": "flake-utils_65", "incl": "incl_5", "makes": [ "explorer-cardano-node", @@ -16731,9 +17000,9 @@ "std", "blank" ], - "n2c": "n2c_9", - "nixago": "nixago_8", - "nixpkgs": "nixpkgs_87", + "n2c": "n2c_10", + "nixago": "nixago_9", + "nixpkgs": "nixpkgs_88", "nosys": "nosys_5", "yants": "yants_12" }, @@ -16886,6 +17155,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tailwind-haskell": { "inputs": { "flake-compat": "flake-compat_6", @@ -16910,8 +17194,8 @@ }, "tailwind-haskell_2": { "inputs": { - "flake-utils": "flake-utils_31", - "nixpkgs": "nixpkgs_48" + "flake-utils": "flake-utils_33", + "nixpkgs": "nixpkgs_49" }, "locked": { "lastModified": 1654211622, @@ -16930,9 +17214,9 @@ }, "tailwind-haskell_3": { "inputs": { - "flake-compat": "flake-compat_20", - "flake-utils": "flake-utils_42", - "nixpkgs": "nixpkgs_61", + "flake-compat": "flake-compat_21", + "flake-utils": "flake-utils_44", + "nixpkgs": "nixpkgs_62", "tailwind-nix": "tailwind-nix_2" }, "locked": { @@ -16972,9 +17256,9 @@ }, "tailwind-nix_2": { "inputs": { - "flake-compat": "flake-compat_21", - "flake-utils": "flake-utils_43", - "nixpkgs": "nixpkgs_62" + "flake-compat": "flake-compat_22", + "flake-utils": "flake-utils_45", + "nixpkgs": "nixpkgs_63" }, "locked": { "lastModified": 1641667991, @@ -17075,7 +17359,7 @@ "inputs": { "nix-nomad": "nix-nomad_10", "nix2container": "nix2container_12", - "nixpkgs": "nixpkgs_105", + "nixpkgs": "nixpkgs_106", "std": "std_14" }, "locked": { @@ -17121,7 +17405,7 @@ "inputs": { "nix-nomad": "nix-nomad_3", "nix2container": "nix2container_4", - "nixpkgs": "nixpkgs_54", + "nixpkgs": "nixpkgs_55", "std": "std_5" }, "locked": { @@ -17167,7 +17451,7 @@ "inputs": { "nix-nomad": "nix-nomad_5", "nix2container": "nix2container_6", - "nixpkgs": "nixpkgs_79", + "nixpkgs": "nixpkgs_80", "std": "std_8" }, "locked": { @@ -17188,7 +17472,7 @@ "inputs": { "nix-nomad": "nix-nomad_6", "nix2container": "nix2container_8", - "nixpkgs": "nixpkgs_86", + "nixpkgs": "nixpkgs_87", "std": "std_9" }, "locked": { @@ -17209,7 +17493,7 @@ "inputs": { "nix-nomad": "nix-nomad_7", "nix2container": "nix2container_9", - "nixpkgs": "nixpkgs_90", + "nixpkgs": "nixpkgs_91", "std": "std_10" }, "locked": { @@ -17255,7 +17539,7 @@ "inputs": { "nix-nomad": "nix-nomad_9", "nix2container": "nix2container_11", - "nixpkgs": "nixpkgs_98", + "nixpkgs": "nixpkgs_99", "std": "std_12" }, "locked": { @@ -18072,7 +18356,7 @@ }, "yants_8": { "inputs": { - "nixpkgs": "nixpkgs_68" + "nixpkgs": "nixpkgs_69" }, "locked": { "lastModified": 1660507851, From e4ab570d588a8626beeb952264587da1c4625df6 Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Tue, 18 Jul 2023 16:08:30 -0300 Subject: [PATCH 10/13] fixed build errors --- cabal.project | 34 ++++---- nix/cloud/kv/vault/faucet/sanchonet.enc.json | 83 +++++++++++++++++++ src/cardano-faucet/cardano-faucet.cabal | 8 +- src/cardano-faucet/src/Cardano/Faucet.hs | 8 +- .../src/Cardano/Faucet/TxUtils.hs | 4 +- .../src/Cardano/Faucet/Types.hs | 6 +- src/cardano-faucet/src/Cardano/Faucet/Web.hs | 2 +- 7 files changed, 111 insertions(+), 34 deletions(-) create mode 100644 nix/cloud/kv/vault/faucet/sanchonet.enc.json diff --git a/cabal.project b/cabal.project index 9dafd89c75..3356539dbf 100644 --- a/cabal.project +++ b/cabal.project @@ -1,5 +1,7 @@ -- run `nix flake lock --update-input hackage` after updating index-state. -index-state: 2023-07-18T00:00:00Z +index-state: + , hackage.haskell.org 2023-07-10T14:55:34Z + , cardano-haskell-packages 2023-07-16T00:00:00Z repository cardano-haskell-packages url: https://input-output-hk.github.io/cardano-haskell-packages @@ -19,22 +21,22 @@ allow-newer: *:aeson, monoidal-containers:aeson, size-based:template-haskell, - attoparsec + attoparsec, + text constraints: - -- needed to make cardano-cli compile, as cardano-ping - -- changed the `logger` signature. - cardano-ping < 0.2 + -- needed to make cardano-cli compile + optparse-applicative-fork == 0.16.1.0 test-show-details: direct source-repository-package - type: git - location: https://github.com/input-output-hk/cardano-addresses - tag: 5ceb877c46a9dde9bde2032dbf94ed6dd84626a5 - --sha256: 0hyvzr4jypl67lzfqq9hd354w4nrl0510fcsmqr6fgaik46j8pc9 - subdir: command-line - core + type: git + location: https://github.com/input-output-hk/cardano-addresses + tag: 5565de283c5fcbb387267d0cd11ec6a742922096 + --sha256: sha256-C9RNV0NQTVxK0ExtZh1UOFhcgihvmlTWSVVppER/BXc= + subdir: command-line + core -- TODO This is a compatibility shim to make it easier for our library dependencies to -- be compatible with both aeson 1 & 2. Once downstream projects are all upgraded to @@ -44,14 +46,8 @@ source-repository-package source-repository-package type: git location: https://github.com/haskell-works/hw-aeson - tag: d99d2f3e39a287607418ae605b132a3deb2b753f - --sha256: 1vxqcwjg9q37wbwi27y9ba5163lzfz51f1swbi0rp681yg63zvn4 - ---source-repository-package --- type: git --- location: https://github.com/haskell/aeson --- tag: fa1370c56eb8fa95177ccfdd8cf860db95a92735 --- --sha256: sha256-Vee9DcH1iprImDRUOnKDARflWCz2WsxokSzgpzVBvAA= + tag: ba7c1e41c6e54d6bf9fd1cd013489ac713fc3153 + --sha256: 1czyn0whgv7czzgwn5y1zgwlkb9p9sn9z9sc9gixrjprcyc0p15p package cryptonite -- Using RDRAND instead of /dev/urandom as an entropy source for key diff --git a/nix/cloud/kv/vault/faucet/sanchonet.enc.json b/nix/cloud/kv/vault/faucet/sanchonet.enc.json new file mode 100644 index 0000000000..11f3cfd4e5 --- /dev/null +++ b/nix/cloud/kv/vault/faucet/sanchonet.enc.json @@ -0,0 +1,83 @@ +{ + "debug": "ENC[AES256_GCM,data:KK8tKbY=,iv:Ky4J3v9K18X97pHBKyG93Loz8OABcTiKGHQ1XxkqEaQ=,tag:8gritm4u+CkD2brW/LcGBw==,type:bool]", + "api_keys": [ + { + "api_key": "ENC[AES256_GCM,data:Y7K7gb6EaPbfvROUshWn2x8yY/qFZ8Ern78z3Khi3q8=,iv:G3CyistzO1QB4HZlfoO71I0h1Izbj+T7AtITxMG4C0A=,tag:IBauLu3CNly6D6Cvb85NTQ==,type:str]", + "lovelace": "ENC[AES256_GCM,data:OJnERY+9ry4Iq8w=,iv:F2AzvOPU+PZgKfB8SN5BMv5VbotwKmeTVeCjf8VJQqI=,tag:l08VMwFQ+G7Legc47hiJlg==,type:float]", + "rate_limit": "ENC[AES256_GCM,data:wtM=,iv:K5JUlpnA8SM/irHnmGB1m15CfcdfMXOpvwIoeBIfPm8=,tag:ygjWc/RewcA/6b8wFTWIXA==,type:float]", + "delegate": "ENC[AES256_GCM,data:cokbaw==,iv:ytTHiOF4zXLSGL73kq+6w2cDvlSFk4lmui7vB2pIkDg=,tag:aqGXty25FvjxgO3AzX0M+Q==,type:bool]" + }, + { + "api_key": "ENC[AES256_GCM,data:mH5K3VpNCVtVGp0tTWuJfyyQ65z4yRV2BlUXLsX0QFg=,iv:OpHJt/oTwoceO2z080RXnPhM4NSnqUCAsfGWlc7sP2c=,tag:xJ3wX4jZz8Ao5A+Dp+UD/g==,type:str]", + "lovelace": "ENC[AES256_GCM,data:OJnERY+9ry4Iq8w=,iv:F2AzvOPU+PZgKfB8SN5BMv5VbotwKmeTVeCjf8VJQqI=,tag:l08VMwFQ+G7Legc47hiJlg==,type:float]", + "rate_limit": "ENC[AES256_GCM,data:szcphTk=,iv:Tt5jZnHwApu2W8NpFkD5nN7kiip7HzM6Q9Lf821DuMc=,tag:u1mOGH2kjh1a0jPQZINSZA==,type:float]", + "delegate": "ENC[AES256_GCM,data:cokbaw==,iv:ytTHiOF4zXLSGL73kq+6w2cDvlSFk4lmui7vB2pIkDg=,tag:aqGXty25FvjxgO3AzX0M+Q==,type:bool]" + } + ], + "recaptcha_limits": { + "default": { + "api_key": "ENC[AES256_GCM,data:S2KSpxMj,iv:8kEnRKUYmCkUko/cv6oRJu0sdgseLlL7rJDDov2YrDs=,tag:xikCp88MSf2ay06tRWGPZA==,type:str]", + "lovelace": "ENC[AES256_GCM,data:KZiocsgYCvDT8JA=,iv:fHDPY9eVnJfEmQqK1SOvOVEUoa2oC81ONTYQx0bRzvk=,tag:Bk9janSUwXF82uO04TsUVg==,type:float]", + "rate_limit": "ENC[AES256_GCM,data:qRWV8l4=,iv:ok4Ad3iJoXaoW02qN64r1Pnjimz9FrToTUe8WFtHEd8=,tag:uP6rxJ0AIt8js7cSHysYAw==,type:float]", + "delegate": "ENC[AES256_GCM,data:624a/w==,iv:CoTKkDt3oT1x7UB50qKbinzmn9zKKztKdkXKp5IGSRg=,tag:enShq1zW6wV5tqCDp4Rv9g==,type:bool]" + } + }, + "max_stake_key_index": "ENC[AES256_GCM,data:tGrg,iv:8tMwIkQxPPWLDDCscD3mG0w/RI00sDPm0gmtCBYdBB8=,tag:6Q8Ja0jtrV36gZvGxW0HSA==,type:float]", + "delegation_utxo_size": "ENC[AES256_GCM,data:drA=,iv:x2n1zpuR09/1wPu16X3WrRLpHqjKMOp6YnkielAsS+U=,tag:cHf24eTo6P1VfdRvOTGi5g==,type:float]", + "mnemonic": [ + "ENC[AES256_GCM,data:oUPIXhwL,iv:KmbOh9Av7zIRgrnM/TND3lz+xrocZIucSACFXq/MOus=,tag:eNYkgz+kUAfFCkFcc5QXAw==,type:str]", + "ENC[AES256_GCM,data:2tFnN3qPgg==,iv:37M2fwURwxmJzPNyUAFbUOYR+7+mXcSmIt2J309ewVA=,tag:GZepmNu3RDxcDa2kZNZX+A==,type:str]", + "ENC[AES256_GCM,data:vb0kYg==,iv:f8TeEGCZVDYMZTZzfy3FUkO68Xm5SCx5Sy1GRifrolM=,tag:g/WGd+k1/DVLk5EWLjzoog==,type:str]", + "ENC[AES256_GCM,data:r/8ICCHk,iv:HKjMEHwc3jHfCRcOfaqHdp/jx/BFymE0fTYaI1Mg6/Q=,tag:xSTMFuDgvLOF/DNBB27S5w==,type:str]", + "ENC[AES256_GCM,data:GUIU,iv:MgZMIyBUXZ3DDkShzpt0l8T9VlzcKsIgOueztPF1stE=,tag:oJuMbaZKiVQ+UFqm7txq3Q==,type:str]", + "ENC[AES256_GCM,data:QuO3jppZvw==,iv:h+Zci0q9ae419A7Pr0Ht5NDLfMKLvaLLiHljQr9pwT0=,tag:+Us4uAtDZJNDzWXlozWm2Q==,type:str]", + "ENC[AES256_GCM,data:K1g5,iv:pyeaFvagRpkfdo+Y9B9xP93q6wG0eUeun7j9gobFyKo=,tag:1A3FisJVJgN5+Ll1iyeX/Q==,type:str]", + "ENC[AES256_GCM,data:3BKdwBo=,iv:a5azlZDj8lmrjUK35cBW0ZHHaKr0uneyO8MvMSsmdXE=,tag:NSTkGjGpNefsJqjnicKBaQ==,type:str]", + "ENC[AES256_GCM,data:pKrX,iv:qEWHdQYc17NcmBOdMuq00wMMmWC+gyz49fCua7Cv6Yo=,tag:mKKGTWosuQOaMUHtF9nKIA==,type:str]", + "ENC[AES256_GCM,data:5vsshPo=,iv:sVhv6aIhiDPNvb/Q0ncBfLMGuqtcMz8GCZB/EZraxE8=,tag:ixWM8UmiX9Ed/aMyIGq2ag==,type:str]", + "ENC[AES256_GCM,data:A6AE0k/x,iv:NH5P/TrH9S39SJfAT1Otq/jDII3TOMusGunh2crNv8Y=,tag:5iak2JnHwuSc7IdsJJjgkg==,type:str]", + "ENC[AES256_GCM,data:c2J7Nw==,iv:/8uXuuXOh6XGMQwjY4dEQhwELMCVhbU2OCi8naQJ8kM=,tag:jk4pLanAnlTFfy1Gxj8z1g==,type:str]", + "ENC[AES256_GCM,data:A6AE0k/x,iv:NH5P/TrH9S39SJfAT1Otq/jDII3TOMusGunh2crNv8Y=,tag:5iak2JnHwuSc7IdsJJjgkg==,type:str]", + "ENC[AES256_GCM,data:kR17jkISOQ==,iv:YRHMqQn+2YtiZU/agwpWNxfNCAQeadYNftq6W7Z+3R0=,tag:z18jCn/y/5f5jHLEPuYsCA==,type:str]", + "ENC[AES256_GCM,data:5PdLUDY=,iv:kiNo4umqIpb7cMyKzfbQwSlCl2OkeSjP8lbsqTqimj4=,tag:ChDjpc4KA1cUHsvC8pkdmQ==,type:str]", + "ENC[AES256_GCM,data:IzYu+eU=,iv:uObEZ+BrM7+GBf9+pEPNWr8HIite0iA020+9VikuMcQ=,tag:7H4NlOxvmKlxTl3cBWk8MA==,type:str]", + "ENC[AES256_GCM,data:DsHsvl1jeA==,iv:ZKVVUJpvjV2VmUd2OwGxlQGbZgGBko95n10JOOMvu8Y=,tag:PW0bXRSsdrw8P2utm47Sdw==,type:str]", + "ENC[AES256_GCM,data:qS0gPQ==,iv:0QkH1xTFYEzksSxCZbcTzRVQNHr7B1wcXgf+zKA4MWs=,tag:uFkCENGfZDBLgD5zMgS5gQ==,type:str]", + "ENC[AES256_GCM,data:ZFFkB9w4Aw==,iv:Zra0LGRqVfO7QYi6lgTv7Sf/+Z6GqmhhGCzlpDELWLE=,tag:4sbpywKj7Bvv9TCpbzt78w==,type:str]", + "ENC[AES256_GCM,data:tiusG5o=,iv:/+Hd4nRinvLdGcivmBRqSQBkCdgZmmLVkUQIZY/FImk=,tag:MeSLL5YClzcBJ2ii2yITbQ==,type:str]", + "ENC[AES256_GCM,data:gffk7Q==,iv:8q4y9n644AXcLuBPpX9mxWYNizRcaBRyQ71OmB8FbKY=,tag:aFaf+m/uyDTUWIcfFzEyAA==,type:str]", + "ENC[AES256_GCM,data:QraUJa9g,iv:uNUC5Dy99+SJMg+bZrT2YfyuGqufEUyh1nLIWJcVbJU=,tag:hiMZ+ksZoPsew5XqSTk0YQ==,type:str]", + "ENC[AES256_GCM,data:dpOJsXc48A==,iv:3euozEhgQpDg0lGNUfFyr+NsC0QQ7SKyvqb9P/OsHT4=,tag:C8loxeTOGa9OgnkL8uWA5Q==,type:str]", + "ENC[AES256_GCM,data:Xot2d3M=,iv:WLm3ymSIhis4gLBOciIlFMbwAjwuegkKodjh7aAk52I=,tag:ohFvxpewmeUBvK4vIFtQmw==,type:str]" + ], + "network": { + "Testnet": "ENC[AES256_GCM,data:9w==,iv:o2/WdMCpmnd99sC0v2rJ4tL/gE1A5VK92MuOfefA1Ko=,tag:TI3KXE4UIX4Cazf1T7VH3w==,type:float]" + }, + "recaptcha_site_key": "ENC[AES256_GCM,data:4PAjA01CFZMsxhwIQtOtrUZQ0/00aX0RzeNzR4N/hAmQ3cHw+JO9GA==,iv:8Ke91k0NZg1rHm7GuNQkoatTxO9q8vQsGoiO/ef0SGc=,tag:GDg85mjgDM3Qv9RmmDcE0w==,type:str]", + "recaptcha_secret_key": "ENC[AES256_GCM,data:HgmJRmRFZgoX88DDwUPPGFtGx7tkdgZG6fntgnYAHii4556Say+gOA==,iv:JJUPsjmFSuuZONDoU5EtakS6J+adcmOlRFbamu4i1y4=,tag:sWFjGrcBoouR1F5tpYhx0Q==,type:str]", + "allowed_cors_origins": [ + "ENC[AES256_GCM,data:l0nmkZYTcdDS6rXUJ3jxKuXzg+UoYTsW,iv:HTyp5U96QGpj0IpzVfgdyY7NaKnRUNR8+LowzNRtgeg=,tag:PI7hIAiqHREU4z9RH7RyOQ==,type:str]", + "ENC[AES256_GCM,data:Vawb9YsEv8JiZ6AK/XMxo2DUxtyYeZJQyV8XY9C1mSAdtqGsVIdBQFOTRsU=,iv:nnVk54DLocLEr1DErUoxs9er5GxnTPBYQpzynCPQsFI=,tag:JjyqZhxwjzrkN5M50B8y9A==,type:str]" + ], + "address_index": "ENC[AES256_GCM,data:5Q==,iv:uF7WB2BYbkaqU4r00nwfuiMtnPQZWaxRtpYFWpb4dVI=,tag:ZgB0d70OgRGLMeAHi9qoVA==,type:float]", + "sops": { + "kms": null, + "gcp_kms": null, + "azure_kv": null, + "hc_vault": [ + { + "vault_address": "https://vault.world.dev.cardano.org", + "engine_path": "sops", + "key_name": "ops", + "created_at": "2022-08-12T03:21:46Z", + "enc": "vault:v1:oCUipUn/PsdW5eQYHauTjmW5oV+wfyisOraK5JiNkK/LVlT4iY28fEbSX0uI0kQvgVLPkE4VSJTXDG7a" + } + ], + "age": null, + "lastmodified": "2023-07-18T19:04:24Z", + "mac": "ENC[AES256_GCM,data:FX0NFPrWoQglwlSd81p6bclOZR2h7+brcRfH+A87pHBDnocV+IqDcFEiYgSsw22hsYRR8bNO+fU7T5TOmOibB8MtLE2cQrGXUGQxZ/5LojgZZKSuOX2XlwTR0QI+U+tgobGYnwGgy0LgWTD0Qll/Mcs9jpxmiNp21eDU/OCCq5A=,iv:oOyxfT8qGQG4xtJ1BQW582//8x7z+O8/XefUKZ526Vw=,tag:7xxO4fU1zRNFo2T66inATg==,type:str]", + "pgp": null, + "unencrypted_suffix": "_unencrypted", + "version": "3.7.3" + } +} \ No newline at end of file diff --git a/src/cardano-faucet/cardano-faucet.cabal b/src/cardano-faucet/cardano-faucet.cabal index a2cec0ac1c..2c17dc9c2a 100644 --- a/src/cardano-faucet/cardano-faucet.cabal +++ b/src/cardano-faucet/cardano-faucet.cabal @@ -18,7 +18,7 @@ Flag unexpected_thunks Default: False common base - build-depends: base >= 4.14 && < 4.15 + build-depends: base common project-config default-language: Haskell2010 @@ -34,8 +34,6 @@ common project-config -Wredundant-constraints -Wunused-packages -Wno-orphans - -- for the cardano-cli hack below - -Wno-unused-packages common maybe-unix if !os(windows) @@ -66,10 +64,8 @@ library build-depends: aeson >= 1.5.6.0 , MissingH , bytestring - -- should be in cardano-cli - , optparse-applicative-fork == 0.16.1.0 , cardano-addresses - , cardano-api + , cardano-api == 8.8.0.0 , cardano-cli , cardano-ledger-byron , cardano-prelude diff --git a/src/cardano-faucet/src/Cardano/Faucet.hs b/src/cardano-faucet/src/Cardano/Faucet.hs index d9fef2e282..fa5189d1ff 100644 --- a/src/cardano-faucet/src/Cardano/Faucet.hs +++ b/src/cardano-faucet/src/Cardano/Faucet.hs @@ -18,7 +18,7 @@ module Cardano.Faucet (main) where import Cardano.Address.Derivation (Depth(AccountK), XPrv) import Cardano.Address.Style.Shelley (getKey, Shelley) -import Cardano.Api (TxInMode, CardanoMode, AddressAny, EraInMode, IsShelleyBasedEra, QueryInMode(QueryInEra, QueryCurrentEra), UTxO(unUTxO), QueryUTxOFilter(QueryUTxOByAddress), BlockInMode, ChainPoint, AnyCardanoEra(AnyCardanoEra), CardanoEraStyle(ShelleyBasedEra), LocalNodeConnectInfo(LocalNodeConnectInfo), LocalNodeClientProtocols(LocalNodeClientProtocols, localChainSyncClient, localStateQueryClient, localTxSubmissionClient, localTxMonitoringClient), toEraInMode, ConsensusMode(CardanoMode), QueryInEra(QueryInShelleyBasedEra), QueryInShelleyBasedEra(QueryUTxO, QueryStakeAddresses), LocalStateQueryClient(LocalStateQueryClient), ConsensusModeIsMultiEra(CardanoModeIsMultiEra), cardanoEraStyle, connectToLocalNode, LocalChainSyncClient(NoLocalChainSyncClient), SigningKey(PaymentExtendedSigningKey), getVerificationKey, Lovelace, serialiseAddress, EnvSocketError(..), ShelleyWitnessSigningKey(WitnessPaymentExtendedKey)) +import Cardano.Api (TxInMode, CardanoMode, AddressAny, EraInMode, IsShelleyBasedEra, QueryInMode(QueryInEra, QueryCurrentEra), UTxO(unUTxO), QueryUTxOFilter(QueryUTxOByAddress), BlockInMode, ChainPoint, AnyCardanoEra(AnyCardanoEra), CardanoEraStyle(ShelleyBasedEra), LocalNodeConnectInfo(LocalNodeConnectInfo), LocalNodeClientProtocols(LocalNodeClientProtocols, localChainSyncClient, localStateQueryClient, localTxSubmissionClient, localTxMonitoringClient), toEraInMode, ConsensusMode(CardanoMode), QueryInEra(QueryInShelleyBasedEra), QueryInShelleyBasedEra(QueryUTxO, QueryStakeAddresses), LocalStateQueryClient(LocalStateQueryClient), ConsensusModeIsMultiEra(CardanoModeIsMultiEra), cardanoEraStyle, connectToLocalNode, LocalChainSyncClient(NoLocalChainSyncClient), SigningKey(PaymentExtendedSigningKey), getVerificationKey, Lovelace, serialiseAddress, ShelleyWitnessSigningKey(WitnessPaymentExtendedKey), File(File)) import Cardano.Api.Byron () --import Cardano.CLI.Run.Friendly (friendlyTxBS) import Cardano.Api.Shelley (makeStakeAddress, StakeCredential(StakeCredentialByKey), verificationKeyHash, castVerificationKey, SigningKey(StakeExtendedSigningKey), StakeAddress, PoolId, NetworkId, StakeExtendedKey, queryExpr, LocalStateQueryExpr, determineEraExpr, CardanoEra, CardanoEra(ConwayEra, ShelleyEra, AllegraEra, AlonzoEra, MaryEra, BabbageEra, ByronEra), shelleyBasedEra, IsCardanoEra, LocalTxMonitorClient(..), SlotNo, UnsupportedNtcVersionError) @@ -372,12 +372,12 @@ txMonitor FaucetConfigFile{fcfDebug} = LocalTxMonitorClient $ return $ CTxMon.Se getNextTx Nothing = do return $ CTxMon.SendMsgAwaitAcquire getSnapshot -readEnvSocketPath :: IO (Either EnvSocketError Prelude.String) +readEnvSocketPath :: IO (Either Text Prelude.String) readEnvSocketPath = do mEnvName <- lookupEnv envName case mEnvName of Just sPath -> return $ Right sPath - Nothing -> return . Left $ CliEnvVarLookup (Text.pack envName) + Nothing -> return . Left $ (Text.pack envName) where envName :: Prelude.String envName = "CARDANO_NODE_SOCKET_PATH" @@ -399,7 +399,7 @@ main = do Right sockPath <- liftIO $ readEnvSocketPath let localNodeConnInfo :: LocalNodeConnectInfo CardanoMode - localNodeConnInfo = LocalNodeConnectInfo defaultCModeParams (fcfNetwork fsConfig) sockPath + localNodeConnInfo = LocalNodeConnectInfo defaultCModeParams (fcfNetwork fsConfig) (File sockPath) liftIO $ connectToLocalNode localNodeConnInfo diff --git a/src/cardano-faucet/src/Cardano/Faucet/TxUtils.hs b/src/cardano-faucet/src/Cardano/Faucet/TxUtils.hs index 1f5028bfe9..04fc20af69 100644 --- a/src/cardano-faucet/src/Cardano/Faucet/TxUtils.hs +++ b/src/cardano-faucet/src/Cardano/Faucet/TxUtils.hs @@ -5,7 +5,7 @@ module Cardano.Faucet.TxUtils where import Cardano.Api (Lovelace, IsShelleyBasedEra, ShelleyBasedEra, TxIn, TxOut(TxOut), CtxUTxO, TxBody, TxBodyContent(TxBodyContent), Witness(KeyWitness), KeyWitnessInCtx(KeyWitnessForSpending), TxInsCollateral(TxInsCollateralNone), TxInsReference(TxInsReferenceNone), TxTotalCollateral(TxTotalCollateralNone), TxReturnCollateral(TxReturnCollateralNone), TxMetadataInEra(TxMetadataNone), TxAuxScripts(TxAuxScriptsNone), TxExtraKeyWitnesses(TxExtraKeyWitnessesNone), TxWithdrawals(TxWithdrawalsNone), TxCertificates, BuildTxWith(BuildTxWith), TxUpdateProposal(TxUpdateProposalNone), TxMintValue(..), TxScriptValidity(TxScriptValidityNone), shelleyBasedToCardanoEra, Tx, makeShelleyKeyWitness, makeSignedTransaction, AddressAny, TxId, getTxId, BuildTx, ShelleyWitnessSigningKey) -import Cardano.Api.Shelley (lovelaceToValue, Value, createAndValidateTransactionBody) +import Cardano.Api.Shelley (lovelaceToValue, Value, createAndValidateTransactionBody, TxGovernanceActions(TxGovernanceActionsNone), TxVotes(TxVotesNone)) import Cardano.CLI.Shelley.Run.Transaction import Cardano.CLI.Types import Cardano.Faucet.Misc (getValue, faucetValueToLovelace) @@ -65,6 +65,8 @@ txBuild sbe (txin, txout) addressOrOutputs certs minting (Fee fixedFee) = do <*> pure TxUpdateProposalNone <*> pure minting <*> pure TxScriptValidityNone + <*> pure TxGovernanceActionsNone + <*> pure TxVotesNone case createAndValidateTransactionBody txBodyContent of Left err -> left $ FaucetWebErrorTodo $ show err diff --git a/src/cardano-faucet/src/Cardano/Faucet/Types.hs b/src/cardano-faucet/src/Cardano/Faucet/Types.hs index 906906f41e..da9c60da23 100644 --- a/src/cardano-faucet/src/Cardano/Faucet/Types.hs +++ b/src/cardano-faucet/src/Cardano/Faucet/Types.hs @@ -14,7 +14,7 @@ import Cardano.Address.Derivation (Depth(RootK, AccountK, PaymentK, PolicyK), XP import Cardano.Address.Style.Shelley (Shelley, Role(UTxOExternal, Stake), derivePolicyPrivateKey) import Cardano.Api (AnyCardanoEra, IsCardanoEra, TxIn, TxOut, CtxUTxO, TxInMode, CardanoMode, TxId, FileError, Lovelace, AddressAny(AddressByron, AddressShelley), AssetId(AssetId, AdaAssetId), Quantity, SigningKey, getVerificationKey, makeByronAddress, castVerificationKey, PaymentExtendedKey) import Cardano.Api.Shelley (PoolId, StakeExtendedKey, StakeCredential, AssetName(..), NetworkId(Testnet, Mainnet), NetworkMagic(NetworkMagic), ShelleyWitnessSigningKey) -import Cardano.Api (EnvSocketError, InputDecodeError) +import Cardano.Api (InputDecodeError) import Cardano.CLI.Shelley.Run.Address (SomeAddressVerificationKey(AByronVerificationKey, APaymentVerificationKey, APaymentExtendedVerificationKey, AGenesisUTxOVerificationKey), ShelleyAddressCmdError, buildShelleyAddress) import Cardano.CLI.Shelley.Run.Transaction (ShelleyTxCmdError, renderShelleyTxCmdError) import Cardano.Mnemonic (mkSomeMnemonic, getMkSomeMnemonicError) @@ -56,7 +56,7 @@ instance FromHttpApiData ForwardedFor where -- errors not sent to users data FaucetError = FaucetErrorTodo ShelleyTxCmdError - | FaucetErrorSocketNotFound EnvSocketError + | FaucetErrorSocketNotFound | FaucetErrorLoadingKey (FileError InputDecodeError) | FaucetErrorParsingConfig String | FaucetErrorConfigFileNotSet @@ -68,7 +68,7 @@ data FaucetError = FaucetErrorTodo ShelleyTxCmdError renderFaucetError :: FaucetError -> Text renderFaucetError (FaucetErrorTodo err) = renderShelleyTxCmdError err -renderFaucetError (FaucetErrorSocketNotFound err) = show err +renderFaucetError (FaucetErrorSocketNotFound) = "socket not found" renderFaucetError (FaucetErrorLoadingKey err) = show err renderFaucetError (FaucetErrorParsingConfig err) = show err renderFaucetError FaucetErrorConfigFileNotSet = "$CONFIG_FILE not set" diff --git a/src/cardano-faucet/src/Cardano/Faucet/Web.hs b/src/cardano-faucet/src/Cardano/Faucet/Web.hs index 8eab6a169e..8dc0841f78 100644 --- a/src/cardano-faucet/src/Cardano/Faucet/Web.hs +++ b/src/cardano-faucet/src/Cardano/Faucet/Web.hs @@ -307,7 +307,7 @@ handleDelegateStake era FaucetState{fsPaymentSkey,fsUtxoTMVar,fsTxQueue,fsStakeT Left err -> left err Right ((stake_skey, creds), txinout) -> do let - cert = makeStakeAddressPoolDelegationCertificate creds poolId + cert = makeStakeAddressPoolDelegationCertificate sbe creds poolId stake_witness = WitnessStakeExtendedKey stake_skey x = BuildTxWith $ Map.fromList [(creds,KeyWitness KeyWitnessForStakeAddr)] supported <- maybe (left $ FaucetWebErrorTodo "cert error") pure $ certificatesSupportedInEra era From 8436e28dc70b95bf8d380a750dcde70c3bb2db05 Mon Sep 17 00:00:00 2001 From: Michael Bishop Date: Tue, 18 Jul 2023 17:03:29 -0300 Subject: [PATCH 11/13] randomize api keys for sanchonet faucet --- nix/cloud/kv/vault/faucet/sanchonet.enc.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/cloud/kv/vault/faucet/sanchonet.enc.json b/nix/cloud/kv/vault/faucet/sanchonet.enc.json index 11f3cfd4e5..a3cdeacf0f 100644 --- a/nix/cloud/kv/vault/faucet/sanchonet.enc.json +++ b/nix/cloud/kv/vault/faucet/sanchonet.enc.json @@ -2,13 +2,13 @@ "debug": "ENC[AES256_GCM,data:KK8tKbY=,iv:Ky4J3v9K18X97pHBKyG93Loz8OABcTiKGHQ1XxkqEaQ=,tag:8gritm4u+CkD2brW/LcGBw==,type:bool]", "api_keys": [ { - "api_key": "ENC[AES256_GCM,data:Y7K7gb6EaPbfvROUshWn2x8yY/qFZ8Ern78z3Khi3q8=,iv:G3CyistzO1QB4HZlfoO71I0h1Izbj+T7AtITxMG4C0A=,tag:IBauLu3CNly6D6Cvb85NTQ==,type:str]", + "api_key": "ENC[AES256_GCM,data:S34Vbntze7xoofiVFO2BfWX+qDBCz/5tdJk63NpUZPs=,iv:a0M1KIXSdgknX8y3ltEk2hJwDk0lu8XhZsvfOfvTnZM=,tag:B9HWaWdkxzXU/YGwyP22Vg==,type:str]", "lovelace": "ENC[AES256_GCM,data:OJnERY+9ry4Iq8w=,iv:F2AzvOPU+PZgKfB8SN5BMv5VbotwKmeTVeCjf8VJQqI=,tag:l08VMwFQ+G7Legc47hiJlg==,type:float]", "rate_limit": "ENC[AES256_GCM,data:wtM=,iv:K5JUlpnA8SM/irHnmGB1m15CfcdfMXOpvwIoeBIfPm8=,tag:ygjWc/RewcA/6b8wFTWIXA==,type:float]", "delegate": "ENC[AES256_GCM,data:cokbaw==,iv:ytTHiOF4zXLSGL73kq+6w2cDvlSFk4lmui7vB2pIkDg=,tag:aqGXty25FvjxgO3AzX0M+Q==,type:bool]" }, { - "api_key": "ENC[AES256_GCM,data:mH5K3VpNCVtVGp0tTWuJfyyQ65z4yRV2BlUXLsX0QFg=,iv:OpHJt/oTwoceO2z080RXnPhM4NSnqUCAsfGWlc7sP2c=,tag:xJ3wX4jZz8Ao5A+Dp+UD/g==,type:str]", + "api_key": "ENC[AES256_GCM,data:AGzmhxWkLUlBK+FB71lXxpz+i7NgdrxmEhPiAOqW0dk=,iv:VVcVUeyNVNZUtQx2sJVFaFAR8Lr3JNcp7pBJU18nukg=,tag:PRNHszMUDpt5Pax7IfbuGA==,type:str]", "lovelace": "ENC[AES256_GCM,data:OJnERY+9ry4Iq8w=,iv:F2AzvOPU+PZgKfB8SN5BMv5VbotwKmeTVeCjf8VJQqI=,tag:l08VMwFQ+G7Legc47hiJlg==,type:float]", "rate_limit": "ENC[AES256_GCM,data:szcphTk=,iv:Tt5jZnHwApu2W8NpFkD5nN7kiip7HzM6Q9Lf821DuMc=,tag:u1mOGH2kjh1a0jPQZINSZA==,type:float]", "delegate": "ENC[AES256_GCM,data:cokbaw==,iv:ytTHiOF4zXLSGL73kq+6w2cDvlSFk4lmui7vB2pIkDg=,tag:aqGXty25FvjxgO3AzX0M+Q==,type:bool]" @@ -74,8 +74,8 @@ } ], "age": null, - "lastmodified": "2023-07-18T19:04:24Z", - "mac": "ENC[AES256_GCM,data:FX0NFPrWoQglwlSd81p6bclOZR2h7+brcRfH+A87pHBDnocV+IqDcFEiYgSsw22hsYRR8bNO+fU7T5TOmOibB8MtLE2cQrGXUGQxZ/5LojgZZKSuOX2XlwTR0QI+U+tgobGYnwGgy0LgWTD0Qll/Mcs9jpxmiNp21eDU/OCCq5A=,iv:oOyxfT8qGQG4xtJ1BQW582//8x7z+O8/XefUKZ526Vw=,tag:7xxO4fU1zRNFo2T66inATg==,type:str]", + "lastmodified": "2023-07-18T20:02:33Z", + "mac": "ENC[AES256_GCM,data:Or2fJ4MccLeQw/KLMMSKX/Sm4d/98UZLB2upKyarqf77hEiwB6kHqlfA73pwUlekoQZh5BbRHW3tiysW5IpnjJx/XTHluuor6v5fajKsXKem6D+bf7x+2gnx0PP4iwNCnkPIsa4FBaf6XRpWoAh5FQ+Ql9sEDgeENuECoMRv4FY=,iv:8sQgWOQmsMz7xQREFDHr5ITU846fN1AQ+mgqCXBPfrI=,tag:a5kClO244hS+HwsA9FOgWw==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.7.3" From bda22e53a698664a414b2f7438967fe11cadebf9 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Wed, 2 Aug 2023 09:08:17 -0500 Subject: [PATCH 12/13] imp: whitelist sancho.network for faucet --- nix/cloud/kv/vault/faucet/sanchonet.enc.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nix/cloud/kv/vault/faucet/sanchonet.enc.json b/nix/cloud/kv/vault/faucet/sanchonet.enc.json index a3cdeacf0f..c536df1f1e 100644 --- a/nix/cloud/kv/vault/faucet/sanchonet.enc.json +++ b/nix/cloud/kv/vault/faucet/sanchonet.enc.json @@ -57,7 +57,9 @@ "recaptcha_secret_key": "ENC[AES256_GCM,data:HgmJRmRFZgoX88DDwUPPGFtGx7tkdgZG6fntgnYAHii4556Say+gOA==,iv:JJUPsjmFSuuZONDoU5EtakS6J+adcmOlRFbamu4i1y4=,tag:sWFjGrcBoouR1F5tpYhx0Q==,type:str]", "allowed_cors_origins": [ "ENC[AES256_GCM,data:l0nmkZYTcdDS6rXUJ3jxKuXzg+UoYTsW,iv:HTyp5U96QGpj0IpzVfgdyY7NaKnRUNR8+LowzNRtgeg=,tag:PI7hIAiqHREU4z9RH7RyOQ==,type:str]", - "ENC[AES256_GCM,data:Vawb9YsEv8JiZ6AK/XMxo2DUxtyYeZJQyV8XY9C1mSAdtqGsVIdBQFOTRsU=,iv:nnVk54DLocLEr1DErUoxs9er5GxnTPBYQpzynCPQsFI=,tag:JjyqZhxwjzrkN5M50B8y9A==,type:str]" + "ENC[AES256_GCM,data:Vawb9YsEv8JiZ6AK/XMxo2DUxtyYeZJQyV8XY9C1mSAdtqGsVIdBQFOTRsU=,iv:nnVk54DLocLEr1DErUoxs9er5GxnTPBYQpzynCPQsFI=,tag:JjyqZhxwjzrkN5M50B8y9A==,type:str]", + "ENC[AES256_GCM,data:xf+9jLdqHAmJBuVIcPu3NK/5hd5p9A==,iv:r4DKsAgYWKKcehK530k1qUP+EgaqTL5mLJQpyIAeFi4=,tag:LwG66SL54wty7OUG5sm8lQ==,type:str]", + "ENC[AES256_GCM,data:k/mKPGMQFvl4jZh3oHnJqkXeF8YXMinG6nM=,iv:UMb4PSkyJl4K7pXx/vGWe1XvoXmYJFto7fHG7L1Qs4c=,tag:OJiQX6Ubc/v3ODSDaAOJiQ==,type:str]" ], "address_index": "ENC[AES256_GCM,data:5Q==,iv:uF7WB2BYbkaqU4r00nwfuiMtnPQZWaxRtpYFWpb4dVI=,tag:ZgB0d70OgRGLMeAHi9qoVA==,type:float]", "sops": { @@ -74,8 +76,8 @@ } ], "age": null, - "lastmodified": "2023-07-18T20:02:33Z", - "mac": "ENC[AES256_GCM,data:Or2fJ4MccLeQw/KLMMSKX/Sm4d/98UZLB2upKyarqf77hEiwB6kHqlfA73pwUlekoQZh5BbRHW3tiysW5IpnjJx/XTHluuor6v5fajKsXKem6D+bf7x+2gnx0PP4iwNCnkPIsa4FBaf6XRpWoAh5FQ+Ql9sEDgeENuECoMRv4FY=,iv:8sQgWOQmsMz7xQREFDHr5ITU846fN1AQ+mgqCXBPfrI=,tag:a5kClO244hS+HwsA9FOgWw==,type:str]", + "lastmodified": "2023-08-02T14:01:59Z", + "mac": "ENC[AES256_GCM,data:KrwcuP+3v9//KbcsO7meQtG5rw1+QqmkJM76p7oMWey+rhmevbmndKRW6MHk8NdDoFMODe0BMI+G8dvPxNuXdmBRqfCAzfQu7Z65OggcRuZBbzroGrPTNNPIXyXxBYwr0v+eGYr5cdf9g9wz6Jcu7OyK2fQStgbwsJ+X4ow/s3c=,iv:RROZG2kXHVSesCLr37B9yWugf3FvbdvMUK4mS8RM1NE=,tag:g31cdRsZTAFLda+Bf6IG6Q==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.7.3" From 202a6d3a3ce57c16d8234b3472b81c890137ff2e Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Sat, 26 Aug 2023 11:26:28 -0500 Subject: [PATCH 13/13] bump: cardano-node to 8.2.1-pre for faucet job --- flake.lock | 96 +++++++++++++++++++++++++++++++++++++----------------- flake.nix | 2 +- 2 files changed, 67 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index b35b774d82..097821a3b0 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ "CHaP_2": { "flake": false, "locked": { - "lastModified": 1689478915, - "narHash": "sha256-zXSRZ+xP1edVSC4eWXRV2CJQ+NAsnNDP3edOgYBTD/s=", + "lastModified": 1691169578, + "narHash": "sha256-XtSSU0RI4c/BbUM80Z/3qZCOMriSqUwvJvjBU+g7YdI=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "d4981b111a1485879a53104342136612837f6bcb", + "rev": "3615dfca0ee10cb5e66f0524725c4c775a2b7f83", "type": "github" }, "original": { @@ -2030,15 +2030,16 @@ "utils": "utils_14" }, "locked": { - "lastModified": 1689603252, - "narHash": "sha256-C/SAGACRWe8RBqYQcxzZJzBLdjHTG8GKPQYb0LHzig8=", + "lastModified": 1691329439, + "narHash": "sha256-CPB2O5/QeQrV8EQQwEICTJQE1cp3KeUEh43ZICbE338=", "owner": "input-output-hk", "repo": "cardano-node", - "rev": "6f1dd12cfaff8aafdc5815c6ce9b64f13e5923f7", + "rev": "a29ee68ba2c850cd50be39a3105ef191cfbc41d5", "type": "github" }, "original": { "owner": "input-output-hk", + "ref": "8.2.1-pre", "repo": "cardano-node", "type": "github" } @@ -6907,11 +6908,11 @@ "hackageNix_2": { "flake": false, "locked": { - "lastModified": 1688948952, - "narHash": "sha256-q0MqLCLYZafs1V55MPcE1ywl68/gfObjGnDYINI1yek=", + "lastModified": 1690676776, + "narHash": "sha256-6z8zYs1b4ZZWSM58H41TtfM7bKEqjFW2xaCSCJUbBHk=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "0dfc30a014e08278f3a34f43dbb3fff86b86e741", + "rev": "a21057809f37315eaba0188d8a737ababcaba7f5", "type": "github" }, "original": { @@ -7261,7 +7262,7 @@ "hackage" ], "hls-1.10": "hls-1.10_4", - "hls-2.0": "hls-2.0", + "hls-2.0": "hls-2.0_2", "hpc-coveralls": "hpc-coveralls_16", "hydra": "hydra_8", "iserv-proxy": "iserv-proxy_6", @@ -7274,7 +7275,7 @@ "nixpkgs-2111": "nixpkgs-2111_16", "nixpkgs-2205": "nixpkgs-2205_6", "nixpkgs-2211": "nixpkgs-2211_6", - "nixpkgs-2305": "nixpkgs-2305", + "nixpkgs-2305": "nixpkgs-2305_2", "nixpkgs-unstable": "nixpkgs-unstable_15", "old-ghc-nix": "old-ghc-nix_16", "stackage": "stackage_16" @@ -7632,6 +7633,7 @@ "hackageNix" ], "hls-1.10": "hls-1.10", + "hls-2.0": "hls-2.0", "hpc-coveralls": "hpc-coveralls_6", "hydra": "hydra_2", "iserv-proxy": "iserv-proxy", @@ -7644,16 +7646,17 @@ "nixpkgs-2111": "nixpkgs-2111_6", "nixpkgs-2205": "nixpkgs-2205", "nixpkgs-2211": "nixpkgs-2211", + "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-unstable": "nixpkgs-unstable_6", "old-ghc-nix": "old-ghc-nix_6", "stackage": "stackage_6" }, "locked": { - "lastModified": 1685495397, - "narHash": "sha256-BwbWroS1Qm8BiHatG5+iHMHN5U6kqOccewBROUYuMKw=", + "lastModified": 1690764022, + "narHash": "sha256-+BFPab4/766AF+jfEAo6l3AZH5Zs1lbba2EVOcGhid0=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "d07c42cdb1cf88d0cab27d3090b00cb3899643c9", + "rev": "0f2a6a9dfad636680367c0462dcd50ee64a9bddc", "type": "github" }, "original": { @@ -7959,6 +7962,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" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -8945,11 +8965,11 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1684223806, - "narHash": "sha256-IyLoP+zhuyygLtr83XXsrvKyqqLQ8FHXTiySFf4FJOI=", + "lastModified": 1689951725, + "narHash": "sha256-iA3Rm1qdYOm85brH94+GWQ14aj8r0RUcykqEd+wVUIU=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "86421fdd89b3af43fa716ccd07638f96c6ecd1e4", + "rev": "0ca907c6f63863ad24b950c5e50d976ac788b0d1", "type": "github" }, "original": { @@ -9052,11 +9072,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1670983692, - "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=", + "lastModified": 1688517130, + "narHash": "sha256-hUqfxSlo+ffqVdkSZ1EDoB7/ILCL25eYkcCXW9/P3Wc=", "ref": "hkm/remote-iserv", - "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300", - "revCount": 10, + "rev": "9151db2a9a61d7f5fe52ff8836f18bbd0fd8933c", + "revCount": 13, "type": "git", "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" }, @@ -12517,11 +12537,11 @@ }, "nixpkgs-2211": { "locked": { - "lastModified": 1682682915, - "narHash": "sha256-haR0u/j/nUvlMloYlaOYq1FMXTvkNHw+wGxc+0qXisM=", + "lastModified": 1685314633, + "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09f1b33fcc0f59263137e23e935c1bb03ec920e4", + "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b", "type": "github" }, "original": { @@ -12627,6 +12647,22 @@ "type": "github" } }, + "nixpkgs-2305_2": { + "locked": { + "lastModified": 1685338297, + "narHash": "sha256-+Aq4O0Jn1W1q927ZHc3Zn6RO7bwQGmb6O8xYoGy0KrM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6287b47dbfabbb8bfbb9b1b53d198ad58a774de4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-darwin": { "locked": { "lastModified": 1676998680, @@ -13072,11 +13108,11 @@ }, "nixpkgs-unstable_6": { "locked": { - "lastModified": 1682656005, - "narHash": "sha256-fYplYo7so1O+rSQ2/aS+SbTPwLTeoUXk4ekKNtSl4P8=", + "lastModified": 1685347552, + "narHash": "sha256-9woSppRyUFo26yUffORTzttJ+apOt8MmCv6RxpPNTU4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6806b63e824f84b0f0e60b6d660d4ae753de0477", + "rev": "f2f1ec390714d303cf84ba086e34e45b450dd8c4", "type": "github" }, "original": { @@ -16400,11 +16436,11 @@ "stackage_6": { "flake": false, "locked": { - "lastModified": 1685491814, - "narHash": "sha256-OQX+h5hcDptW6HVrYkBL7dtgqiaiz9zn6iMYv+0CDzc=", + "lastModified": 1690762200, + "narHash": "sha256-UB02izyJREbLmS7+pyJvKF3mDePI6fTasqtg3fltJA0=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "678b4297ccef8bbcd83294e47e1a9042034bdbd0", + "rev": "c91713e7ca38abba6a90686df895acda53fd5038", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 61490d6239..9b9302ef40 100644 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,7 @@ # --- Bridge Heads---------------------------------------------- cardano-db-sync.url = "github:input-output-hk/cardano-db-sync/13.0.4"; - cardano-node.url = "github:input-output-hk/cardano-node"; + cardano-node.url = "github:input-output-hk/cardano-node/8.2.1-pre"; cardano-wallet.url = "github:input-output-hk/cardano-wallet/v2022-07-01"; offchain-metadata-tools = { url = "github:input-output-hk/offchain-metadata-tools/pg-cli-mods";