From 5eb48e030d143746b3f172d5b828baa454bdfa0b Mon Sep 17 00:00:00 2001 From: epoberezkin Date: Wed, 8 Nov 2023 12:51:57 +0000 Subject: [PATCH] deploy: d233d07ddc13ee278479c9df4d62337a6fe3d6d8 --- docs/cli.html | 2 +- docs/contributing.html | 53 +++++++++++++++++------------------------- 2 files changed, 22 insertions(+), 33 deletions(-) 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 .

In any OS

    -
  1. Install Haskell GHCup, GHC 9.6.2 and cabal 3.10.1.0:
    2. +
  2. Install Haskell GHCup, GHC 9.6.3 and cabal 3.10.1.0:
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

master-ios and windows-ghc8107 branches should be the same as master-ghc8107 except Nix configuration files.

In simplexmq repo

Development & release process

@@ -833,20 +833,13 @@ window.addEventListener('scroll',changeHeaderBg);
  1. -

    To build Android core library, merge master-ghc8107 branch to master-android branch, and push to GitHub.

    -
    2. -
  2. -

    To build iOS core library, merge master-ghc8107 branch to master-ios branch, and push to GitHub.

    -
    3. -
  3. -

    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.

  4. To build Desktop and CLI apps, make tag in master branch, APK files should be attached to the release.

    @@ -857,33 +850,29 @@ window.addEventListener('scroll',changeHeaderBg);
-
    +
    1. Independently, master branch of simplexmq repo should be merged to stable branch on stable releases.
    -

    Differences between GHC 8.10.7 and GHC 9.6.2

    +

    Differences between GHC 8.10.7 and GHC 9.6.3

    1. The main difference is related to 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}
 
      
 
    1. Most monad functions now have to be imported from Control.Monad, and not from specific monad modules (e.g. Control.Monad.Except).
      2. 
 
    
-
    -- 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.