Merge pull request #3217 from input-output-hk/merge-6-0-0-to-main

Merge release 6.0.0 to `main`

Author: michalrus

.github/workflows/verify_pr.yml

@@ -6,16 +6,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: "14"
+          node-version: 18
       - name: Restore node_modules from cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+      - name: Install native dependencies
+        run: sudo apt-get install libudev-dev
       - name: Install dependencies
         run: yarn --frozen-lockfile
       - name: Run checks

Brewfile.netlify

@@ -0,0 +1,4 @@
+brew "libusb"
+
+# libudev.h
+brew "systemd"

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 6.0.0
+
+### Chores
+
+- Updated `@cardano-foundation/ledgerjs-hw-app-cardano` to version `7.1.3` and `@trezor/connect` to version `9.3.0` ([PR 3093](https://github.com/input-output-hk/daedalus/pull/3215))
+
+## 5.5.0
+
+### Fixes
+
+- Fixed installation and running on Ubuntu 24.04 LTS with AppArmor enabled by removing the `chroot` ([PR 3207](https://github.com/input-output-hk/daedalus/pull/3207))
+
+### Chores
+
+- Updated cardano-node to 9.1.0 (via cardano-wallet) ([PR 3212](https://github.com/input-output-hk/daedalus/pull/3212))
+
 ## 5.4.0
 
 ### Fixes

flake.lock

@@ -3,16 +3,18 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
-    cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2024-05-05";
+    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-playground.url = "github:input-output-hk/cardano-playground";
+    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";
     cardano-shell.flake = false;
     tullia.url = "github:input-output-hk/tullia";
     tullia.flake = false; # otherwie, +1k dependencies in flake.lock…
     flake-compat.url = "github:input-output-hk/flake-compat";
     flake-compat.flake = false;
+    nix-bundle-exe.url = "github:3noch/nix-bundle-exe";
+    nix-bundle-exe.flake = false;
   };
 
   outputs = inputs: let

flake.nix

@@ -216,9 +216,12 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
     externalYarn :: [FilePath]
     externalYarn =
       [ "@babel"
+      , "@emurgo"
+      , "@fivebinaries"
       , "@noble"
       , "@protobufjs"
       , "@trezor"
+      , "@sinclair"
       , "agent-base"
       , "babel-runtime"
       , "base-x"
@@ -307,13 +310,17 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "socks-proxy-agent"
       , "tiny-inflate"
       , "tiny-secp256k1"
+      , "tr46"
       , "tslib"
+      , "ts-mixer"
       , "typeforce"
       , "unicode-properties"
       , "unicode-trie"
+      , "usb"
       , "usb-detection"
       , "util-deprecate"
       , "varuint-bitcoin"
+      , "whatwg-url"
       , "wif"
       ]
   mapM_ (\lib -> do
@@ -365,8 +372,10 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
       forM_ ["config.yaml", "genesis.json", "topology.yaml" ] $ \f ->
         cp f (dataDir </> f)
       when (oCluster /= Selfnode) $ do
-        forM_ ["genesis-byron.json", "genesis-shelley.json", "genesis-alonzo.json", "genesis-conway.json" ] $ \f ->
+        forM_ ["genesis-byron.json", "genesis-shelley.json", "genesis-alonzo.json"] $ \f ->
           cp f (dataDir </> f)
+        forM_ ["genesis-conway.json"] $ \f ->
+          whenM (testfile f) $ cp f (dataDir </> f)
 
       when (oCluster == Selfnode) $ do
         cp "signing.key" (dataDir </> "signing.key")

installers/common/MacInstaller.hs

@@ -13,7 +13,7 @@ import           Universum hiding (pass, writeFile, stdout, FilePath, die, view)
 import qualified Data.List as L
 import qualified Data.Text as T
 import           Data.Yaml                 (decodeFileThrow)
-import           Development.NSIS (Attrib (IconFile, IconIndex, RebootOK, Recursive, Required, StartOptions, Target),
+import           Development.NSIS (Attrib (IconFile, IconIndex, RebootOK, Recursive, Required, StartOptions, Target, NonFatal),
                                    HKEY (HKLM), Level (Highest), Page (Directory, InstFiles), abort,
                                    constant, constantStr, createDirectory, createShortcut, delete,
                                    deleteRegKey, file, iff_, installDir, installDirRegKey,
@@ -225,7 +225,7 @@ writeInstallerNSIS outName (Version fullVersion') InstallerConfig{installDirecto
                     file [] "topology.yaml"
                     file [] "genesis.json"
                     when (clusterName /= Selfnode) $ do
-                      file [] "genesis-conway.json"
+                      file [NonFatal] "genesis-conway.json"
                       file [] "genesis-byron.json"
                       file [] "genesis-shelley.json"
                       file [] "genesis-alonzo.json"