Merge branch 'master' into remote-desktop

2023-11-08 13:10:42 +00:00
parent 2776d864a8 d233d07ddc
commit 3839267f88
32 changed files with 299 additions and 91 deletions
--- a/scripts/desktop/build-lib-linux.sh
+++ b/scripts/desktop/build-lib-linux.sh
@@ -8,7 +8,7 @@ function readlink() {

 OS=linux
 ARCH=${1:-`uname -a | rev | cut -d' ' -f2 | rev`}
-GHC_VERSION=9.6.2
+GHC_VERSION=9.6.3

 if [ "$ARCH" == "aarch64" ]; then
    COMPOSE_ARCH=arm64
--- a/scripts/desktop/build-lib-mac.sh
+++ b/scripts/desktop/build-lib-mac.sh
@@ -5,7 +5,7 @@ set -e
 OS=mac
 ARCH="${1:-`uname -a | rev | cut -d' ' -f1 | rev`}"
 COMPOSE_ARCH=$ARCH
-GHC_VERSION=9.6.2
+GHC_VERSION=9.6.3

 if [ "$ARCH" == "arm64" ]; then
    ARCH=aarch64