diff --git a/docs/cli.html b/docs/cli.html index d43d1f3534..3a59e31c3b 100644 --- a/docs/cli.html +++ b/docs/cli.html @@ -856,7 +856,7 @@ DOCKER_BUILDKIT=1 docker build --output ~/.local/bin .
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
diff --git a/docs/contributing.html b/docs/contributing.html
index 00a7860edc..5c2eb55db9 100644
--- a/docs/contributing.html
+++ b/docs/contributing.html
@@ -786,38 +786,38 @@ window.addEventListener('scroll',changeHeaderBg);
In simplex-chat repo
stable - stable release of the apps, can be used for updates to the previous stable release (GHC 9.6.2).
stable - stable release of the apps, can be used for updates to the previous stable release (GHC 9.6.3).
stable-android - used to build stable Android core library with Nix (GHC 8.10.7).
stable-android - used to build stable Android core library with Nix (GHC 8.10.7) - only for Android armv7a.
stable-ios - used to build stable iOS core library with Nix (GHC 8.10.7) – this branch should be the same as stable-android except Nix configuration files.
stable-ios - used to build stable iOS core library with Nix (GHC 8.10.7) – this branch should be the same as stable-android except Nix configuration files. Deprecated.
master - branch for beta version releases (GHC 9.6.2).
master - branch for beta version releases (GHC 9.6.3).
master-ghc8107 - branch for beta version releases (GHC 8.10.7).
master-ghc8107 - branch for beta version releases (GHC 8.10.7). Deprecated.
master-android - used to build beta Android core library with Nix (GHC 8.10.7), same as master-ghc8107
master-android - used to build beta Android core library with Nix (GHC 8.10.7) - only for Android armv7a.
master-ios - used to build beta iOS core library with Nix (GHC 8.10.7).
master-ios - used to build beta iOS core library with Nix (GHC 8.10.7). Deprecated.
windows-ghc8107 - branch for windows core library build (GHC 8.10.7).
windows-ghc8107 - branch for windows core library build (GHC 8.10.7). Deprecated?
master-ios and windows-ghc8107 branches should be the same as master-ghc8107 except Nix configuration files.
In simplexmq repo
master - uses GHC 9.6.2 its commit should be used in master branch of simplex-chat repo.
master - uses GHC 9.6.3 its commit should be used in master branch of simplex-chat repo.
master-ghc8107 - its commit should be used in master-android (and master-ios) branch of simplex-chat repo.
master-ghc8107 - its commit should be used in master-android (and master-ios) branch of simplex-chat repo. Deprecated.
master branch to master-ghc8107 branch.simplexmq commit in master-ghc8107 branch to the commit in master-ghc8107 branch (probably, when resolving merge conflicts).master branch to master-android branch.To build Android core library, merge master-ghc8107 branch to master-android branch, and push to GitHub.
To build iOS core library, merge master-ghc8107 branch to master-ios branch, and push to GitHub.
To build windows core library, merge master-ghc8107 branch to windows-ghc8107 branch, and push to GitHub.
All libraries should be built from master branch, Android armv7a - from master-android branch.
To build Desktop and CLI apps, make tag in master branch, APK files should be attached to the release.
master to stablemaster to master-ghc8107 (and compile/update code)master-ghc8107 to master-androidmaster-ghc8107 to master-iosmaster-ghc8107 to windows-ghc8107master to master-android (and compile/update code)master-android to stable-androidmaster-ios to stable-iosmaster branch of simplexmq repo should be merged to stable branch on stable releases.DuplicateRecordFields extension.It is no longer possible in GHC 9.6.2 to specify type when using selectors, instead OverloadedRecordDot extension and syntax are used that need to be removed in GHC 8.10.7:
+It is no longer possible in GHC 9.6.3 to specify type when using selectors, instead OverloadedRecordDot extension and syntax are used that need to be removed in GHC 8.10.7:
{-# LANGUAGE DuplicateRecordFields #-}
--- use this in GHC 9.6.2 when needed
+-- use this in GHC 9.6.3 when needed
{-# LANGUAGE OverloadedRecordDot #-}
--- GHC 9.6.2 syntax
+-- GHC 9.6.3 syntax
let x = record.field
--- GHC 8.10.7 syntax removed in GHC 9.6.2
+-- GHC 8.10.7 syntax removed in GHC 9.6.3
let x = field (record :: Record)
It is still possible to specify type when using record update syntax, use this pragma to suppress compiler warning:
--- use this in GHC 9.6.2 when needed
+-- use this in GHC 9.6.3 when needed
{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
let r' = (record :: Record) {field = value}
@@ -891,7 +880,7 @@ let r' = (record :: Record) {field = value}
- Most monad functions now have to be imported from
Control.Monad, and not from specific monad modules (e.g. Control.Monad.Except).
--- use this in GHC 9.6.2 when needed
+-- use this in GHC 9.6.3 when needed
import Control.Monad
This PR has all the differences.