Merge pull request #3291 from input-output-hk/release/7.2.0

Release 7.2.0

Author: michalrus

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 7.2.0
+
+### Fixes
+
+- Fixed a blank screen issue ([PR 3289](https://github.com/input-output-hk/daedalus/pull/3289))
+
+### Chores
+
+- Update `cardano-node` to 10.2.1 and `cardano-wallet` to v2025-03-31 ([PR 3288](https://github.com/input-output-hk/daedalus/pull/3288))
+
+- Added the links to app.projectcatalyst.io ([PR 3286](https://github.com/input-output-hk/daedalus/pull/3286))
+
 ## 7.1.0
 
 ### Chores

flake.lock

@@ -3,9 +3,9 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
-    cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2025-01-09";
+    cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2025-03-31";
     cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
-    cardano-node-override.url = "github:IntersectMBO/cardano-node/10.1.4";
+    cardano-node-override.url = "github:IntersectMBO/cardano-node/10.2.1";
     cardano-node-override.flake = false;
     cardano-playground.url = "github:input-output-hk/cardano-playground/d3322dce0ab1c00386adc93899aabe9252342b54";
     cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…

flake.nix

@@ -4,5 +4,7 @@ command = "yarn && yarn storybook:build"
 [build.environment]
 YARN_VERSION = "1.22.19"
 NODE_VERSION = "18.12.1"
-CXXFLAGS = "-I/home/linuxbrew/.linuxbrew/include"
-LDFLAGS = "-L/home/linuxbrew/.linuxbrew/lib"
+CPPFLAGS = "-I/home/linuxbrew/.linuxbrew/opt/systemd/include -I/home/linuxbrew/.linuxbrew/include"
+CXXFLAGS = "-I/home/linuxbrew/.linuxbrew/opt/systemd/include -I/home/linuxbrew/.linuxbrew/include"
+LDFLAGS  = "-L/home/linuxbrew/.linuxbrew/opt/systemd/lib -L/home/linuxbrew/.linuxbrew/lib"
+PKG_CONFIG_PATH = "/home/linuxbrew/.linuxbrew/opt/systemd/lib/pkgconfig:/home/linuxbrew/.linuxbrew/lib/pkgconfig"

netlify.toml

@@ -392,9 +392,9 @@ in rec {
   makeSignedInstaller = genClusters (cluster: pkgs.writeShellScriptBin "make-signed-installer" (let
 
     # FIXME: in the future this has to be done better, now let’s reuse the Buildkite legacy:
-    credentials = "/var/lib/buildkite-agent/signing.sh";
-    codeSigningConfig = "/var/lib/buildkite-agent/code-signing-config.json";
-    signingConfig = "/var/lib/buildkite-agent/signing-config.json";
+    credentials = "/var/lib/buildkite-agent-default/signing.sh";
+    codeSigningConfig = "/var/lib/buildkite-agent-default/code-signing-config.json";
+    signingConfig = "/var/lib/buildkite-agent-default/signing-config.json";
     shallSignPredicate = "[ -f ${credentials} ] && [ -f ${codeSigningConfig} ] && [ -f ${signingConfig} ]";
     bashSetup = ''
       set -o errexit
@@ -451,7 +451,7 @@ in rec {
       if ${shallSignPredicate} ; then
         echo "Signing installer…"
 
-        # FIXME: this doesn’t work outside of `buildkite-agent`, it seems:
+        # FIXME: this doesn’t work outside of `buildkite-agent-default`, it seems:
         #(
         #  source ${credentials}
         #  security unlock-keychain -p "$SIGNING" "$signingKeyChain"
@@ -473,7 +473,7 @@ in rec {
     cd /
     ${bashSetup}
     if ${shallSignPredicate} && [ "$USER" == "root" ]; then
-      exec sudo -u buildkite-agent ${packAndSign}
+      exec sudo -u buildkite-agent-default ${packAndSign}
     else
       exec ${packAndSign}
     fi

nix/internal/any-darwin.nix

@@ -0,0 +1,20 @@
+diff --git a/flake.nix b/flake.nix
+index 76b05e4d73..03fd75e9e7 100644
+--- a/flake.nix
++++ b/flake.nix
+@@ -370,6 +370,7 @@
+                     tests = lib.collect lib.isDerivation windowsPackages.tests;
+                     benchmarks = lib.collect lib.isDerivation windowsPackages.benchmarks;
+                   };
++                  inherit windowsPackages;
+                 };
+             }
+             # macos is never cross-compiled
+@@ -434,6 +435,7 @@
+               inherit pkgs;
+               project = walletProject;
+             };
++            musl64Packages = mkPackages walletProject.projectCross.musl64;
+           }) // {
+             # Continuous integration builds
+             ci.tests.all = pkgs.releaseTools.aggregate {

nix/internal/cardano-wallet--expose-musl64Packages.patch

@@ -33,8 +33,7 @@ rec {
         cp -r ${unpatched} $out
         chmod -R +w $out
         cd $out
-        patch -p1 -i ${./cardano-wallet--expose-windowsPackages.patch}
-        patch -p1 -i ${./cardano-wallet--expose-musl64Packages.patch}
+        patch -p1 -i ${./cardano-wallet--expose-packages.patch}
       '');
       inherit (unpatched) rev shortRev lastModified lastModifiedDate;
     };
@@ -55,7 +54,7 @@ rec {
   }).defaultNix;
 
   walletPackages = {
-    x86_64-windows = walletFlake.packages.x86_64-linux.windowsPackages;
+    x86_64-windows = walletFlake.packages.x86_64-linux.ci.artifacts.win64.windowsPackages;
     x86_64-linux = walletFlake.packages.x86_64-linux.musl64Packages;
     x86_64-darwin = walletFlake.packages.x86_64-darwin;
     aarch64-darwin = walletFlake.packages.aarch64-darwin;

nix/internal/cardano-wallet--expose-packages.patch

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