Skip to content

Commit dd5a425

Browse files
authored
Merge pull request #3221 from input-output-hk/fix/LW-11421-node-9-1-1
[LW-11421] Update `cardano-node` to a 9.1.1 (hotfix for the ledger replay bug)
2 parents d67f1fe + e38f3a7 commit dd5a425

File tree

5 files changed

+28
-4
lines changed

5 files changed

+28
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## vNext
44

5+
### Fixes
6+
7+
- Update `cardano-node` to a 9.1.1 (hotfix for the ledger replay bug) ([PR 3221](https://github.com/input-output-hk/daedalus/pull/3221))
8+
59
### Chores
610

711
- Unset `LD_LIBRARY_PATH` on Linux ([PR 3219](https://github.com/input-output-hk/daedalus/pull/3219))

flake.lock

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

flake.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
66
cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-07-27";
77
cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
8+
cardano-node-override.url = "github:IntersectMBO/cardano-node/9.1.1";
9+
cardano-node-override.flake = false;
810
cardano-playground.url = "github:input-output-hk/cardano-playground/next-2024-07-24";
911
cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…
1012
cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493";

nix/internal/cardano-bridge.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ runCommandCC "daedalus-cardano-bridge" {
3333
''}
3434
${lib.optionalString (target == "x86_64-linux") ''
3535
chmod +w -R .
36-
for x in cardano-address cardano-node cardano-launcher cardano-cli cardano-wallet; do
36+
for x in cardano-launcher cardano-wallet; do
3737
$STRIP $x
3838
patchelf --shrink-rpath $x
3939
done

nix/internal/common.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ rec {
4040
}).defaultNix;
4141

4242
nodeFlake = let
43-
unpatched = walletFlake.inputs.cardano-node-runtime;
43+
unpatched = inputs.cardano-node-override;
4444
in (flake-compat {
4545
src = {
4646
outPath = toString (pkgs.runCommand "source" {} ''
@@ -49,7 +49,7 @@ rec {
4949
cd $out
5050
cp ${walletFlake}/nix/supported-systems.nix $out/nix/supported-systems.nix
5151
'');
52-
inherit (unpatched.sourceInfo) rev shortRev lastModified lastModifiedDate;
52+
inherit (unpatched) rev shortRev lastModified lastModifiedDate;
5353
};
5454
}).defaultNix;
5555

@@ -62,7 +62,7 @@ rec {
6262

6363
nodePackages = {
6464
x86_64-windows = nodeFlake.legacyPackages.x86_64-linux.hydraJobs.windows; # a bug in ${cardano-node}/flake.nix
65-
x86_64-linux = nodeFlake.packages.x86_64-linux;
65+
x86_64-linux = nodeFlake.hydraJobs.x86_64-linux.musl;
6666
x86_64-darwin = nodeFlake.packages.x86_64-darwin;
6767
aarch64-darwin = nodeFlake.packages.aarch64-darwin;
6868
}.${targetSystem};

0 commit comments

Comments
 (0)