Skip to content

Commit edfdaae

Browse files
authored
Merge pull request #65 from input-output-hk/next-2025-04-17
Node 10.3.1, Cli 10.7.0.0, release
2 parents 8f24408 + 3a9ab07 commit edfdaae

File tree

5 files changed

+27
-25
lines changed

5 files changed

+27
-25
lines changed

.github/workflows/nix-jobs-test.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,12 @@ jobs:
130130
done
131131
}
132132
133-
# Pause release tests on versions < node 10.3.1
134-
# Re-enable when node release is >= 10.3.1
135-
# echo "Run nix job tests with release versioning..."
136-
# echo "Running legacy sequence tests..."
137-
# RUN_TESTS "${JOB_SEQ_LEGACY[@]}"
138-
#
139-
# echo "Running sequence tests..."
140-
# RUN_TESTS "${JOB_SEQ[@]}"
133+
echo "Run nix job tests with release versioning..."
134+
echo "Running legacy sequence tests..."
135+
RUN_TESTS "${JOB_SEQ_LEGACY[@]}"
136+
137+
echo "Running sequence tests..."
138+
RUN_TESTS "${JOB_SEQ[@]}"
141139
142140
echo "Now run nix job tests again with pre-release versioning..."
143141
set -x

flake.lock

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

flake/nixosModules/profile-cardano-custom-metrics.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
perNodeCfg = config.cardano-parts.perNode;
2525
cfg = config.services.cardano-custom-metrics;
2626
in {
27+
key = ./profile-cardano-custom-metrics.nix;
28+
2729
options.services.cardano-custom-metrics = {
2830
address = mkOption {
2931
type = str;

flake/nixosModules/profile-cardano-node-group.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@
9393
cfg = nixos.config.services.cardano-node;
9494
cfgMithril = nixos.config.services.mithril-client;
9595
in {
96+
key = ./profile-cardano-node-group.nix;
97+
9698
# Leave the import of the upstream cardano-node service for
9799
# cardano-parts consuming repos so that service import can be customized.
98100
#

flakeModules/pkgs.nix

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -434,11 +434,11 @@ in
434434
pkgsSubmodule = submodule {
435435
options = foldl' recursiveUpdate {} [
436436
# TODO: Fix the missing meta/version info upstream
437-
(mkPkg "bech32" caPkgs."bech32-input-output-hk-cardano-node-10-2-1-52b708f")
437+
(mkPkg "bech32" caPkgs."bech32-input-output-hk-cardano-node-10-3-1-b3f237b")
438438
(mkPkg "blockfrost-platform" caPkgs.default-blockfrost-blockfrost-platform-0-0-2-e06029b)
439439
(mkPkg "blockperf" caPkgs.blockperf-cardano-foundation-blockperf-main-87f6f67)
440-
(mkPkg "cardano-address" caPkgs.cardano-address-cardano-foundation-cardano-wallet-v2025-03-31-1649791)
441-
(mkPkg "cardano-cli" (caPkgs."cardano-cli-input-output-hk-cardano-node-10-2-1-52b708f" // {version = "10.4.0.0";}))
440+
(mkPkg "cardano-address" caPkgs."\"cardano-addresses:exe:cardano-address\"-IntersectMBO-cardano-addresses-4-0-0-3749045")
441+
(mkPkg "cardano-cli" (caPkgs."cardano-cli-input-output-hk-cardano-node-10-3-1-b3f237b" // {version = "10.7.0.0";}))
442442
(mkPkg "cardano-cli-ng" (caPkgs."cardano-cli-input-output-hk-cardano-node-10-3-1-b3f237b" // {version = "10.7.0.0";}))
443443
(mkPkg "cardano-db-sync" (recursiveUpdate caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-input-output-hk-cardano-db-sync-13-6-0-5-cb61094" {meta.mainProgram = "cardano-db-sync";}))
444444
(mkPkg "cardano-db-sync-ng" (recursiveUpdate caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-input-output-hk-cardano-db-sync-13-6-0-5-cb61094" {meta.mainProgram = "cardano-db-sync";}))
@@ -451,28 +451,28 @@ in
451451
(mkPkg "cardano-faucet" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d")
452452
(mkPkg "cardano-faucet-ng" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-10-1-2cccf6d")
453453

454-
(mkPkg "cardano-node" (caPkgs."cardano-node-input-output-hk-cardano-node-10-2-1-52b708f" // {version = "10.2.1";}))
454+
(mkPkg "cardano-node" (caPkgs."cardano-node-input-output-hk-cardano-node-10-3-1-b3f237b" // {version = "10.3.1";}))
455455
(mkPkg "cardano-node-ng" (caPkgs."cardano-node-input-output-hk-cardano-node-10-3-1-b3f237b" // {version = "10.3.1";}))
456456
(mkPkg "cardano-ogmios" caPkgs.ogmios-input-output-hk-cardano-ogmios-v6-11-2-df5971a)
457457
(mkPkg "cardano-smash" caPkgs.cardano-smash-server-no-basic-auth-input-output-hk-cardano-db-sync-13-6-0-5-cb61094)
458458
(mkPkg "cardano-smash-ng" caPkgs.cardano-smash-server-no-basic-auth-input-output-hk-cardano-db-sync-13-6-0-5-cb61094)
459-
(mkPkg "cardano-submit-api" caPkgs."cardano-submit-api-input-output-hk-cardano-node-10-2-1-52b708f")
459+
(mkPkg "cardano-submit-api" caPkgs."cardano-submit-api-input-output-hk-cardano-node-10-3-1-b3f237b")
460460
(mkPkg "cardano-submit-api-ng" caPkgs."cardano-submit-api-input-output-hk-cardano-node-10-3-1-b3f237b")
461-
(mkPkg "cardano-testnet" caPkgs."cardano-testnet-input-output-hk-cardano-node-10-2-1-52b708f")
461+
(mkPkg "cardano-testnet" caPkgs."cardano-testnet-input-output-hk-cardano-node-10-3-1-b3f237b")
462462
(mkPkg "cardano-testnet-ng" caPkgs."cardano-testnet-input-output-hk-cardano-node-10-3-1-b3f237b")
463-
(mkPkg "cardano-tracer" caPkgs."cardano-tracer-input-output-hk-cardano-node-10-2-1-52b708f")
463+
(mkPkg "cardano-tracer" caPkgs."cardano-tracer-input-output-hk-cardano-node-10-3-1-b3f237b")
464464
(mkPkg "cardano-tracer-ng" caPkgs."cardano-tracer-input-output-hk-cardano-node-10-3-1-b3f237b")
465465
(mkPkg "cardano-wallet" (caPkgs.cardano-wallet-cardano-foundation-cardano-wallet-v2025-03-31-1649791
466466
// {
467467
pname = "cardano-wallet";
468468
meta.description = "HTTP server and command-line for managing UTxOs and HD wallets in Cardano.";
469469
}))
470470
(mkPkg "cc-sign" caPkgs.cc-sign-IntersectMBO-credential-manager-0-1-3-0-2d82213)
471-
(mkPkg "db-analyser" caPkgs."db-analyser-input-output-hk-cardano-node-10-2-1-52b708f")
471+
(mkPkg "db-analyser" caPkgs."db-analyser-input-output-hk-cardano-node-10-3-1-b3f237b")
472472
(mkPkg "db-analyser-ng" caPkgs."db-analyser-input-output-hk-cardano-node-10-3-1-b3f237b")
473-
(mkPkg "db-synthesizer" caPkgs."db-synthesizer-input-output-hk-cardano-node-10-2-1-52b708f")
473+
(mkPkg "db-synthesizer" caPkgs."db-synthesizer-input-output-hk-cardano-node-10-3-1-b3f237b")
474474
(mkPkg "db-synthesizer-ng" caPkgs."db-synthesizer-input-output-hk-cardano-node-10-3-1-b3f237b")
475-
(mkPkg "db-truncater" caPkgs."db-truncater-input-output-hk-cardano-node-10-2-1-52b708f")
475+
(mkPkg "db-truncater" caPkgs."db-truncater-input-output-hk-cardano-node-10-3-1-b3f237b")
476476
(mkPkg "db-truncater-ng" caPkgs."db-truncater-input-output-hk-cardano-node-10-3-1-b3f237b")
477477
(mkPkg "isd" caPkgs.isd-isd-project-isd-v0-5-1-51d52a2)
478478
(mkPkg "process-compose" caPkgs.process-compose-F1bonacc1-process-compose-v1-46-0-6a1799e)

0 commit comments

Comments
 (0)