Skip to content

Commit e1ec0ab

Browse files
committed
cleanup: use blockfrost-platform from caPkgs
1 parent 502158e commit e1ec0ab

File tree

4 files changed

+9
-16
lines changed

4 files changed

+9
-16
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flakeModules/entrypoints.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ in {
102102
103103
DB_DIR="$DATA_DIR/db-''${ENVIRONMENT:-custom}"
104104
105-
# XXX: The following environment variables may be used to modify default process compose mithril behavior:
105+
# The following environment variables may be used to modify default process compose mithril behavior:
106106
# MITHRIL_DISABLE
107107
# MITHRIL_SNAPSHOT_DIGEST
108108
# MITHRIL_VERIFY_SNAPSHOT

flakeModules/pkgs.nix

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -436,12 +436,7 @@ in
436436
# TODO: Fix the missing meta/version info upstream
437437
(mkPkg "bech32" caPkgs."bech32-input-output-hk-cardano-node-10-2-1-52b708f")
438438
(mkPkg "blockperf" caPkgs.blockperf-cardano-foundation-blockperf-main-87f6f67)
439-
(
440-
mkPkg "blockfrost-platform"
441-
# FIXME: once <https://github.com/input-output-hk/capkgs/pull/4> is merged
442-
# This is the 0.0.2 release:
443-
(builtins.getFlake "github:blockfrost/blockfrost-platform/e06029b9da747fa5daa027605a918fc9fe103b7c").packages.x86_64-linux.default
444-
)
439+
(mkPkg "blockfrost-platform" caPkgs.default-blockfrost-blockfrost-platform-0-0-2-e06029b)
445440
(mkPkg "cardano-address" caPkgs.cardano-address-cardano-foundation-cardano-wallet-v2024-11-18-9eb5f59)
446441
(mkPkg "cardano-cli" (caPkgs."cardano-cli-input-output-hk-cardano-node-10-2-1-52b708f" // {version = "10.4.0.0";}))
447442
(mkPkg "cardano-cli-ng" (caPkgs."cardano-cli-input-output-hk-cardano-node-10-2-1-52b708f" // {version = "10.4.0.0";}))
@@ -486,10 +481,10 @@ in
486481
(mkPkg "metadata-validator-github" caPkgs.metadata-validator-github-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d)
487482
(mkPkg "metadata-webhook" caPkgs.metadata-webhook-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d)
488483
(mkPkg "mithril-client-cli" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-2513-0-pre-1fb85a7 {meta.mainProgram = "mithril-client";}))
489-
(mkPkg "mithril-client-cli-ng" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-unstable-0d66de9 {meta.mainProgram = "mithril-client";}))
484+
(mkPkg "mithril-client-cli-ng" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-unstable-c2b3494 {meta.mainProgram = "mithril-client";}))
490485
# To update once capkgs builds and caches 2506 signer successfully
491486
(mkPkg "mithril-signer" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-2513-0-pre-1fb85a7 {meta.mainProgram = "mithril-signer";}))
492-
(mkPkg "mithril-signer-ng" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-unstable-0d66de9 {meta.mainProgram = "mithril-signer";}))
487+
(mkPkg "mithril-signer-ng" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-unstable-c2b3494 {meta.mainProgram = "mithril-signer";}))
493488
(mkPkg "orchestrator-cli" caPkgs.orchestrator-cli-IntersectMBO-credential-manager-0-1-2-0-081cc8c)
494489
(mkPkg "token-metadata-creator" (recursiveUpdate caPkgs.token-metadata-creator-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d {meta.mainProgram = "token-metadata-creator";}))
495490
(mkPkg "tx-bundle" caPkgs.tx-bundle-IntersectMBO-credential-manager-0-1-2-0-081cc8c)

flakeModules/shell.nix

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,7 @@ in
273273
extraCfg.pkgs = mkOption {
274274
default =
275275
config.cardano-parts.shell.min.pkgs
276-
# FIXME: revert, `nix-2.17.0` can’t build `blockfrost-platform`
277-
++ builtins.filter (a: a ? pname && a.pname != "nix") localFlake.inputs.haskell-nix.devShells.${system}.default.buildInputs
276+
++ localFlake.inputs.haskell-nix.devShells.${system}.default.buildInputs
278277
++ (with pkgs; [
279278
ghcid
280279
]);
@@ -352,8 +351,7 @@ in
352351
extraCfg.pkgs = mkOption {
353352
default =
354353
config.cardano-parts.shell.ops.pkgs
355-
# FIXME: revert, `nix-2.17.0` can’t build `blockfrost-platform`
356-
++ builtins.filter (a: a ? pname && a.pname != "nix") localFlake.inputs.haskell-nix.devShells.${system}.default.buildInputs
354+
++ localFlake.inputs.haskell-nix.devShells.${system}.default.buildInputs
357355
++ (with pkgs; [
358356
ghcid
359357
]);

0 commit comments

Comments
 (0)