Merge pull request #3033 from input-output-hk/merge-release-5.0.0-into-main

Merge release 5.0.0 into main

Author: danielmain

CHANGELOG.md

@@ -37,14 +37,6 @@ let
       chmod -R +w $out
       cd $out
       patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch}
-      patch -p1 -i ${builtins.path {
-        # XXX: unfortunately, GitHub changed lengths of hashes in patches it returns for PRs,
-        # that’s why we’re providing this patch inside our repo, with the same exact SHA-256,
-        # to the one released in 4.12.0:
-        path = ./nix/cardano-wallet--pr-3382--ledger-bug.patch;
-        recursive = false;
-        sha256 = "1ii12g2zikv4197c7bsh4v5dc1jzygn1jap8xvnr7mvh3a09pdgn";
-      }}
     '';
   };
   haskellNix = import sources."haskell.nix" {};
@@ -58,6 +50,7 @@ let
     aarch64-darwin = macos.silicon;
   }.${target};
   walletPkgs = import "${sources.cardano-wallet}/nix" {};
+  cardanoWorldFlake = (flake-compat { src = sources.cardano-world; }).defaultNix.outputs;
   # only used for CLI, to be removed when upgraded to next node version
   nodePkgs = import "${sources.cardano-node}/nix" {};
   shellPkgs = (import "${sources.cardano-shell}/nix") {};
@@ -76,11 +69,24 @@ let
   ostable.aarch64-darwin = "macos64-arm";
 
   packages = self: {
-    inherit walletFlake cluster pkgs version target nodeImplementation;
+    inherit walletFlake cardanoWorldFlake cluster pkgs version target nodeImplementation;
     cardanoLib = localLib.iohkNix.cardanoLib;
     daedalus-bridge = self.bridgeTable.${nodeImplementation};
 
-    nodejs = pkgs.nodejs-16_x;
+    nodejs = let
+      njPath = pkgs.path + "/pkgs/development/web/nodejs";
+      buildNodeJs = pkgs.callPackage (import (njPath + "/nodejs.nix")) {
+        python = pkgs.python3;
+        icu = pkgs.icu68; # can’t build against ICU 69: <https://chromium-review.googlesource.com/c/v8/v8/+/2477751>
+      };
+    in
+      buildNodeJs {
+        enableNpm = true;
+        version = "14.17.0";
+        sha256 = "1vf989canwcx0wdpngvkbz2x232yccp7fzs1vcbr60rijgzmpq2n";
+        patches = pkgs.lib.optional pkgs.stdenv.isDarwin (njPath + "/bypass-xcodebuild.diff");
+      };
+
     nodePackages = pkgs.nodePackages.override { nodejs = self.nodejs; };
     yarnInfo = {
       version = "1.22.4";
@@ -140,7 +146,7 @@ let
     nsis = nsisNixPkgs.callPackage ./nix/nsis.nix {};
 
     launcherConfigs = self.callPackage ./nix/launcher-config.nix {
-      inherit devShell topologyOverride configOverride genesisOverride;
+      inherit devShell topologyOverride configOverride genesisOverride system;
       network = cluster;
       os = ostable.${target};
       backend = nodeImplementation;
@@ -256,6 +262,24 @@ let
     '';
     uninstaller = if needSignedBinaries then self.signedUninstaller else self.unsignedUninstaller;
 
+    windowsIcons = let
+      buildInputs = with pkgs; [ imagemagick ];
+      # Allow fallback to `mainnet` if cluster’s icons don’t exist:
+      srcCluster = if builtins.pathExists (./installers/icons + "/${cluster}") then cluster else "mainnet";
+    in pkgs.runCommand "windows-icons-${cluster}" { inherit buildInputs; } ''
+      mkdir -p $out/${cluster} $out
+      cp -r ${./installers/icons + "/${srcCluster}"}/. $out/${cluster}/.
+      cp ${./installers/icons/installBanner.bmp} $out/installBanner.bmp
+      cd $out/${cluster}
+      rm *.ico *.ICO || true   # XXX: just in case
+      for f in *.png ; do
+        # XXX: these sizes are too large for the ICO format:
+        if [ "$f" == 1024x1024.png ] || [ "$f" == 512x512.png ] ; then continue ; fi
+        convert "$f" "''${f%.png}.ico"
+      done
+      convert 16x16.png 24x24.png 32x32.png 48x48.png 64x64.png 128x128.png 256x256.png ${cluster}.ico
+    '';
+
     unsigned-windows-installer = let
       installDir = self.launcherConfigs.installerConfig.spacedName;
     in pkgs.runCommand "win64-installer-${cluster}" {
@@ -270,7 +294,7 @@ let
       mkdir -p $out/{nix-support,cfg-files}
       mkdir installers
       cp -vir ${./installers/dhall} installers/dhall
-      cp -vir ${./installers/icons} installers/icons
+      cp -vir ${self.windowsIcons} installers/icons
       cp -vir ${./package.json} package.json
       chmod -R +w installers
       cd installers

default.nix

@@ -1 +1 @@
-mainnet selfnode mainnet_flight testnet
+mainnet preprod preview shelley_qa selfnode

installer-clusters.cfg

@@ -58,6 +58,9 @@ data Cluster
   | Shelley_QA
   | Testnet
   | Alonzo_Purple
+  | Vasil_Dev
+  | Preprod
+  | Preview
   deriving (Bounded, Enum, Eq, Read, Show)
 
 -- | The wallet backend to include in the installer.
@@ -109,6 +112,9 @@ clusterNetwork Staging = "staging"
 clusterNetwork Shelley_QA = "shelley_qa"
 clusterNetwork Testnet = "testnet"
 clusterNetwork Alonzo_Purple = "alonzo_purple"
+clusterNetwork Vasil_Dev = "vasil_dev"
+clusterNetwork Preprod = "preprod"
+clusterNetwork Preview = "preview"
 
 packageFileName :: OS -> Cluster -> Version -> Backend -> Text -> Maybe BuildJob -> FilePath
 packageFileName _os cluster ver backend _backendVer build = fromText name <.> ext

installers/common/Types.hs

@@ -8,7 +8,17 @@
 mkDerivation {
   pname = "daedalus-installer";
   version = "0.1.0.0";
-  src = ./.;
+  src = lib.cleanSourceWith {
+    name = "daedalus-installer-src";
+    src = ./.;
+    filter = name: type: (type == "directory" && (
+      lib.hasSuffix "/common" name
+    )) || (type == "regular" && (
+      lib.hasSuffix ".hs" name ||
+      lib.hasSuffix ".cabal" name ||
+      lib.hasSuffix "/cabal.project" name
+    ));
+  };
   isLibrary = true;
   isExecutable = true;
   doCheck = false;