Skip to content

Commit 401b1ad

Browse files
authored
Merge pull request #45 from input-output-hk/jl/new-tracing
New tracing integration
2 parents 013513c + c265a43 commit 401b1ad

37 files changed

+1054
-768
lines changed

docs/explain/old-node-configs.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@
4848
4949
## Version Reference:
5050
51+
* Node `10.5.1`
52+
* Environment configs can be found in `result/environments/config/` after running:
53+
```bash
54+
nix run github:input-output-hk/cardano-playground/node-10.5.1-config#job-gen-env-config
55+
5156
* Node `10.4.1`
5257
* Environment configs can be found in `result/environments/config/` after running:
5358
```bash

flake.lock

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

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
nixpkgs.follows = "cardano-parts/nixpkgs";
66
nixpkgs-unstable.follows = "cardano-parts/nixpkgs-unstable";
77
flake-parts.follows = "cardano-parts/flake-parts";
8-
cardano-parts.url = "github:input-output-hk/cardano-parts/v2025-07-25";
9-
# cardano-parts.url = "path:/home/jlotoski/work/iohk/cardano-parts-wt/v2025-07-25";
8+
cardano-parts.url = "github:input-output-hk/cardano-parts/v2025-08-05";
9+
# cardano-parts.url = "path:/home/jlotoski/work/iohk/cardano-parts-wt/v2025-08-05";
1010

1111
# Local pins for additional customization:
12-
# cardanoTest.url = "github:IntersectMBO/cardano-node/mgalazyn/feature/make-peer-snapshot-file-path-relative-to-topology-file";
12+
# cardanoFix.url = "github:IntersectMBO/cardano-node/new-tracing/fix-metrics";
1313

1414
# PParams api testing
1515
cardano-node-pparams-api.url = "github:johnalotoski/cardano-node-pparams-api";

flake/cluster.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@ with flake.lib; {
6363
// optionalAttrs isNg {
6464
lib.cardanoLib = flake.config.flake.cardano-parts.pkgs.special.cardanoLibNg;
6565

66-
# Until upstream parts ng has capkgs version, use local flake pins
6766
pkgs = {
6867
cardano-cli = system: flake.withSystem system ({config, ...}: config.cardano-parts.pkgs.cardano-cli-ng);
68+
cardano-db-sync-pkgs = flake.config.flake.cardano-parts.pkgs.special.cardano-db-sync-pkgs-ng;
6969
cardano-db-sync = system: flake.withSystem system ({config, ...}: config.cardano-parts.pkgs.cardano-db-sync-ng);
7070
cardano-db-tool = system: flake.withSystem system ({config, ...}: config.cardano-parts.pkgs.cardano-db-tool-ng);
71-
cardano-db-sync-pkgs = flake.config.flake.cardano-parts.pkgs.special.cardano-db-sync-pkgs-ng;
7271
cardano-faucet = system: flake.withSystem system ({config, ...}: config.cardano-parts.pkgs.cardano-faucet-ng);
72+
cardano-node-pkgs = flake.config.flake.cardano-parts.pkgs.special.cardano-node-pkgs-ng;
7373
cardano-node = system: flake.withSystem system ({config, ...}: config.cardano-parts.pkgs.cardano-node-ng);
7474
cardano-smash = system: flake.withSystem system ({config, ...}: config.cardano-parts.pkgs.cardano-smash-ng);
7575
cardano-submit-api = system: flake.withSystem system ({config, ...}: config.cardano-parts.pkgs.cardano-submit-api-ng);
76-
cardano-node-pkgs = flake.config.flake.cardano-parts.pkgs.special.cardano-node-pkgs-ng;
76+
cardano-tracer = system: flake.withSystem system ({config, ...}: config.cardano-parts.pkgs.cardano-tracer-ng);
7777
mithril-client-cli = system: flake.withSystem system ({config, ...}: config.cardano-parts.pkgs.mithril-client-cli-ng);
7878
mithril-signer = system: flake.withSystem system ({config, ...}: config.cardano-parts.pkgs.mithril-signer-ng);
7979
};

0 commit comments

Comments
 (0)