Skip to content

Commit

Permalink
[LW-11421] Update cardano-node to a 9.1.1 (hotfix for the ledger re…
Browse files Browse the repository at this point in the history
…play bug)
  • Loading branch information
michalrus committed Sep 2, 2024
1 parent d67f1fe commit e38f3a7
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## vNext

### Fixes

- 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))

### Chores

- Unset `LD_LIBRARY_PATH` on Linux ([PR 3219](https://github.com/input-output-hk/daedalus/pull/3219))
Expand Down
18 changes: 18 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-07-27";
cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
cardano-node-override.url = "github:IntersectMBO/cardano-node/9.1.1";
cardano-node-override.flake = false;
cardano-playground.url = "github:input-output-hk/cardano-playground/next-2024-07-24";
cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…
cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493";
Expand Down
2 changes: 1 addition & 1 deletion nix/internal/cardano-bridge.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ runCommandCC "daedalus-cardano-bridge" {
''}
${lib.optionalString (target == "x86_64-linux") ''
chmod +w -R .
for x in cardano-address cardano-node cardano-launcher cardano-cli cardano-wallet; do
for x in cardano-launcher cardano-wallet; do
$STRIP $x
patchelf --shrink-rpath $x
done
Expand Down
6 changes: 3 additions & 3 deletions nix/internal/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ rec {
}).defaultNix;

nodeFlake = let
unpatched = walletFlake.inputs.cardano-node-runtime;
unpatched = inputs.cardano-node-override;
in (flake-compat {
src = {
outPath = toString (pkgs.runCommand "source" {} ''
Expand All @@ -49,7 +49,7 @@ rec {
cd $out
cp ${walletFlake}/nix/supported-systems.nix $out/nix/supported-systems.nix
'');
inherit (unpatched.sourceInfo) rev shortRev lastModified lastModifiedDate;
inherit (unpatched) rev shortRev lastModified lastModifiedDate;
};
}).defaultNix;

Expand All @@ -62,7 +62,7 @@ rec {

nodePackages = {
x86_64-windows = nodeFlake.legacyPackages.x86_64-linux.hydraJobs.windows; # a bug in ${cardano-node}/flake.nix
x86_64-linux = nodeFlake.packages.x86_64-linux;
x86_64-linux = nodeFlake.hydraJobs.x86_64-linux.musl;
x86_64-darwin = nodeFlake.packages.x86_64-darwin;
aarch64-darwin = nodeFlake.packages.aarch64-darwin;
}.${targetSystem};
Expand Down

0 comments on commit e38f3a7

Please sign in to comment.