Merge pull request #2958 from input-output-hk/merge-4.9.1-into-master

Author: danielmain

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 4.9.1
+
+### Fixes
+ 
+- Fixed catalyst fund name ([PR 2946](https://github.com/input-output-hk/daedalus/pull/2946))
+- Fixed macOS installer on Monterey 12.3 ([PR 2929](https://github.com/input-output-hk/daedalus/pull/2929))
+
+### Chores
+
+- Introduced new version of the `@cardano-foundation/ledgerjs-hw-app-cardano` package ([PR 2930](https://github.com/input-output-hk/daedalus/pull/2930))
+
 ## 4.9.0
 
 ### Features

installers/common/MacInstaller.hs

@@ -153,6 +153,7 @@ sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/bin/darwin-x64-"*
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/build/Release/addon.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/prebuilds/darwin-x64/node.napi.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-x64/node.napi.node"
+sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake2/build/Release/binding.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/tiny-secp256k1/build/Release/secp256k1.node"
 
 # Sign the whole component deeply
@@ -177,27 +178,6 @@ codeSignEntitlements = [r|<?xml version="1.0" encoding="UTF-8"?>
   </dict>
 </plist>|]
 
-makePostInstall :: Format a (Text -> a)
-makePostInstall = "#!/usr/bin/env bash\n" %
-                  "#\n" %
-                  "# See /var/log/install.log to debug this\n" %
-                  "\n" %
-                  "src_pkg=\"$1\"\ndst_root=\"$2\"\ndst_mount=\"$3\"\nsys_root=\"$4\"\n" %
-                  "./dockutil --add \"${dst_root}/" % s % "\" --allhomes\n"
-
-makeScriptsDir :: Options -> DarwinConfig -> Managed T.Text
-makeScriptsDir Options{oBackend} DarwinConfig{dcAppNameApp} = case oBackend of
-    Cardano     _ -> common
-  where
-    common = do
-      tmp <- fromString <$> (liftIO $ getEnv "TMP")
-      tempdir <- mktempdir tmp "scripts"
-      liftIO $ do
-        cp "data/scripts/dockutil" (tempdir </> "dockutil")
-        writeTextFile (tempdir </> "postinstall") (format makePostInstall dcAppNameApp)
-        chmod executable (tempdir </> "postinstall")
-      pure $ tt tempdir
-
 makeSigningDir :: Managed (T.Text, T.Text)
 makeSigningDir = do
     tmp <- fromString <$> (liftIO $ getEnv "TMP")
@@ -245,6 +225,7 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "bip66"
       , "bitcoin-ops"
       , "blake2b"
+      , "blake2"
       , "blake-hash"
       , "blake2b-wasm"
       , "bn.js"
@@ -389,27 +370,21 @@ makeComponentRoot Options{oBackend,oCluster} appRoot darwinConfig@DarwinConfig{d
       exit $ ExitFailure 1
 
 makeInstaller :: Options -> DarwinConfig -> FilePath -> FilePath -> IO FilePath
-makeInstaller opts@Options{oOutputDir} darwinConfig@DarwinConfig{dcPkgName} componentRoot pkg = do
+makeInstaller Options{oOutputDir} DarwinConfig{dcPkgName} componentRoot pkg = do
   echo "Making installer ..."
-  let tempPkg1 = format fp (oOutputDir </> pkg)
-      tempPkg2 = oOutputDir </> (dropExtension pkg <.> "unsigned" <.> "pkg")
+  let
+    tempPkg1 = format fp (oOutputDir </> pkg)
+    tempPkg2 = oOutputDir </> (dropExtension pkg <.> "unsigned" <.> "pkg")
+    pkgargs :: [ T.Text ]
+    pkgargs =
+         [ "--identifier", dcPkgName
+         , "--component", tt componentRoot
+         , "--install-location", "/Applications"
+         , tempPkg1
+         ]
 
   mktree oOutputDir
-  with (makeScriptsDir opts darwinConfig) $ \scriptsDir -> do
-    let
-      pkgargs :: [ T.Text ]
-      pkgargs =
-           [ "--identifier"
-           , dcPkgName
-           , "--scripts", scriptsDir
-           , "--component"
-           , tt componentRoot
-           , "--install-location"
-           , "/Applications"
-           , tempPkg1
-           ]
-    run "ls" [ "-ltrh", scriptsDir ]
-    run "pkgbuild" pkgargs
+  run "pkgbuild" pkgargs
 
   run "productbuild" [ "--product", "data/plist"
                      , "--package", tempPkg1