Skip to content

Commit 7882492

Browse files
johnalotoskijohnalotoski
committed
pkgs: refactor to clean up capkgs vs localFlake reference switching
1 parent 9a8efc1 commit 7882492

File tree

1 file changed

+39
-57
lines changed

1 file changed

+39
-57
lines changed

‎flakeModules/pkgs.nix‎

Lines changed: 39 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -460,80 +460,64 @@ in
460460
};
461461

462462
pkgsSubmodule = let
463+
inherit (localFlake.inputs.blockperf.packages.x86_64-linux) blockperf;
464+
# blockperf = caPkgs.blockperf-cardano-foundation-blockperf-main-d757f38;
465+
463466
credential-manager-release = "IntersectMBO-credential-manager-0-1-5-0-ba221bd";
464467
dbsync-release = "input-output-hk-cardano-db-sync-13-6-0-5-cb61094";
465468
dbsync-pre-release = "input-output-hk-cardano-db-sync-13-6-0-5-cb61094";
469+
470+
faucet = caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d";
471+
# faucet = localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet";
472+
473+
faucet-ng = caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d";
474+
# faucet-ng = localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet";
475+
466476
metadata-server-release = "input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d";
467477
mithril-release = "input-output-hk-mithril-2543-1-hotfix-5d5571e";
468478
mithril-pre-release = "input-output-hk-mithril-unstable-59bf453";
469-
node-release = "input-output-hk-cardano-node-10-5-1-ca1ec27";
470-
node-pre-release = "input-output-hk-cardano-node-10-6-0-f5ac0eb";
479+
480+
# node-release = pkg: caPkgs."${pkg}-input-output-hk-cardano-node-10-5-1-ca1ec27";
481+
node-release = pkg: localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.${pkg};
482+
483+
node-pre-release = pkg: caPkgs."${pkg}-input-output-hk-cardano-node-10-6-0-f5ac0eb";
484+
# node-pre-release = pkg: localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.${pkg};
471485
in
472486
submodule {
473487
options = foldl' recursiveUpdate {} [
474-
# TODO: Fix the missing meta/version info upstream
475-
(mkPkg "bech32" caPkgs."bech32-${node-release}")
488+
(mkPkg "bech32" (node-release "bech32"))
476489
(mkPkg "blockfrost-platform" caPkgs.default-blockfrost-blockfrost-platform-0-0-2-e06029b)
477-
478-
# Until blockperf detail fix is merged to master upstream
479-
# (mkPkg "blockperf" caPkgs.blockperf-cardano-foundation-blockperf-main-d757f38)
480-
(mkPkg "blockperf" localFlake.inputs.blockperf.packages.x86_64-linux.blockperf)
481-
490+
(mkPkg "blockperf" blockperf)
482491
(mkPkg "cardano-address" caPkgs."\"cardano-addresses:exe:cardano-address\"-IntersectMBO-cardano-addresses-4-0-0-3749045")
483-
# (mkPkg "cardano-cli" (caPkgs."cardano-cli-${node-release}" // {version = "10.11.0.0";}))
484-
(mkPkg "cardano-cli" (localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-cli // {version = "10.11.0.0";}))
485-
(mkPkg "cardano-cli-ng" (caPkgs."cardano-cli-${node-pre-release}" // {version = "10.13.1.0";}))
486-
# (mkPkg "cardano-cli-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-cli)
492+
(mkPkg "cardano-cli" ((node-release "cardano-cli") // {version = "10.11.0.0";}))
493+
(mkPkg "cardano-cli-ng" ((node-pre-release "cardano-cli") // {version = "10.13.1.0";}))
487494
(mkPkg "cardano-db-sync" caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-${dbsync-release}")
488495
(mkPkg "cardano-db-sync-ng" caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-${dbsync-pre-release}")
489496
(mkPkg "cardano-db-tool" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-${dbsync-release}")
490497
(mkPkg "cardano-db-tool-ng" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-${dbsync-pre-release}")
491-
492-
# For tmp local faucet testing:
493-
# (mkPkg "cardano-faucet" localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet")
494-
# (mkPkg "cardano-faucet-ng" localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet")
495-
(mkPkg "cardano-faucet" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d")
496-
(mkPkg "cardano-faucet-ng" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d")
497-
498-
# (mkPkg "cardano-node" (caPkgs."cardano-node-${node-release}" // {version = "10.5.1";}))
499-
(mkPkg "cardano-node" (localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-node // {version = "10.5.2";}))
500-
(mkPkg "cardano-node-ng" (caPkgs."cardano-node-${node-pre-release}" // {version = "10.6.0";}))
501-
# (mkPkg "cardano-node-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-node)
498+
(mkPkg "cardano-faucet" faucet)
499+
(mkPkg "cardano-faucet-ng" faucet-ng)
500+
(mkPkg "cardano-node" ((node-release "cardano-node") // {version = "10.5.2";}))
501+
(mkPkg "cardano-node-ng" ((node-pre-release "cardano-node") // {version = "10.6.0";}))
502502
(mkPkg "cardano-ogmios" caPkgs.ogmios-input-output-hk-cardano-ogmios-v6-11-2-df5971a)
503503
(mkPkg "cardano-signer" caPkgs.cardano-signer-johnalotoski-cardano-signer-v1-29-0-2ef95e1)
504504
(mkPkg "cardano-smash" caPkgs."cardano-smash-server-no-basic-auth-${dbsync-release}")
505505
(mkPkg "cardano-smash-ng" caPkgs."cardano-smash-server-no-basic-auth-${dbsync-pre-release}")
506-
# (mkPkg "cardano-submit-api" caPkgs."cardano-submit-api-${node-release}")
507-
(mkPkg "cardano-submit-api" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-submit-api)
508-
(mkPkg "cardano-submit-api-ng" caPkgs."cardano-submit-api-${node-pre-release}")
509-
# (mkPkg "cardano-submit-api-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-submit-api)
510-
# (mkPkg "cardano-testnet" caPkgs."cardano-testnet-${node-release}")
511-
(mkPkg "cardano-testnet" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-testnet)
512-
(mkPkg "cardano-testnet-ng" caPkgs."cardano-testnet-${node-pre-release}")
513-
# (mkPkg "cardano-testnet-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-testnet)
514-
# (mkPkg "cardano-tracer" caPkgs."cardano-tracer-${node-release}")
515-
(mkPkg "cardano-tracer" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.cardano-tracer)
516-
(mkPkg "cardano-tracer-ng" caPkgs."cardano-tracer-${node-pre-release}")
517-
# (mkPkg "cardano-tracer-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.cardano-tracer)
518-
(mkPkg "cardano-wallet" (caPkgs.cardano-wallet-cardano-foundation-cardano-wallet-v2025-03-31-1649791
519-
// {
520-
pname = "cardano-wallet";
521-
meta.description = "HTTP server and command-line for managing UTxOs and HD wallets in Cardano.";
522-
}))
506+
(mkPkg "cardano-submit-api" (node-release "cardano-submit-api"))
507+
(mkPkg "cardano-submit-api-ng" (node-pre-release "cardano-submit-api"))
508+
(mkPkg "cardano-testnet" (node-release "cardano-testnet"))
509+
(mkPkg "cardano-testnet-ng" (node-pre-release "cardano-testnet"))
510+
(mkPkg "cardano-tracer" (node-release "cardano-trace"))
511+
(mkPkg "cardano-tracer-ng" (node-pre-release "cardano-tracer"))
512+
(mkPkg "cardano-wallet" caPkgs.cardano-wallet-cardano-foundation-cardano-wallet-v2025-03-31-1649791)
523513
(mkPkg "cc-sign" caPkgs."cc-sign-${credential-manager-release}")
524514
(mkPkg "colmena" localFlake.inputs.colmena.packages.${system}.colmena)
525-
# (mkPkg "db-analyser" caPkgs."db-analyser-${node-release}")
526-
(mkPkg "db-analyser" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.db-analyser)
527-
(mkPkg "db-analyser-ng" caPkgs."db-analyser-${node-pre-release}")
528-
# (mkPkg "db-analyser-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.db-analyser)
529-
# (mkPkg "db-synthesizer" caPkgs."db-synthesizer-${node-release}")
530-
(mkPkg "db-synthesizer" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.db-synthesizer)
531-
(mkPkg "db-synthesizer-ng" caPkgs."db-synthesizer-${node-pre-release}")
532-
# (mkPkg "db-synthesizer-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.db-synthesizer)
533-
# (mkPkg "db-truncater" caPkgs."db-truncater-${node-release}")
534-
(mkPkg "db-truncater" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.db-truncater)
535-
(mkPkg "db-truncater-ng" caPkgs."db-truncater-${node-pre-release}")
536-
# (mkPkg "db-truncater-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.db-truncater)
515+
(mkPkg "db-analyser" (node-release "db-analyser"))
516+
(mkPkg "db-analyser-ng" (node-pre-release "db-analyser"))
517+
(mkPkg "db-synthesizer" (node-release "db-synthesizer"))
518+
(mkPkg "db-synthesizer-ng" (node-pre-release "db-synthesizer"))
519+
(mkPkg "db-truncater" (node-release "db-truncater"))
520+
(mkPkg "db-truncater-ng" (node-pre-release "db-truncater"))
537521
(mkPkg "isd" caPkgs.isd-isd-project-isd-v0-5-1-51d52a2)
538522
(mkPkg "process-compose" caPkgs.process-compose-F1bonacc1-process-compose-v1-46-0-6a1799e)
539523
(mkPkg "metadata-server" caPkgs."metadata-server-${metadata-server-release}")
@@ -545,10 +529,8 @@ in
545529
(mkPkg "mithril-signer" (recursiveUpdate caPkgs."mithril-signer-${mithril-release}" {meta.mainProgram = "mithril-signer";}))
546530
(mkPkg "mithril-signer-ng" (recursiveUpdate caPkgs."mithril-signer-${mithril-pre-release}" {meta.mainProgram = "mithril-signer";}))
547531
(mkPkg "orchestrator-cli" caPkgs."orchestrator-cli-${credential-manager-release}")
548-
# (mkPkg "snapshot-converter" caPkgs."snapshot-converter-${node-release}")
549-
(mkPkg "snapshot-converter" localFlake.inputs.cardano-node-10-5-2.packages.x86_64-linux.snapshot-converter)
550-
(mkPkg "snapshot-converter-ng" caPkgs."snapshot-converter-${node-pre-release}")
551-
# (mkPkg "snapshot-converter-ng" localFlake.inputs.cardano-node-10-6-0.packages.x86_64-linux.snapshot-converter)
532+
(mkPkg "snapshot-converter" (node-release "snapshot-converter"))
533+
(mkPkg "snapshot-converter-ng" (node-pre-release "snapshot-converter"))
552534
(mkPkg "token-metadata-creator" (recursiveUpdate caPkgs."token-metadata-creator-${metadata-server-release}" {meta.mainProgram = "token-metadata-creator";}))
553535
(mkPkg "tx-bundle" caPkgs."tx-bundle-${credential-manager-release}")
554536
];

0 commit comments

Comments
 (0)