Merge tag '6.0.1' into merge-6-0-1-into-main

Daedalus 6.0.1 release

; -----BEGIN PGP SIGNATURE-----
;
; iQJHBAABCgAxFiEE+cmdT4vmbTqno6wTuh9KoKGM3FoFAmbW9mUTHG1pY2hhbC5y
; dXNAaW9oay5pbwAKCRC6H0qgoYzcWm/DEACcvgN98hPgjfQj+FAsh/HLoAqiWSwR
; PBuIJE0j+Cykz1Nu2WDvnGtIIhLFUAlzwcYgSgJyeUIa+BUKMs2vNe2hc0WdgpCE
; hE/wUnvhW+V0AZifY611SvEzekouVXNTW2nQEowUX4rSX1chpES8/DxKgBwTyakQ
; F3RZ9Luvscekpq0648Ulnr6fUG8EIEyjOma+YxVE0BXju11IOG/DzqarYPFAfO/L
; KjF58z7D1BPRwkPrj6SNxDSMTqNwQRjqAyYMDwjwbrUVE1SXCD7Mu8RYKFxR/q4+
; 2C36h3B2GTwbJTnI9S51CC+W4sUOXT0VIdXdKIuELGCCuXf4zxiYbjud2YHQI01A
; 40mZ0FDZ61GC+VhZ/BvvijL5EbRHW+SVKr8ZbvX4Au9mCYuIyroXLlzEq9o4e0we
; 40SSesKz9boIBykF4Hk3NYuyIloPQxlcDeqBKWEq7DF3mR4nIDOwHkDK19E9j1Ct
; 9xbgyssuz1Trbh3LzzENsQBM6ONf5UegUfIxy77bOOJPdtombqq3DgJPH6B4R1FL
; rNlh6XM9dZbNmGbr8FDjMgFl44SbO6kjUxFokVxxLF8er7vTE2vb75zjZPjiVpW0
; qVsTbLbdacFkk3pKihCwP7MzJWdcHE3AzV0jQ6LFoLVKqUy7N5E7esFC78lwM+ic
; /4boVnHWBqRHEg==
; =r+Ol
; -----END PGP SIGNATURE-----
; gpg: Signature made Tue 03 Sep 2024 13:43:33 CEST
; gpg:                using RSA key F9C99D4F8BE66D3AA7A3AC13BA1F4AA0A18CDC5A
; gpg:                issuer "[email protected]"
; gpg: Good signature from "Michal Rus <[email protected]>" [ultimate]
; Primary key fingerprint: F9C9 9D4F 8BE6 6D3A A7A3  AC13 BA1F 4AA0 A18C DC5A

Author: michalrus

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 6.0.1
+
+### 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))
+
 ## 6.0.0
 
 ### Chores

flake.lock

@@ -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";

flake.nix

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

nix/internal/cardano-bridge.nix

@@ -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" {} ''
@@ -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;
 
@@ -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};

nix/internal/common.nix

@@ -291,6 +291,12 @@ in rec {
 
       cp ${pkgs.writeText "daedalus" ''
         #!/bin/sh
+
+        if [ -n "$LD_LIBRARY_PATH" ]; then
+          echo >&2 'Warning: ‘LD_LIBRARY_PATH’ is set, it’s been known to cause problems in the past, unsetting it.'
+          unset LD_LIBRARY_PATH
+        fi
+
         set -ex
 
         ENTRYPOINT_DIR="$(dirname "$(dirname "$(readlink -f "$0")")")"

nix/internal/x86_64-linux.nix

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {