Skip to content

Commit 84f28b9

Browse files
committed
cleanup: keep attrsets in alphabetical order
1 parent bd48d2c commit 84f28b9

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

flakeModules/cluster.nix

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
# flake.cardano-parts.cluster.groups.<default|name>.lib.opsLib
2929
# flake.cardano-parts.cluster.groups.<default|name>.lib.topologyLib
3030
# flake.cardano-parts.cluster.groups.<default|name>.meta.addressType
31+
# flake.cardano-parts.cluster.groups.<default|name>.meta.blockfrost-platform-service
3132
# flake.cardano-parts.cluster.groups.<default|name>.meta.cardanoDbSyncPrometheusExporterPort
3233
# flake.cardano-parts.cluster.groups.<default|name>.meta.cardanoNodePort
3334
# flake.cardano-parts.cluster.groups.<default|name>.meta.cardanoNodePrometheusExporterPort
3435
# flake.cardano-parts.cluster.groups.<default|name>.meta.cardanoSmashDelistedPools
35-
# flake.cardano-parts.cluster.groups.<default|name>.meta.blockfrost-platform-service
3636
# flake.cardano-parts.cluster.groups.<default|name>.meta.cardano-db-sync-service
3737
# flake.cardano-parts.cluster.groups.<default|name>.meta.cardano-faucet-service
3838
# flake.cardano-parts.cluster.groups.<default|name>.meta.cardano-metadata-service
@@ -405,6 +405,12 @@ flake @ {
405405
else "fqdn";
406406
};
407407

408+
blockfrost-platform-service = mkOption {
409+
type = str;
410+
description = mdDoc "Cardano-parts cluster group blockfrost-platform-service import path string.";
411+
default = cfg.pkgs.special.blockfrost-platform-service;
412+
};
413+
408414
cardanoDbSyncPrometheusExporterPort = mkOption {
409415
type = port;
410416
description = mdDoc "Cardano-parts cluster group cardanoDbSyncPrometheusExporterPort.";
@@ -429,12 +435,6 @@ flake @ {
429435
default = [];
430436
};
431437

432-
blockfrost-platform-service = mkOption {
433-
type = str;
434-
description = mdDoc "Cardano-parts cluster group blockfrost-platform-service import path string.";
435-
default = cfg.pkgs.special.blockfrost-platform-service;
436-
};
437-
438438
cardano-db-sync-service = mkOption {
439439
type = str;
440440
description = mdDoc "Cardano-parts cluster group cardano-db-sync-service import path string.";
@@ -521,18 +521,18 @@ flake @ {
521521

522522
pkgsSubmodule = submodule {
523523
options = {
524-
blockperf = mkOption {
525-
type = functionTo package;
526-
description = mdDoc "Cardano-parts cluster group default blockperf package.";
527-
default = system: withSystem system ({config, ...}: config.cardano-parts.pkgs.blockperf);
528-
};
529-
530524
blockfrost-platform = mkOption {
531525
type = functionTo package;
532526
description = mdDoc "Cardano-parts cluster group default blockfrost-platform package.";
533527
default = system: withSystem system ({config, ...}: config.cardano-parts.pkgs.blockfrost-platform);
534528
};
535529

530+
blockperf = mkOption {
531+
type = functionTo package;
532+
description = mdDoc "Cardano-parts cluster group default blockperf package.";
533+
default = system: withSystem system ({config, ...}: config.cardano-parts.pkgs.blockperf);
534+
};
535+
536536
cardano-cli = mkOption {
537537
type = functionTo package;
538538
description = mdDoc "Cardano-parts cluster group default cardano-cli package.";

flakeModules/pkgs.nix

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
# flake.cardano-parts.pkgs.special.cardano-tracer-service-ng
2525
# flake.cardano-parts.pkgs.special.cardano-smash-service
2626
# perSystem.cardano-parts.pkgs.bech32
27-
# perSystem.cardano-parts.pkgs.cardano-address
2827
# perSystem.cardano-parts.pkgs.blockfrost-platform
2928
# perSystem.cardano-parts.pkgs.blockperf
29+
# perSystem.cardano-parts.pkgs.cardano-address
3030
# perSystem.cardano-parts.pkgs.cardano-cli
3131
# perSystem.cardano-parts.pkgs.cardano-cli-ng
3232
# perSystem.cardano-parts.pkgs.cardano-db-sync
@@ -117,6 +117,12 @@
117117

118118
specialPkgsSubmodule = submodule {
119119
options = {
120+
blockfrost-platform-service = mkOption {
121+
type = str;
122+
description = mdDoc "The cardano-parts default blockfrost-platform-service import path string.";
123+
default = "${localFlake.inputs.blockfrost-platform-service}/nix/nixos";
124+
};
125+
120126
cardanoLib = mkOption {
121127
type = anything;
122128
description = mdDoc ''
@@ -273,12 +279,6 @@
273279
};
274280
};
275281

276-
blockfrost-platform-service = mkOption {
277-
type = str;
278-
description = mdDoc "The cardano-parts default blockfrost-platform-service import path string.";
279-
default = "${localFlake.inputs.blockfrost-platform-service}/nix/nixos";
280-
};
281-
282282
cardano-db-sync-service = mkOption {
283283
type = str;
284284
description = mdDoc "The cardano-parts default cardano-db-sync-service import path string.";
@@ -435,8 +435,8 @@ in
435435
options = foldl' recursiveUpdate {} [
436436
# TODO: Fix the missing meta/version info upstream
437437
(mkPkg "bech32" caPkgs."bech32-input-output-hk-cardano-node-10-2-1-52b708f")
438-
(mkPkg "blockperf" caPkgs.blockperf-cardano-foundation-blockperf-main-87f6f67)
439438
(mkPkg "blockfrost-platform" caPkgs.default-blockfrost-blockfrost-platform-0-0-2-e06029b)
439+
(mkPkg "blockperf" caPkgs.blockperf-cardano-foundation-blockperf-main-87f6f67)
440440
(mkPkg "cardano-address" caPkgs.cardano-address-cardano-foundation-cardano-wallet-v2024-11-18-9eb5f59)
441441
(mkPkg "cardano-cli" (caPkgs."cardano-cli-input-output-hk-cardano-node-10-2-1-52b708f" // {version = "10.4.0.0";}))
442442
(mkPkg "cardano-cli-ng" (caPkgs."cardano-cli-input-output-hk-cardano-node-10-2-1-52b708f" // {version = "10.4.0.0";}))

0 commit comments

Comments
 (0)