core: unify dependencies for GHC 8.10.7 and 9.6.3 (#3774 )

fix merge
Merge branch 'stable' into stable-android
2024-12-17 17:20:21 +01:00 · 2024-01-30 23:18:37 +00:00 · 2024-01-24 22:46:56 +00:00 · 2024-01-24 22:42:04 +00:00 · 2024-01-24 19:54:47 +00:00 · 2024-01-18 20:58:52 +00:00
23 changed files with 694 additions and 846 deletions
@@ -87,7 +87,7 @@ jobs:
        uses: actions/checkout@v3

      - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v2
        with:
          ghc-version: ${{ matrix.ghc }}
          cabal-version: "3.10.1.0"
@@ -197,7 +197,7 @@ jobs:
          APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
          APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
        run: |
-          scripts/ci/build-desktop-mac.sh
+          scripts/build-desktop-mac.sh
          path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
          echo "package_path=$path" >> $GITHUB_OUTPUT
          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
@@ -277,7 +277,9 @@ jobs:
      # Unix /

      # / Windows
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
+
+      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
+      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065

      - name: 'Setup MSYS2'
        if: matrix.os == 'windows-latest'
@@ -234,6 +234,8 @@ You can use SimpleX with your own servers and still communicate with people usin

 Recent and important updates:

+[Jan 24, 2024. SimpleX Chat: free infrastructure from Linode, v5.5 released with private notes, group history and a simpler UX to connect.](./blog/20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.md)
+
 [Nov 25, 2023. SimpleX Chat v5.4 released: link mobile and desktop apps via quantum resistant protocol, and much better groups](./blog/20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.md).

 [Sep 25, 2023. SimpleX Chat v5.3 released: desktop app, local file encryption, improved groups and directory service](./blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.md).
@@ -299,7 +301,7 @@ What is already implemented:
 11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
 12. Manual messaging queue rotations to move conversation to another SMP relay.
 13. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
-14. Local files encryption, except videos (to be added later).
+14. Local files encryption.

 We plan to add:

@@ -371,12 +373,13 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Desktop client.
 - ✅ Encryption of local files stored in the app.
 - ✅ Using mobile profiles from the desktop app.
+- ✅ Private notes.
+- ✅ Improve sending videos (including encryption of locally stored videos).
 - 🏗 Improve experience for the new users.
 - 🏗 Post-quantum resistant key exchange in double ratchet protocol.
 - 🏗 Large groups, communities and public channels.
- Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
+- 🏗 Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - Privacy & security slider - a simple way to set all settings at once.
- Improve sending videos (including encryption of locally stored videos).
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
 - Improved navigation and search in the conversation (expand and scroll to quoted message, scroll to search results, etc.).
@@ -71,7 +71,7 @@ if(NOT APPLE)
 else()
 	# Without direct linking it can't find hs_init in linking step
 	add_library( rts SHARED IMPORTED )
-	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/libHSrts*_thr-*.${OS_LIB_EXT})
+	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/deps/libHSrts*_thr-*.${OS_LIB_EXT})
 	set_target_properties( rts PROPERTIES IMPORTED_LOCATION ${RTSLIB})

 	target_link_libraries(app-lib rts simplex)
@@ -0,0 +1,119 @@
+---
+layout: layouts/article.html
+title: "SimpleX Chat: free infrastructure from Linode, v5.5 released with private notes, group history and a simpler UX to connect."
+date: 2024-01-24
+previewBody: blog_previews/20240124.html
+image: images/20240124-connect1.png
+permalink: "/blog/20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.html"
+---
+
+# SimpleX Chat: free infrastructure from Linode, v5.5 released with private notes, group history and a simpler UX to connect.
+
+**Published:** Jan 24, 2024
+
+[SimpleX Chat infrastructure on Linode](#simplex-chat-infrastructure-on-linode):
+- Free infrastructure.
+- SimpleX servers in Linode Marketplace.
+- High capacity messaging servers.
+
+What's new in v5.5:
+- [private notes](#private-notes)
+- [group history](#group-history)
+- [simpler UX to connect to other users](#simpler-ux-to-connect-to-other-users)
+- [message delivery stability and other improvements](#message-delivery-stability-and-other-improvements)
+
+Also, we added Hungarian (only Android) and Turkish interface languages, thanks to [our users and Weblate](https://github.com/simplex-chat/simplex-chat#help-translating-simplex-chat).
+
+SimpleX Chat Android app is now available in 20 languages!
+
+## SimpleX Chat infrastructure on Linode
+
+We chose Linode as our hosting provider as and they have been consistently reliable, cheaper than alternatives, with excellent support and great documentation.
+
+When Linode was acquired by Akamai, we were a bit nervous about how it may affect service quality. So far it's been working out quite well.
+
+As the usage of SimpleX network was growing, so did our hosting costs, and from being really small they started to become significant, particularly as we didn't yet manage to optimize the servers last year.
+
+Linode helped - we're really excited to announce that Akamai decided to support SimpleX Chat growth by accepting it into their [Linode Rise startup program](https://www.linode.com/linode-for-startups/).
+
+Thanks to this program:
+
+- we received free infrastructure for the first year up to $10,000 per month, no strings attached. It already saved us some money, and gave us enough time to optimize the servers - the latest version of the servers are much less costly to operate with the current traffic, and can support a much larger traffic within this limit. In the year 2 of the program we will receive 50% discount with unlimited traffic, and in year 3 - 25% discount.
+
+- Linode Marketplace now includes [SimpleX Chat messages and file servers](https://www.linode.com/marketplace/apps/simplex-chat/simplex-chat/) - you can get free $100 credits for the first 2 months and run your own servers in just a few clicks, and use them in SimpleX Chat apps. Anybody can submit their application to Linode marketplace, but dedicated support we have from Linode team via this program made it simpler.
+
+- Akamai solution engineers are helping us to design high capacity server solution, free of charge, so that a single host can provide horizontally scalable capacity for messaging, allowing for a much larger number of concurrent users on a single server address. Initially we considered using HAProxy, and the latest proof of concept uses OpenResty - a fork of Nginx with Lua script engine - to route requests from a single host to multiple SMP relays, reducing an overhead for the clients that would be configured with a smaller number of higher capacity servers. This project is still in progress, there will be more details as we roll it out.
+
+## What's new in v5.5
+
+### Private notes
+
+<img src="./images/20240124-notes1.png" width="220" class="float-to-left"> <img src="./images/20240124-notes2.png" width="220" class="float-to-left">
+
+*"Where do I put notes for myself?"* was a very common support question. There was a workaround - you could create an empty group, just with yourself, and use it to save notes, but it was not very convenient, and you could accidentally add members there.
+
+This version has a more convenient and private alternative - the Private notes. It looks like an ordinary conversation where you can put text messages, links with previews, and any media and files, but they are not sent anywhere - they are stored locally, only on your device, with encrypted files.
+
+You can access the Private notes created in mobile app from desktop app too, by linking a mobile and desktop apps - the feature [added in the previous version](./20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.md). It allows to conveniently share files between the devices without sending them over the Internet.
+
+### Group history
+
+<img src="./images/20240124-history1.png" width="220" class="float-to-left"> <img src="./images/20240124-history2.png" width="220" class="float-to-left">
+
+In the previous version, when users joined groups, they only saw an empty conversation, and the notifications of being connected to other members. This version allows group admins sending recent group history to the new members - this option is enabled by default for new groups, and can be enabled for the existing groups in the preferences. So now new members can join the conversation as soon as they join.
+
+This does not mean that these messages are stored on any servers - the admin member that adds a new member to the group sends these messages directly when a new member joins. Groups are still fully decentralized, do not have any identity on the network, and fully private - only their members know they exist.
+
+That is, unless a group owner decides to make it public. Groups can be registered in [SimpleX groups directory](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) to be discovered by the new members - group directory is also improved.
+
+### Simpler UX to connect to other users
+
+<img src="./images/20240124-connect1.png" width="220" class="float-to-left"> <img src="./images/20240124-connect2.png" width="220" class="float-to-left">
+
+SimpleX platform has no user accounts or identities, and while it improves metadata privacy, it also makes it harder to understand how to connect to other people, particularly for the new users who are not invited by the existing users.
+
+This version simplifies this interface by allowing to connect via the received link just by pasting the address into the search bar, as is common in many wallet apps and some other decentralized messengers. We also improved the interface of creating invitation links.
+
+We will continue working on improving and simplifying user interface throughout the year. Please send us any feedback and suggestions to the team's address available in the app.
+
+### Message delivery stability and other improvements
+
+One of the long standing issues was that message reception could get stuck in some rare occasions, and only get resumed once the app is fully restarted. As Android app includes an always-on notification service that runs in background, full restart should be done via the app settings.
+
+This version fixed many issues with message delivery stability and also added some diagnostics to identify any other cases when message delivery may stop. These fixes should also reduce battery usage, particularly on slow internet connections.
+
+Other improvements in this version:
+- you can now reveal secret messages by tapping. To send a secret message wrap in "#" characters, e.g. "\#password\#".
+- you can delete the last user profile, simplifying account deletion. If you have [hidden user profiles](./20230328-simplex-chat-v4-6-hidden-profiles.md), they won't be deleted in this case, and will be accessible again once you create a new profile.
+
+## SimpleX platform
+
+Some links to answer the most common questions:
+
+[How can SimpleX deliver messages without user identifiers](./20220511-simplex-chat-v2-images-files.md#the-first-messaging-platform-without-user-identifiers).
+
+[What are the risks to have identifiers assigned to the users](./20220711-simplex-chat-v3-released-ios-notifications-audio-video-calls-database-export-import-protocol-improvements.md#why-having-users-identifiers-is-bad-for-the-users).
+
+[Technical details and limitations](https://github.com/simplex-chat/simplex-chat#privacy-technical-details-and-limitations).
+
+[How SimpleX is different from Session, Matrix, Signal, etc.](https://github.com/simplex-chat/simplex-chat/blob/stable/README.md#frequently-asked-questions).
+
+Please also see our [website](https://simplex.chat).
+
+## Help us with donations
+
+Huge thank you to everybody who donated to SimpleX Chat!
+
+We are prioritizing users privacy and security - it would be impossible without your support.
+
+Our pledge to our users is that SimpleX protocols are and will remain open, and in public domain, - so anybody can build the future implementations of the clients and the servers. We are building SimpleX platform based on the same principles as email and web, but much more private and secure.
+
+Your donations help us raise more funds – any amount, even the price of the cup of coffee, makes a big difference for us.
+
+See [this section](https://github.com/simplex-chat/simplex-chat/tree/master#help-us-with-donations) for the ways to donate.
+
+Thank you,
+
+Evgeny
+
+SimpleX Chat founder
@@ -1,5 +1,20 @@
 # Blog

+Jan 24, 2024 [SimpleX Chat: free infrastructure from Linode, v5.5 released](./20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.md)
+
+SimpleX Chat infrastructure on Linode:
+- Free infrastructure.
+- SimpleX servers in Linode Marketplace.
+- High capacity messaging servers.
+
+What's new in v5.5:
+- private notes.
+- group history.
+- simpler UX to connect to other users.
+- message delivery stability and other improvements.
+
+---
+
 Nov 25, 2023 [SimpleX Chat v5.4 released](./20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.md)

 - Link mobile and desktop apps via secure quantum-resistant protocol. 🔗
@@ -16,6 +16,21 @@
        "type": "github"
      }
    },
+    "blank": {
+      "locked": {
+        "lastModified": 1625557891,
+        "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=",
+        "owner": "divnix",
+        "repo": "blank",
+        "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "blank",
+        "type": "github"
+      }
+    },
    "cabal-32": {
      "flake": false,
      "locked": {
@@ -83,6 +98,64 @@
        "type": "github"
      }
    },
+    "devshell": {
+      "inputs": {
+        "flake-utils": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1663445644,
+        "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "dmerge": {
+      "inputs": {
+        "nixlib": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ],
+        "yants": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "yants"
+        ]
+      },
+      "locked": {
+        "lastModified": 1659548052,
+        "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=",
+        "owner": "divnix",
+        "repo": "data-merge",
+        "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "data-merge",
+        "type": "github"
+      }
+    },
    "flake-compat": {
      "flake": false,
      "locked": {
@@ -100,34 +173,74 @@
        "type": "github"
      }
    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
+    "flake-compat_2": {
+      "flake": false,
      "locked": {
-        "lastModified": 1698579227,
-        "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "f76e870d64779109e41370848074ac4eaa1606ec",
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
        "type": "github"
      },
      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
+        "owner": "edolstra",
+        "repo": "flake-compat",
        "type": "github"
      }
    },
    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
        "type": "github"
      },
      "original": {
@@ -153,51 +266,33 @@
        "type": "github"
      }
    },
-    "ghc98X": {
-      "flake": false,
+    "gomod2nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2",
+        "utils": "utils"
+      },
      "locked": {
-        "lastModified": 1696643148,
-        "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=",
-        "ref": "ghc-9.8",
-        "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6",
-        "revCount": 61642,
-        "submodules": true,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/ghc/ghc"
+        "lastModified": 1655245309,
+        "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=",
+        "owner": "tweag",
+        "repo": "gomod2nix",
+        "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58",
+        "type": "github"
      },
      "original": {
-        "ref": "ghc-9.8",
-        "submodules": true,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/ghc/ghc"
-      }
-    },
-    "ghc99": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1697054644,
-        "narHash": "sha256-kKarOuXUaAH3QWv7ASx+gGFMHaHKe0pK5Zu37ky2AL4=",
-        "ref": "refs/heads/master",
-        "rev": "f383a242c76f90bcca8a4d7ee001dcb49c172a9a",
-        "revCount": 62040,
-        "submodules": true,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/ghc/ghc"
-      },
-      "original": {
-        "submodules": true,
-        "type": "git",
-        "url": "https://gitlab.haskell.org/ghc/ghc"
+        "owner": "tweag",
+        "repo": "gomod2nix",
+        "type": "github"
      }
    },
    "hackage": {
      "flake": false,
      "locked": {
-        "lastModified": 1702513363,
-        "narHash": "sha256-kloro9uEe8aYhPMoMjVNq2rfrXNgMOZhOPwVH5DH2K0=",
+        "lastModified": 1702340598,
+        "narHash": "sha256-CC0HI+6iKPtH+8r/ZfcpW5v/OYvL7zMwpr0xfkXV1zU=",
        "owner": "input-output-hk",
        "repo": "hackage.nix",
-        "rev": "a9d931d0398da67846fa257922a924829233cb91",
+        "rev": "24617c569995e38bf3b83b48eec6628a50fdb4fb",
        "type": "github"
      },
      "original": {
@@ -214,40 +309,33 @@
        "cabal-36": "cabal-36",
        "cardano-shell": "cardano-shell",
        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils_2",
        "ghc-8.6.5-iohk": "ghc-8.6.5-iohk",
-        "ghc98X": "ghc98X",
-        "ghc99": "ghc99",
        "hackage": [
          "hackage"
        ],
-        "hls-1.10": "hls-1.10",
-        "hls-2.0": "hls-2.0",
-        "hls-2.2": "hls-2.2",
-        "hls-2.3": "hls-2.3",
-        "hls-2.4": "hls-2.4",
        "hpc-coveralls": "hpc-coveralls",
        "hydra": "hydra",
        "iserv-proxy": "iserv-proxy",
        "nixpkgs": [
-          "haskellNix",
-          "nixpkgs-unstable"
+          "nixpkgs"
        ],
        "nixpkgs-2003": "nixpkgs-2003",
        "nixpkgs-2105": "nixpkgs-2105",
        "nixpkgs-2111": "nixpkgs-2111",
        "nixpkgs-2205": "nixpkgs-2205",
        "nixpkgs-2211": "nixpkgs-2211",
-        "nixpkgs-2305": "nixpkgs-2305",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "old-ghc-nix": "old-ghc-nix",
-        "stackage": "stackage"
+        "stackage": "stackage",
+        "tullia": "tullia"
      },
      "locked": {
-        "lastModified": 1701163700,
-        "narHash": "sha256-sOrewUS3LnzV09nGr7+3R6Q6zsgU4smJc61QsHq+4DE=",
+        "lastModified": 1677975916,
+        "narHash": "sha256-dbe8lEEPyfzjdRwpePClv7J9p9lQg7BwbBqAMCw4RLw=",
        "owner": "input-output-hk",
        "repo": "haskell.nix",
-        "rev": "2808bfe3e62e9eb4ee8974cd623a00e1611f302b",
+        "rev": "ab5efd87ce3fd8ade38a01d97693d29a4f1ae7e4",
        "type": "github"
      },
      "original": {
@@ -257,91 +345,6 @@
        "type": "github"
      }
    },
-    "hls-1.10": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1680000865,
-        "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "1.10.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1687698105,
-        "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "783905f211ac63edf982dd1889c671653327e441",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.0.0.1",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1693064058,
-        "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.2.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1695910642,
-        "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.3.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
-    "hls-2.4": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696939266,
-        "narHash": "sha256-VOMf5+kyOeOmfXTHlv4LNFJuDGa7G3pDnOxtzYR40IU=",
-        "owner": "haskell",
-        "repo": "haskell-language-server",
-        "rev": "362fdd1293efb4b82410b676ab1273479f6d17ee",
-        "type": "github"
-      },
-      "original": {
-        "owner": "haskell",
-        "ref": "2.4.0.0",
-        "repo": "haskell-language-server",
-        "type": "github"
-      }
-    },
    "hpc-coveralls": {
      "flake": false,
      "locked": {
@@ -381,14 +384,37 @@
        "type": "indirect"
      }
    },
+    "incl": {
+      "inputs": {
+        "nixlib": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1669263024,
+        "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=",
+        "owner": "divnix",
+        "repo": "incl",
+        "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "incl",
+        "type": "github"
+      }
+    },
    "iserv-proxy": {
      "flake": false,
      "locked": {
-        "lastModified": 1691634696,
-        "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=",
+        "lastModified": 1670983692,
+        "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=",
        "ref": "hkm/remote-iserv",
-        "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73",
-        "revCount": 14,
+        "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300",
+        "revCount": 10,
        "type": "git",
        "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git"
      },
@@ -414,22 +440,32 @@
        "type": "github"
      }
    },
-    "mac2ios": {
+    "n2c": {
      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_2"
+        "flake-utils": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1699767871,
-        "narHash": "sha256-kxeCUfwC/Vgh2FvVMlBUq0eVx1JvfHyN+5MPKUik9mE=",
-        "owner": "zw3rk",
-        "repo": "mobile-core-tools",
-        "rev": "4dcb77d5ea896d749381806dfab5358851b08951",
+        "lastModified": 1665039323,
+        "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=",
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a",
        "type": "github"
      },
      "original": {
-        "owner": "zw3rk",
-        "repo": "mobile-core-tools",
+        "owner": "nlewo",
+        "repo": "nix2container",
        "type": "github"
      }
    },
@@ -454,6 +490,95 @@
        "type": "github"
      }
    },
+    "nix-nomad": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": [
+          "haskellNix",
+          "tullia",
+          "nix2container",
+          "flake-utils"
+        ],
+        "gomod2nix": "gomod2nix",
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "nixpkgs"
+        ],
+        "nixpkgs-lib": [
+          "haskellNix",
+          "tullia",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1658277770,
+        "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=",
+        "owner": "tristanpemble",
+        "repo": "nix-nomad",
+        "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tristanpemble",
+        "repo": "nix-nomad",
+        "type": "github"
+      }
+    },
+    "nix2container": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1658567952,
+        "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=",
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "type": "github"
+      }
+    },
+    "nixago": {
+      "inputs": {
+        "flake-utils": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "flake-utils"
+        ],
+        "nixago-exts": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "blank"
+        ],
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1661824785,
+        "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=",
+        "owner": "nix-community",
+        "repo": "nixago",
+        "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixago",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
      "locked": {
        "lastModified": 1657693803,
@@ -520,11 +645,11 @@
    },
    "nixpkgs-2205": {
      "locked": {
-        "lastModified": 1685573264,
-        "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
+        "lastModified": 1672580127,
+        "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "380be19fbd2d9079f677978361792cb25e8a3635",
+        "rev": "0874168639713f547c05947c76124f78441ea46c",
        "type": "github"
      },
      "original": {
@@ -536,11 +661,11 @@
    },
    "nixpkgs-2211": {
      "locked": {
-        "lastModified": 1688392541,
-        "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
+        "lastModified": 1675730325,
+        "narHash": "sha256-uNvD7fzO5hNlltNQUAFBPlcEjNG5Gkbhl/ROiX+GZU4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
+        "rev": "b7ce17b1ebf600a72178f6302c77b6382d09323f",
        "type": "github"
      },
      "original": {
@@ -550,40 +675,6 @@
        "type": "github"
      }
    },
-    "nixpkgs-2305": {
-      "locked": {
-        "lastModified": 1695416179,
-        "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-23.05-darwin",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1696019113,
-        "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs-regression": {
      "locked": {
        "lastModified": 1643052045,
@@ -602,11 +693,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1695318763,
-        "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=",
+        "lastModified": 1675758091,
+        "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e12483116b3b51a185a33a272bf351e357ba9a99",
+        "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87",
        "type": "github"
      },
      "original": {
@@ -618,20 +709,82 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1698434055,
-        "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=",
+        "lastModified": 1653581809,
+        "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883",
+        "rev": "83658b28fe638a170a19b8933aa008b30640fbd1",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1654807842,
+        "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1665087388,
+        "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1676726892,
+        "narHash": "sha256-M7OYVR6dKmzmlebIjybFf3l18S2uur8lMyWWnHQooLY=",
+        "owner": "angerman",
+        "repo": "nixpkgs",
+        "rev": "729469087592bdea58b360de59dadf6d58714c42",
+        "type": "github"
+      },
+      "original": {
+        "owner": "angerman",
+        "ref": "release-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nosys": {
+      "locked": {
+        "lastModified": 1667881534,
+        "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=",
+        "owner": "divnix",
+        "repo": "nosys",
+        "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "nosys",
+        "type": "github"
+      }
+    },
    "old-ghc-nix": {
      "flake": false,
      "locked": {
@@ -654,21 +807,17 @@
        "flake-utils": "flake-utils",
        "hackage": "hackage",
        "haskellNix": "haskellNix",
-        "mac2ios": "mac2ios",
-        "nixpkgs": [
-          "haskellNix",
-          "nixpkgs-2305"
-        ]
+        "nixpkgs": "nixpkgs_5"
      }
    },
    "stackage": {
      "flake": false,
      "locked": {
-        "lastModified": 1699834215,
-        "narHash": "sha256-g/JKy0BCvJaxPuYDl3QVc4OY8cFEomgG+hW/eEV470M=",
+        "lastModified": 1677888571,
+        "narHash": "sha256-YkhRNOaN6QVagZo1cfykYV8KqkI8/q6r2F5+jypOma4=",
        "owner": "input-output-hk",
        "repo": "stackage.nix",
-        "rev": "47aacd04abcce6bad57f43cbbbd133538380248e",
+        "rev": "cb50e6fabdfb2d7e655059039012ad0623f06a27",
        "type": "github"
      },
      "original": {
@@ -677,18 +826,110 @@
        "type": "github"
      }
    },
-    "systems": {
+    "std": {
+      "inputs": {
+        "arion": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "blank"
+        ],
+        "blank": "blank",
+        "devshell": "devshell",
+        "dmerge": "dmerge",
+        "flake-utils": "flake-utils_4",
+        "incl": "incl",
+        "makes": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "blank"
+        ],
+        "microvm": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "blank"
+        ],
+        "n2c": "n2c",
+        "nixago": "nixago",
+        "nixpkgs": "nixpkgs_4",
+        "nosys": "nosys",
+        "yants": "yants"
+      },
      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "lastModified": 1674526466,
+        "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=",
+        "owner": "divnix",
+        "repo": "std",
+        "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826",
        "type": "github"
      },
      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
+        "owner": "divnix",
+        "repo": "std",
+        "type": "github"
+      }
+    },
+    "tullia": {
+      "inputs": {
+        "nix-nomad": "nix-nomad",
+        "nix2container": "nix2container",
+        "nixpkgs": [
+          "haskellNix",
+          "nixpkgs"
+        ],
+        "std": "std"
+      },
+      "locked": {
+        "lastModified": 1675695930,
+        "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=",
+        "owner": "input-output-hk",
+        "repo": "tullia",
+        "rev": "621365f2c725608f381b3ad5b57afef389fd4c31",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "repo": "tullia",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "yants": {
+      "inputs": {
+        "nixpkgs": [
+          "haskellNix",
+          "tullia",
+          "std",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1667096281,
+        "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=",
+        "owner": "divnix",
+        "repo": "yants",
+        "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "yants",
        "type": "github"
      }
    }
@@ -1,15 +1,15 @@
 {
  description = "nix flake for simplex-chat";
+  inputs.nixpkgs.url = "github:angerman/nixpkgs/release-22.11";
  inputs.haskellNix.url = "github:input-output-hk/haskell.nix/armv7a";
-  inputs.nixpkgs.follows = "haskellNix/nixpkgs-2305";
-  inputs.mac2ios.url = "github:zw3rk/mobile-core-tools";
+  inputs.haskellNix.inputs.nixpkgs.follows = "nixpkgs";
  inputs.hackage = {
    url = "github:input-output-hk/hackage.nix";
    flake = false;
  };
  inputs.haskellNix.inputs.hackage.follows = "hackage";
  inputs.flake-utils.url = "github:numtide/flake-utils";
-  outputs = { self, haskellNix, nixpkgs, flake-utils, mac2ios, ... }:
+  outputs = { self, haskellNix, nixpkgs, flake-utils, ... }:
    let systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; in
    flake-utils.lib.eachSystem systems (system:
      # this android26 overlay makes the pkgsCross.{aarch64-android,armv7a-android-prebuilt} to set stdVer to 26 (Android 8).
@@ -30,7 +30,7 @@
      # `appendOverlays` with a singleton is identical to `extend`.
      let pkgs = haskellNix.legacyPackages.${system}.appendOverlays [android26]; in
      let drv' = { extra-modules, pkgs', ... }: pkgs'.haskell-nix.project {
-        compiler-nix-name = "ghc963";
+        compiler-nix-name = "ghc8107";
        index-state = "2023-12-12T00:00:00Z";
        # We need this, to specify we want the cabal project.
        # If the stack.yaml was dropped, this would not be necessary.
@@ -40,12 +40,9 @@
          src = ./.;
        };
        sha256map = import ./scripts/nix/sha256map.nix;
-        modules = [
-        ({ pkgs, lib, ...}: lib.mkIf (!pkgs.stdenv.hostPlatform.isWindows) {
-          # This patch adds `dl` as an extra-library to direct-sqlciper, which is needed
-          # on pretty much all unix platforms, but then blows up on windows m(
+        modules = [{
          packages.direct-sqlcipher.patches = [ ./scripts/nix/direct-sqlcipher-2.3.27.patch ];
-        })
+        }
        ({ pkgs,lib, ... }: lib.mkIf (pkgs.stdenv.hostPlatform.isAndroid) {
          packages.simplex-chat.components.library.ghcOptions = [ "-pie" ];
        })] ++ extra-modules;
@@ -67,9 +64,6 @@
      }); in
      let iosPostInstall = bundleName: ''
        ${pkgs.tree}/bin/tree $out
-        mkdir tmp
-        find ./dist -name "libHS*-ghc*.a" -exec cp {} tmp \;
-        (cd tmp; ${pkgs.tree}/bin/tree .; ar x libHS*.a; for o in *.o; do if /usr/bin/otool -xv $o|grep ldadd ; then echo $o; fi; done; cd ..; rm -fR tmp)
        mkdir -p $out/_pkg
        # copy over includes, we might want those, but maybe not.
        # cp -r $out/lib/*/*/include $out/_pkg/
@@ -80,18 +74,6 @@
        find ${pkgs.gmp6.override { withStatic = true; }}/lib -name "*.a" -exec cp {} $out/_pkg \;
        # There is no static libc
        ${pkgs.tree}/bin/tree $out/_pkg
-        for pkg in $out/_pkg/*.a; do
-          chmod +w $pkg
-          ${mac2ios.packages.${system}.mac2ios}/bin/mac2ios $pkg
-          chmod -w $pkg
-        done
-
-        mkdir tmp
-        find $out/_pkg -name "libHS*-ghc*.a" -exec cp {} tmp \;
-        (cd tmp; ${pkgs.tree}/bin/tree .; ar x libHS*.a; for o in *.o; do if /usr/bin/otool -xv $o|grep ldadd ; then echo $o; fi; done; cd ..; rm -fR tmp)
-
-        sha256sum $out/_pkg/*.a
-
        (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/${bundleName}.zip *)
        rm -fR $out/_pkg
        mkdir -p $out/nix-support
@@ -137,149 +119,13 @@
                      hardeningDisable = [ "fortify" ];
                  }
              );in {
-              # STATIC x86_64-linux
              "${pkgs.pkgsCross.musl64.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.musl64).simplex-chat.components.exes.simplex-chat;
-              # STATIC i686-linux
-              "${pkgs.pkgsCross.musl32.hostPlatform.system}-static:exe:simplex-chat" = (drv' {
-                pkgs' = pkgs.pkgsCross.musl32;
-                extra-modules = [{
-                  # 32 bit patches
-                  packages.basement.patches = [
-                    ./scripts/nix/basement-pr-573.patch
-                  ];
-                  packages.memory.patches = [
-                    ./scripts/nix/memory-pr-99.patch
-                  ];
-                }];
-              }).simplex-chat.components.exes.simplex-chat;
-              # WINDOWS x86_64-mingwW64
-              "${pkgs.pkgsCross.mingwW64.hostPlatform.system}:exe:simplex-chat" = (drv' {
-                pkgs' = pkgs.pkgsCross.mingwW64;
-                extra-modules = [{
-                  packages.direct-sqlcipher.flags.openssl = true;
-                  packages.bitvec.flags.simd = false;
-                  packages.direct-sqlcipher.patches = [
-                    ./scripts/nix/direct-sqlcipher-2.3.27-win.patch
-                  ];
-                  packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
-                    (pkgs.pkgsCross.mingwW64.openssl) #.override) # { static = true; enableKTLS = false; })
-                  ];
-                  packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
-                    (pkgs.pkgsCross.mingwW64.openssl) #.override) # { static = true; enableKTLS = false; })
-                  ];
-                  packages.unix-time.postPatch = ''
-                    sed -i 's/mingwex//g' unix-time.cabal
-                  '';
-                 }];
-                }).simplex-chat.components.exes.simplex-chat.override {
-                postInstall = ''
-                  set -x
-                  ${pkgs.tree}/bin/tree $out
-                  mkdir -p $out/_pkg
-                  cp $out/bin/* $out/_pkg
-                  ${pkgs.tree}/bin/tree $out/_pkg
-                  (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/${pkgs.pkgsCross.mingwW64.hostPlatform.system}-simplex-chat.zip *)
-                  rm -fR $out/_pkg
-                  mkdir -p $out/nix-support
-                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
-                      > $out/nix-support/hydra-build-products
-                '';
-              };
-              "${pkgs.pkgsCross.mingwW64.hostPlatform.system}:lib:simplex-chat" = (drv' rec {
-                pkgs' = pkgs.pkgsCross.mingwW64;
-                extra-modules = [{
-                  packages.direct-sqlcipher.flags.openssl = true;
-                  # simd will try to read __cpu_model, which we don't expose
-                  # from the rts (yet!).
-                  packages.bitvec.flags.simd = false;
-                  packages.direct-sqlcipher.patches = [
-                    ./scripts/nix/direct-sqlcipher-2.3.27-win.patch
-                  ];
-                  packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
-                    pkgs.pkgsCross.mingwW64.openssl
-                  ];
-                  packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
-                    pkgs.pkgsCross.mingwW64.openssl
-                  ];
-                  packages.unix-time.postPatch = ''
-                    sed -i 's/mingwex//g' unix-time.cabal
-                  '';
-                }];
-              }).simplex-chat.components.library
-              .override (p: {
-                # enableShared = false;
-                setupBuildFlags = p.component.setupBuildFlags ++ map (x: "--ghc-option=${x}") [
-                  "-shared"
-                  "-threaded"
-                  "-o" "libsimplex.dll"
-                  # "-optl-lHSrts_thr"
-                  "-optl-lffi"
-                  # "-optl-static-libgcc"
-                  # We can't do -optl-static-libstdc++ with gcc. g++ might
-                  # but then we are chaning the compiler altogether.
-                  "${./libsimplex.dll.def}"
-                ];
-                postInstall = ''
-                  set -x
-                  function deps() {
-                    ${pkgs.binutils}/bin/strings "$1" | grep '.\.dll'|grep -v -E 'Winsock|ADVAPI32|dbghelp|KERNEL32|msvcrt|ntdll|ole32|RPCRT4|SHELL32|USER32|WINMM|WS2_32|kernel32|GDI32'|grep -v "$1"
-                  }
-                  ${pkgs.tree}/bin/tree $out
-                  mkdir -p $out/_pkg
-                  cp libsimplex.dll $out/_pkg
-                  cp libsimplex.dll.a $out/_pkg
-                  mkdir $out/libs
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.openssl}             -name "*.dll" -exec cp {} $out/libs \;
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.libffi}              -name "*.dll" -exec cp {} $out/libs \;
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.gmp}                 -name "*.dll" -exec cp {} $out/libs \;
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.stdenv.cc.cc}        -name "*.dll" -exec cp {} $out/libs \;
-                  find ${pkgs.lib.getBin pkgs.pkgsCross.mingwW64.windows.mcfgthreads} -name "*.dll" -exec cp {} $out/libs \;
-
-                  pushd $out/_pkg
-                  function copyDeps() {
-                    for dep in $(deps "$1"); do
-                      if [ ! -f "$dep" ]; then
-                        if [ ! -f ../libs/"$dep" ]; then
-                          echo "WARN: $1 -> $dep not found!"
-                        else
-                          cp ../libs/"$dep" .
-                          copyDeps "$dep"
-                        fi
-                      fi
-                    done
-                  }
-                  copyDeps libsimplex.dll
-                  popd
-                  ${pkgs.tree}/bin/tree $out/_pkg
-                  (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/pkg-${pkgs.pkgsCross.mingwW64.hostPlatform.system}-libsimplex.zip *)
-                  rm -fR $out/_pkg
-                  mkdir -p $out/nix-support
-                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
-                      > $out/nix-support/hydra-build-products
-                '';
-              });
+              "${pkgs.pkgsCross.musl32.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.musl32).simplex-chat.components.exes.simplex-chat;
              # "${pkgs.pkgsCross.muslpi.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.muslpi).simplex-chat.components.exes.simplex-chat;
-
-              # STATIC aarch64-linux
              "${pkgs.pkgsCross.aarch64-multiplatform-musl.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.aarch64-multiplatform-musl).simplex-chat.components.exes.simplex-chat;
-              "armv7a-android:lib:support" = (drv android32Pkgs).android-support.components.library.override (p: {
-                smallAddressSpace = true;
-                # we won't want -dyamic (see aarch64-android:lib:simplex-chat)
-                enableShared = false;
-                # we also do not want to have any dependencies listed (especially no rts!)
-                enableStatic = false;
-
-                # This used to work with 8.10.7...
-                # setupBuildFlags = p.component.setupBuildFlags ++ map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsupport.so" ];
-                # ... but now with 9.6+
-                # we have to do the -shared thing by hand.
-                postBuild = ''
-                  armv7a-unknown-linux-androideabi-ghc -shared -o libsupport.so \
-                    -optl-Wl,-u,setLineBuffering \
-                    -optl-Wl,-u,pipe_std_to_socket \
-                    dist/build/*.a
-                '';
-
+              "armv7a-android:lib:support" = (drv android32Pkgs).android-support.components.library.override {
+                smallAddressSpace = true; enableShared = false;
+                setupBuildFlags = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsupport.so" ];
                postInstall = ''

                  mkdir -p $out/_pkg
@@ -292,29 +138,14 @@
                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
                        > $out/nix-support/hydra-build-products
                '';
-              });
-              # The android-support package is at
-              # https://github.com/simplex-chat/android-support
-              "aarch64-android:lib:support" = (drv androidPkgs).android-support.components.library.override (p: {
-                smallAddressSpace = true;
-                # no -dynamic
-                enableShared = false;
-                # but also no -staticlib
-                enableStatic = false;
-
-                # we have to do the -shared thing by hand.
-                postBuild = ''
-                  aarch64-unknown-linux-android-ghc -shared -o libsupport.so \
-                    -optl-Wl,-u,setLineBuffering \
-                    -optl-Wl,-u,pipe_std_to_socket \
-                    dist/build/*.a
-                '';
-
+              };
+              "aarch64-android:lib:support" = (drv androidPkgs).android-support.components.library.override {
+                smallAddressSpace = true; enableShared = false;
+                setupBuildFlags = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsupport.so" ];
                postInstall = ''

                  mkdir -p $out/_pkg
                  cp libsupport.so $out/_pkg
-                  ls -lah $out/_pkg/*
                  ${pkgs.patchelf}/bin/patchelf --remove-needed libunwind.so.1 $out/_pkg/libsupport.so
                  (cd $out/_pkg; ${pkgs.zip}/bin/zip -r -9 $out/pkg-aarch64-android-libsupport.zip *)
                  rm -fR $out/_pkg
@@ -323,11 +154,10 @@
                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
                        > $out/nix-support/hydra-build-products
                '';
-              });
+              };
              "armv7a-android:lib:simplex-chat" = (drv' {
                pkgs' = android32Pkgs;
                extra-modules = [{
-                  packages.text.flags.simdutf = false;
                  packages.direct-sqlcipher.flags.openssl = true;
                  packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
                    (android32Pkgs.openssl.override { static = true; enableKTLS = false; })
@@ -338,55 +168,13 @@
                  packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
                    (android32Pkgs.openssl.override { static = true; enableKTLS = false; })
                  ];
-                  # 32 bit patches
-                  packages.basement.patches = [
-                    ./scripts/nix/basement-pr-573.patch
-                  ];
-                  packages.memory.patches = [
-                    ./scripts/nix/memory-pr-99.patch
-                  ];
                }];
-              }).simplex-chat.components.library.override (p: {
-                smallAddressSpace = true;
-                # we want -shared, but not -dyanmic, hence `enableShared = false`.
-                enableShared = false;
-                # we _do_ want rts, and other libs. Hence `enableStatic = true`.
-                enableStatic = true;
+              }).simplex-chat.components.library.override {
+                smallAddressSpace = true; enableShared = false;
                # for android we build a shared library, passing these arguments is a bit tricky, as
                # we want only the threaded rts (HSrts_thr) and ffi to be linked, but not fed into iserv for
                # template haskell cross compilation. Thus we just pass them as linker options (-optl).
-                setupBuildFlags = p.component.setupBuildFlags
-                # flags to tell GHC we want to produce a -shared object, and we want to also link
-                # - the ffi library (ffi)
-                ++ map (x: "--ghc-option=${x}") [
-                  "-shared" "-o" "libsimplex.so"
-                  "-threaded"
-                  # "-debug"
-                  "-optl-lffi"
-                ]
-                # This is fairly idiotic. LLD will strip out foreign exported
-                # symbols (a GHC bug? Codegen bug?). So we need to pass `-u <sym>`
-                # to ensure they stay in the produced library. Having them
-                # _undefined_ and _lazy_ (lld will tell with -y <sym> that the
-                # symbol is lazy), makes them _defined_. m(
-                ++ map (sym: "--ghc-option=-optl-Wl,-u,${sym}") [
-                  "chat_close_store"
-                  "chat_decrypt_file"
-                  "chat_decrypt_media"
-                  "chat_encrypt_file"
-                  "chat_encrypt_media"
-                  "chat_migrate_init"
-                  "chat_parse_markdown"
-                  "chat_parse_server"
-                  "chat_password_hash"
-                  "chat_read_file"
-                  "chat_recv_msg"
-                  "chat_recv_msg_wait"
-                  "chat_send_cmd"
-                  "chat_send_remote_cmd"
-                  "chat_valid_name"
-                  "chat_write_file"
-                ];
+                setupBuildFlags = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsimplex.so" "-optl-lHSrts_thr" "-optl-lffi"];
                postInstall = ''
                  set -x
                  ${pkgs.tree}/bin/tree $out
@@ -430,11 +218,10 @@
                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
                      > $out/nix-support/hydra-build-products
                '';
-              });
+              };
              "aarch64-android:lib:simplex-chat" = (drv' {
                pkgs' = androidPkgs;
                extra-modules = [{
-                  packages.text.flags.simdutf = false;
                  packages.direct-sqlcipher.flags.openssl = true;
                  packages.direct-sqlcipher.components.library.libs = pkgs.lib.mkForce [
                    (androidPkgs.openssl.override { static = true; })
@@ -446,49 +233,12 @@
                    (androidPkgs.openssl.override { static = true; })
                  ];
                }];
-              }).simplex-chat.components.library.override (p: {
-                smallAddressSpace = true;
-                # we do not want a dynamically linked object, even though we _do_
-                # want to produce a _shared_ object. But `shared` implied -dyanmic
-                # with cabal, so we disable and pass `-shared` explicitly.
-                enableShared = false;
-                # we do want static (e.g. pass all dependencies in, so we get -staticlib)
-                enableStatic = true;
+              }).simplex-chat.components.library.override {
+                smallAddressSpace = true; enableShared = false;
                # for android we build a shared library, passing these arguments is a bit tricky, as
                # we want only the threaded rts (HSrts_thr) and ffi to be linked, but not fed into iserv for
                # template haskell cross compilation. Thus we just pass them as linker options (-optl).
-                setupBuildFlags = p.component.setupBuildFlags
-                # flags to tell GHC we want to produce a -shared object, and we want to also link
-                # - the ffi library (ffi)
-                ++ map (x: "--ghc-option=${x}") [
-                  "-shared" "-o" "libsimplex.so"
-                  "-threaded"
-                  # "-debug"
-                  "-optl-lffi"
-                ]
-                # This is fairly idiotic. LLD will strip out foreign exported
-                # symbols (a GHC bug? Codegen bug?). So we need to pass `-u <sym>`
-                # to ensure they stay in the produced library. Having them
-                # _undefined_ and _lazy_ (lld will tell with -y <sym> that the
-                # symbol is lazy), makes them _defined_. m(
-                ++ map (sym: "--ghc-option=-optl-Wl,-u,${sym}") [
-                  "chat_close_store"
-                  "chat_decrypt_file"
-                  "chat_decrypt_media"
-                  "chat_encrypt_file"
-                  "chat_encrypt_media"
-                  "chat_migrate_init"
-                  "chat_parse_markdown"
-                  "chat_parse_server"
-                  "chat_password_hash"
-                  "chat_read_file"
-                  "chat_recv_msg"
-                  "chat_recv_msg_wait"
-                  "chat_send_cmd"
-                  "chat_send_remote_cmd"
-                  "chat_valid_name"
-                  "chat_write_file"
-                ];
+                setupBuildFlags = map (x: "--ghc-option=${x}") [ "-shared" "-o" "libsimplex.so" "-optl-lHSrts_thr" "-optl-lffi"];
                postInstall = ''
                  set -x
                  ${pkgs.tree}/bin/tree $out
@@ -532,7 +282,7 @@
                  echo "file binary-dist \"$(echo $out/*.zip)\"" \
                      > $out/nix-support/hydra-build-products
                '';
-              });
+              };
            };

            # builds for iOS and iOS simulator
@@ -546,8 +296,7 @@
                  packages.direct-sqlcipher.flags.commoncrypto = true;
                  packages.entropy.flags.DoNotGetEntropy = true;
                  packages.simplexmq.components.library.libs = pkgs.lib.mkForce [
-                    # TODO: have a cross override for iOS, that sets this.
-                    ((pkgs.openssl.override { static = true; }).overrideDerivation (old: { CFLAGS = "-mcpu=apple-a7 -march=armv8-a+norcpc" ;}))
+                    (pkgs.openssl.override { static = true; })
                  ];
                }];
              }).simplex-chat.components.library.override (
@@ -36,7 +36,6 @@ dependencies:
  - network >= 3.1.2.7 && < 3.2
  - network-transport == 0.5.6
  - optparse-applicative >= 0.15 && < 0.17
-  - process == 1.6.*
  - random >= 1.1 && < 1.3
  - record-hasfield == 1.0.*
  - simple-logger == 0.1.*
@@ -64,11 +63,13 @@ when:
  - condition: impl(ghc >= 9.6.2)
    dependencies:
      - bytestring == 0.11.*
+      - process == 1.6.*
      - template-haskell == 2.20.*
      - text >= 2.0.1 && < 2.2
  - condition: impl(ghc < 9.6.2)
    dependencies:
      - bytestring == 0.10.*
+      - process >= 1.6 && < 1.6.18
      - template-haskell == 2.16.*
      - text >= 1.2.3.0 && < 1.3

@@ -125,13 +126,19 @@ tests:
      - apps/simplex-broadcast-bot/src
      - apps/simplex-directory-service/src
    main: Test.hs
+    when:
+      - condition: impl(ghc >= 9.6.2)
+        dependencies:
+          - hspec == 2.11.*
+      - condition: impl(ghc < 9.6.2)
+        dependencies:
+          - hspec == 2.7.*
    dependencies:
      - QuickCheck == 2.14.*
      - simplex-chat
      - async == 2.2.*
      - deepseq == 1.4.*
      - generic-random == 1.5.*
-      - hspec == 2.11.*
      - network == 3.1.*
      - silently == 1.2.*
      - stm == 2.5.*
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-security create-keychain -p "" simplex.keychain
-security set-keychain-settings -u simplex.keychain
-security add-certificates -k simplex.keychain "Developer ID Application: SimpleX Chat Ltd (5NN7GUYB6T).cer"
-security add-certificates -k simplex.keychain "Developer ID Certification Authority.cer"
-# Private key with access from any app
-security import "SimpleX Chat.p12" -P "" -k simplex.keychain -A
-# Public key
-security import "SimpleX Chat.pem" -k simplex.keychain
@@ -2,7 +2,7 @@

 set -e

-trap "rm apps/multiplatform/local.properties 2> /dev/null || true; rm local.properties 2> /dev/null || true; rm /tmp/simplex.keychain" EXIT
+trap "rm apps/multiplatform/local.properties || true; rm local.properties || true; rm /tmp/simplex.keychain || true" EXIT
 echo "desktop.mac.signing.identity=Developer ID Application: SimpleX Chat Ltd (5NN7GUYB6T)" >> apps/multiplatform/local.properties
 echo "desktop.mac.signing.keychain=/tmp/simplex.keychain" >> apps/multiplatform/local.properties
 echo "desktop.mac.notarization.apple_id=$APPLE_SIMPLEX_NOTARIZATION_APPLE_ID" >> apps/multiplatform/local.properties
@@ -10,10 +10,6 @@ echo "desktop.mac.notarization.password=$APPLE_SIMPLEX_NOTARIZATION_PASSWORD" >>
 echo "desktop.mac.notarization.team_id=5NN7GUYB6T" >> apps/multiplatform/local.properties
 echo "$APPLE_SIMPLEX_SIGNING_KEYCHAIN" | base64 --decode - > /tmp/simplex.keychain

-security unlock-keychain -p "" /tmp/simplex.keychain
-# Adding keychain to the list of keychains.
-# Otherwise, it can find cert but exits while signing with "error: The specified item could not be found in the keychain."
-security list-keychains -s `security list-keychains | xargs` /tmp/simplex.keychain
 scripts/desktop/build-lib-mac.sh
 cd apps/multiplatform
 ./gradlew packageDmg
@@ -8,7 +8,7 @@ function readlink() {

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

 if [ "$ARCH" == "aarch64" ]; then
    COMPOSE_ARCH=arm64
@@ -21,7 +21,7 @@ cd $root_dir
 BUILD_DIR=dist-newstyle/build/$ARCH-$OS/ghc-${GHC_VERSION}/simplex-chat-*

 rm -rf $BUILD_DIR
-cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN -flink-rts -threaded'
+cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN' --ghc-options="-optl-L$(ghc --print-libdir)/rts -optl-Wl,--as-needed,-lHSrts_thr-ghc$GHC_VERSION"
 cd $BUILD_DIR/build
 #patchelf --add-needed libHSrts_thr-ghc${GHC_VERSION}.so libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so
 #patchelf --add-rpath '$ORIGIN' libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so
@@ -5,14 +5,13 @@ set -e
 OS=mac
 ARCH="${1:-`uname -a | rev | cut -d' ' -f1 | rev`}"
 COMPOSE_ARCH=$ARCH
-GHC_VERSION=9.6.3
+GHC_VERSION=8.10.7

 if [ "$ARCH" == "arm64" ]; then
    ARCH=aarch64
 else
    COMPOSE_ARCH=x64
 fi
-
 LIB_EXT=dylib
 LIB=libHSsimplex-chat-*-inplace-ghc*.$LIB_EXT
 GHC_LIBS_DIR=$(ghc --print-libdir)
@@ -20,26 +19,13 @@ GHC_LIBS_DIR=$(ghc --print-libdir)
 BUILD_DIR=dist-newstyle/build/$ARCH-*/ghc-*/simplex-chat-*

 rm -rf $BUILD_DIR
-cabal build lib:simplex-chat lib:simplex-chat --ghc-options="-optl-Wl,-rpath,@loader_path -optl-Wl,-L$GHC_LIBS_DIR/$ARCH-osx-ghc-$GHC_VERSION -optl-lHSrts_thr-ghc$GHC_VERSION -optl-lffi"
+cabal build lib:simplex-chat lib:simplex-chat --ghc-options="-optl-Wl,-rpath,@loader_path -optl-Wl,-L$GHC_LIBS_DIR/rts -optl-lHSrts_thr-ghc8.10.7 -optl-lffi"

 cd $BUILD_DIR/build
 mkdir deps 2> /dev/null || true

 # It's not included by default for some reason. Compiled lib tries to find system one but it's not always available
-#cp $GHC_LIBS_DIR/libffi.dylib ./deps
-(
-  BUILD=$PWD
-  cp /tmp/libffi-3.4.4/*-apple-darwin*/.libs/libffi.dylib $BUILD/deps || \
-    ( \
-    cd /tmp && \
-    curl --tlsv1.2 "https://gitlab.haskell.org/ghc/libffi-tarballs/-/raw/libffi-3.4.4/libffi-3.4.4.tar.gz?inline=false" -o libffi.tar.gz && \
-    tar -xzvf libffi.tar.gz && \
-    cd "libffi-3.4.4" && \
-    ./configure && \
-    make && \
-    cp *-apple-darwin*/.libs/libffi.dylib $BUILD/deps \
-    )
-)
+cp $GHC_LIBS_DIR/rts/libffi.dylib ./deps

 DYLIBS=`otool -L $LIB | grep @rpath | tail -n +2 | cut -d' ' -f 1 | cut -d'/' -f2`
 RPATHS=`otool -l $LIB | grep "path "| cut -d' ' -f11`
@@ -80,8 +66,6 @@ function copy_deps() {
 }

 copy_deps $LIB
-# Special case
-cp $(ghc --print-libdir)/$ARCH-osx-ghc-$GHC_VERSION/libHSghc-boot-th-$GHC_VERSION-ghc$GHC_VERSION.dylib deps
 rm deps/`basename $LIB`

 cd -
@@ -1,242 +0,0 @@
-From 38be2c93acb6f459d24ed6c626981c35ccf44095 Mon Sep 17 00:00:00 2001
-From: Sylvain Henry <sylvain@haskus.fr>
-Date: Thu, 16 Feb 2023 15:40:45 +0100
-Subject: [PATCH] Fix build on 32-bit architectures
-
---
- Basement/Bits.hs                 |  4 ++++
- Basement/From.hs                 | 24 -----------------------
- Basement/Numerical/Additive.hs   |  4 ++++
- Basement/Numerical/Conversion.hs | 20 +++++++++++++++++++
- Basement/PrimType.hs             |  6 +++++-
- Basement/Types/OffsetSize.hs     | 22 +++++++++++++++++++--
- 6 files changed, 53 insertions(+), 27 deletions(-)
-
-diff --git a/Basement/Bits.hs b/Basement/Bits.hs
-index 7eeea0f5..24520ed7 100644
--- a/Basement/Bits.hs
-+++ b/Basement/Bits.hs
-@@ -54,8 +54,12 @@ import GHC.Int
- import Basement.Compat.Primitive
-
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+import GHC.Exts
-+#else
- import GHC.IntWord64
- #endif
-+#endif
-
- -- | operation over finite bits
- class FiniteBitsOps bits where
-diff --git a/Basement/From.hs b/Basement/From.hs
-index 7bbe141c..80014b3e 100644
--- a/Basement/From.hs
-+++ b/Basement/From.hs
-@@ -272,23 +272,11 @@ instance (NatWithinBound (CountOf ty) n, KnownNat n, PrimType ty)
-     tryFrom = BlockN.toBlockN . UArray.toBlock . BoxArray.mapToUnboxed id
-
- instance (KnownNat n, NatWithinBound Word8 n) => From (Zn64 n) Word8 where
-#if __GLASGOW_HASKELL__ >= 904
-    from = narrow . unZn64 where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# (GHC.Prim.word64ToWord# w)))
-#else
-     from = narrow . unZn64 where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# w))
-#endif
- instance (KnownNat n, NatWithinBound Word16 n) => From (Zn64 n) Word16 where
-#if __GLASGOW_HASKELL__ >= 904
-    from = narrow . unZn64 where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# (GHC.Prim.word64ToWord# w)))
-#else
-     from = narrow . unZn64 where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# w))
-#endif
- instance (KnownNat n, NatWithinBound Word32 n) => From (Zn64 n) Word32 where
-#if __GLASGOW_HASKELL__ >= 904
-    from = narrow . unZn64 where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# (GHC.Prim.word64ToWord# w)))
-#else
-     from = narrow . unZn64 where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# w))
-#endif
- instance From (Zn64 n) Word64 where
-     from = unZn64
- instance From (Zn64 n) Word128 where
-@@ -297,23 +285,11 @@ instance From (Zn64 n) Word256 where
-     from = from . unZn64
-
- instance (KnownNat n, NatWithinBound Word8 n) => From (Zn n) Word8 where
-#if __GLASGOW_HASKELL__ >= 904
-    from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# (GHC.Prim.word64ToWord# w)))
-#else
-     from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# w))
-#endif
- instance (KnownNat n, NatWithinBound Word16 n) => From (Zn n) Word16 where
-#if __GLASGOW_HASKELL__ >= 904
-    from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# (GHC.Prim.word64ToWord# w)))
-#else
-     from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# w))
-#endif
- instance (KnownNat n, NatWithinBound Word32 n) => From (Zn n) Word32 where
-#if __GLASGOW_HASKELL__ >= 904
-    from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# (GHC.Prim.word64ToWord# w)))
-#else
-     from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# w))
-#endif
- instance (KnownNat n, NatWithinBound Word64 n) => From (Zn n) Word64 where
-     from = naturalToWord64 . unZn
- instance (KnownNat n, NatWithinBound Word128 n) => From (Zn n) Word128 where
-diff --git a/Basement/Numerical/Additive.hs b/Basement/Numerical/Additive.hs
-index d0dfb973..8ab65aa0 100644
--- a/Basement/Numerical/Additive.hs
-+++ b/Basement/Numerical/Additive.hs
-@@ -30,8 +30,12 @@ import qualified Basement.Types.Word128 as Word128
- import qualified Basement.Types.Word256 as Word256
-
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+import           GHC.Exts
-+#else
- import           GHC.IntWord64
- #endif
-+#endif
-
- -- | Represent class of things that can be added together,
- -- contains a neutral element and is commutative.
-diff --git a/Basement/Numerical/Conversion.hs b/Basement/Numerical/Conversion.hs
-index db502c07..fddc8232 100644
--- a/Basement/Numerical/Conversion.hs
-+++ b/Basement/Numerical/Conversion.hs
-@@ -26,8 +26,12 @@ import GHC.Word
- import Basement.Compat.Primitive
-
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+import GHC.Exts
-+#else
- import GHC.IntWord64
- #endif
-+#endif
-
- intToInt64 :: Int -> Int64
- #if WORD_SIZE_IN_BITS == 64
-@@ -96,11 +100,22 @@ int64ToWord64 (I64# i) = W64# (int64ToWord64# i)
- #endif
-
- #if WORD_SIZE_IN_BITS == 64
-+#if __GLASGOW_HASKELL__ >= 904
-+word64ToWord# :: Word64# -> Word#
-+word64ToWord# i = word64ToWord# i
-+#else
- word64ToWord# :: Word# -> Word#
- word64ToWord# i = i
-+#endif
- {-# INLINE word64ToWord# #-}
- #endif
-
-+#if WORD_SIZE_IN_BITS < 64
-+word64ToWord32# :: Word64# -> Word32#
-+word64ToWord32# i = wordToWord32# (word64ToWord# i)
-+{-# INLINE word64ToWord32# #-}
-+#endif
-+
- -- | 2 Word32s
- data Word32x2 = Word32x2 {-# UNPACK #-} !Word32
-                          {-# UNPACK #-} !Word32
-@@ -113,9 +128,14 @@ word64ToWord32s (W64# w64) = Word32x2 (W32# (wordToWord32# (uncheckedShiftRL# (G
- word64ToWord32s (W64# w64) = Word32x2 (W32# (wordToWord32# (uncheckedShiftRL# w64 32#))) (W32# (wordToWord32# w64))
- #endif
- #else
-+#if __GLASGOW_HASKELL__ >= 904
-+word64ToWord32s :: Word64 -> Word32x2
-+word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord32# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord32# w64))
-+#else
- word64ToWord32s :: Word64 -> Word32x2
- word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord# w64))
- #endif
-+#endif
-
- wordToChar :: Word -> Char
- wordToChar (W# word) = C# (chr# (word2Int# word))
-diff --git a/Basement/PrimType.hs b/Basement/PrimType.hs
-index f8ca2926..a888ec91 100644
--- a/Basement/PrimType.hs
-+++ b/Basement/PrimType.hs
-@@ -54,7 +54,11 @@ import           Basement.Nat
- import qualified Prelude (quot)
-
- #if WORD_SIZE_IN_BITS < 64
-import           GHC.IntWord64
-+#if __GLASGOW_HASKELL__ >= 904
-+import GHC.Exts
-+#else
-+import GHC.IntWord64
-+#endif
- #endif
-
- #ifdef FOUNDATION_BOUNDS_CHECK
-diff --git a/Basement/Types/OffsetSize.hs b/Basement/Types/OffsetSize.hs
-index cd944927..1ea80dad 100644
--- a/Basement/Types/OffsetSize.hs
-+++ b/Basement/Types/OffsetSize.hs
-@@ -70,8 +70,12 @@ import Data.List (foldl')
- import qualified Prelude
-
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+import GHC.Exts
-+#else
- import GHC.IntWord64
- #endif
-+#endif
-
- -- | File size in bytes
- newtype FileSize = FileSize Word64
-@@ -225,20 +229,26 @@ countOfRoundUp alignment (CountOf n) = CountOf ((n + (alignment-1)) .&. compleme
-
- csizeOfSize :: CountOf Word8 -> CSize
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+csizeOfSize (CountOf (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
-+#else
- csizeOfSize (CountOf (I# sz)) = CSize (W32# (int2Word# sz))
-+#endif
- #else
- #if __GLASGOW_HASKELL__ >= 904
- csizeOfSize (CountOf (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
-
- #else
- csizeOfSize (CountOf (I# sz)) = CSize (W64# (int2Word# sz))
-
- #endif
- #endif
-
- csizeOfOffset :: Offset8 -> CSize
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+csizeOfOffset (Offset (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
-+#else
- csizeOfOffset (Offset (I# sz)) = CSize (W32# (int2Word# sz))
-+#endif
- #else
- #if __GLASGOW_HASKELL__ >= 904
- csizeOfOffset (Offset (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
-@@ -250,7 +260,11 @@ csizeOfOffset (Offset (I# sz)) = CSize (W64# (int2Word# sz))
- sizeOfCSSize :: CSsize -> CountOf Word8
- sizeOfCSSize (CSsize (-1))      = error "invalid size: CSSize is -1"
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# (int32ToInt# sz))
-+#else
- sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# sz)
-+#endif
- #else
- #if __GLASGOW_HASKELL__ >= 904
- sizeOfCSSize (CSsize (I64# sz)) = CountOf (I# (int64ToInt# sz))
-@@ -261,7 +275,11 @@ sizeOfCSSize (CSsize (I64# sz)) = CountOf (I# sz)
-
- sizeOfCSize :: CSize -> CountOf Word8
- #if WORD_SIZE_IN_BITS < 64
-+#if __GLASGOW_HASKELL__ >= 904
-+sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# (word32ToWord# sz)))
-+#else
- sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# sz))
-+#endif
- #else
- #if __GLASGOW_HASKELL__ >= 904
- sizeOfCSize (CSize (W64# sz)) = CountOf (I# (word2Int# (word64ToWord# sz)))
@@ -1,12 +0,0 @@
-diff --git a/direct-sqlcipher.cabal b/direct-sqlcipher.cabal
-index 728ba3e..c63745e 100644
--- a/direct-sqlcipher.cabal
-+++ b/direct-sqlcipher.cabal
-@@ -84,6 +84,8 @@ library
-       cc-options: -DSQLITE_TEMP_STORE=2
-                   -DSQLITE_HAS_CODEC
-
-+    extra-libraries: ws2_32
-+
-     if !os(windows) && !os(android)
-       extra-libraries: pthread
@@ -1,36 +0,0 @@
-From 2738929ce15b4c8704bbbac24a08539b5d4bf30e Mon Sep 17 00:00:00 2001
-From: sternenseemann <sternenseemann@systemli.org>
-Date: Mon, 14 Aug 2023 10:51:30 +0200
-Subject: [PATCH] Data.Memory.Internal.CompatPrim64: fix 32 bit with GHC >= 9.4
-
-Since 9.4, GHC.Prim exports Word64# operations like timesWord64# even on
-i686 whereas GHC.IntWord64 no longer exists. Therefore, we can just use
-the ready made solution.
-
-Closes #98, as it should be the better solution.
---
- Data/Memory/Internal/CompatPrim64.hs | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Data/Memory/Internal/CompatPrim64.hs b/Data/Memory/Internal/CompatPrim64.hs
-index b9eef8a..a134c88 100644
--- a/Data/Memory/Internal/CompatPrim64.hs
-+++ b/Data/Memory/Internal/CompatPrim64.hs
-@@ -150,6 +150,7 @@ w64# :: Word# -> Word# -> Word# -> Word64#
- w64# w _ _ = w
- 
- #elif WORD_SIZE_IN_BITS == 32
-+#if __GLASGOW_HASKELL__ < 904
- import GHC.IntWord64
- import GHC.Prim (Word#)
- 
-@@ -158,6 +159,9 @@ timesWord64# a b =
-     let !ai = word64ToInt64# a
-         !bi = word64ToInt64# b
-      in int64ToWord64# (timesInt64# ai bi)
-+#else
-+import GHC.Prim
-+#endif
- 
- w64# :: Word# -> Word# -> Word# -> Word64#
- w64# _ hw lw =
@@ -197,7 +197,6 @@ library
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
-    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , simple-logger ==0.1.*
@@ -217,11 +216,13 @@ library
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
+      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
+      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3

@@ -256,7 +257,6 @@ executable simplex-bot
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
-    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , simple-logger ==0.1.*
@@ -277,11 +277,13 @@ executable simplex-bot
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
+      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
+      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3

@@ -316,7 +318,6 @@ executable simplex-bot-advanced
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
-    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , simple-logger ==0.1.*
@@ -337,11 +338,13 @@ executable simplex-bot-advanced
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
+      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
+      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3

@@ -378,7 +381,6 @@ executable simplex-broadcast-bot
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
-    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , simple-logger ==0.1.*
@@ -399,11 +401,13 @@ executable simplex-broadcast-bot
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
+      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
+      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3

@@ -439,7 +443,6 @@ executable simplex-chat
    , network ==3.1.*
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
-    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , simple-logger ==0.1.*
@@ -461,11 +464,13 @@ executable simplex-chat
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
+      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
+      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3

@@ -505,7 +510,6 @@ executable simplex-directory-service
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
-    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , simple-logger ==0.1.*
@@ -526,11 +530,13 @@ executable simplex-directory-service
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
+      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
+      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3

@@ -592,7 +598,6 @@ test-suite simplex-chat-test
    , exceptions ==0.10.*
    , filepath ==1.4.*
    , generic-random ==1.5.*
-    , hspec ==2.11.*
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
    , memory ==0.18.*
@@ -600,7 +605,6 @@ test-suite simplex-chat-test
    , network ==3.1.*
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
-    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , silently ==1.2.*
@@ -622,10 +626,18 @@ test-suite simplex-chat-test
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
+      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
+      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3
+  if impl(ghc >= 9.6.2)
+    build-depends:
+        hspec ==2.11.*
+  if impl(ghc < 9.6.2)
+    build-depends:
+        hspec ==2.7.*
@@ -0,0 +1,20 @@
+<p><strong>SimpleX Chat infrastructure on Linode:</strong></p>
+
+<ul class="mb-[12px]">
+    <li>free infrastructure.</li>
+    <li>SimpleX servers in Linode Marketplace.</li>
+    <li>high capacity messaging servers.</li>
+</ul>
+
+<p><strong>v5.5 is released:</strong></p>
+
+<ul class="mb-[12px]">
+    <li>private notes.</li>
+    <li>group history</li>
+    <li>simpler UX to connect to other people</li>
+    <li>message delivery, battery usage and other improvements</li>
+</ul>
+
+<p>Also, the app interface is now available in Hungarian and Turkish - thanks to our users.</p>
+
+<p>SimpleX Chat Android and desktop apps are now available in 20 languages!</p>
Author	SHA1	Message	Date
Evgeny Poberezkin	0d4d08e52b	core: unify dependencies for GHC 8.10.7 and 9.6.3 (#3774 )	2024-01-30 23:18:37 +00:00
Evgeny Poberezkin	7f8c7b2d99	fix merge	2024-01-24 22:46:56 +00:00
Evgeny Poberezkin	f5b666ae6d	Merge branch 'stable' into stable-android	2024-01-24 22:42:04 +00:00
Evgeny Poberezkin	14d5078404	blog: v5.5 announcement (#3744 ) * blog: v5.5 announcement * update * update * readme * images, update	2024-01-24 19:54:47 +00:00
Evgeny Poberezkin	1cfe51af45	Merge branch 'stable' into stable-android	2024-01-18 20:58:52 +00:00
Evgeny Poberezkin	68af58bda1	Merge branch 'stable' into stable-android	2024-01-10 12:17:06 +00:00
Evgeny Poberezkin	f51796b81c	Merge branch 'stable' into stable-android	2024-01-09 20:20:37 +00:00
Evgeny Poberezkin	995618cf1c	Merge branch 'stable' into stable-android	2024-01-09 10:40:34 +00:00
Evgeny Poberezkin	68baa18af8	Merge branch 'stable' into stable-android	2024-01-06 11:48:49 +00:00
Evgeny Poberezkin	a4f1c9c915	Merge branch 'stable' into stable-android	2023-12-30 10:21:07 +00:00
Evgeny Poberezkin	b8141c3555	Merge branch 'master-android' into stable-android	2023-12-28 09:18:12 +00:00
Evgeny Poberezkin	47214e33ea	Merge branch 'master-ghc8107' into master-android	2023-12-27 21:02:49 +00:00
Evgeny Poberezkin	ff239d81e5	Merge branch 'master' into master-ghc8107	2023-12-27 21:02:11 +00:00
Evgeny Poberezkin	0a6e47dd61	Merge branch 'master' into master-ghc8107	2023-12-27 20:57:25 +00:00
Evgeny Poberezkin	ee75219ed3	core: 5.4.2.1 (simplexmq 5.5.0.2)	2023-12-27 20:57:05 +00:00
Evgeny Poberezkin	2e337a753f	Merge branch 'master-ghc8107' into master-android	2023-12-27 14:09:42 +00:00
Evgeny Poberezkin	9918d91def	Merge branch 'master' into master-ghc8107	2023-12-27 14:09:23 +00:00
Evgeny Poberezkin	82dd5751c1	Merge branch 'master-ghc8107' into master-android	2023-12-26 21:27:06 +00:00
Evgeny Poberezkin	de637fab50	Merge branch 'master' into master-ghc8107	2023-12-26 21:12:36 +00:00
Evgeny Poberezkin	cb49f6f01d	Merge branch 'master-ghc8107' into master-android	2023-12-23 19:57:27 +00:00
Evgeny Poberezkin	6d0a83aa58	Merge branch 'master' into master-ghc8107	2023-12-23 19:57:08 +00:00
Evgeny Poberezkin	05f57e98ad	Merge branch 'master-ghc8107' into master-android	2023-12-23 17:25:14 +00:00
Evgeny Poberezkin	6a66525927	Merge branch 'master' into master-ghc8107	2023-12-23 17:24:47 +00:00
Evgeny Poberezkin	9530a6055a	Merge branch 'master-ghc8107' into master-android	2023-12-23 15:12:49 +00:00
Evgeny Poberezkin	f5ed8debcc	Merge branch 'master' into master-ghc8107	2023-12-23 15:11:38 +00:00
Evgeny Poberezkin	355d2449c5	fix for GHC 8.10.7	2023-12-23 15:05:36 +00:00
Evgeny Poberezkin	f7382cdd6f	Merge branch 'master' into master-ghc8107	2023-12-23 13:52:44 +00:00
Evgeny Poberezkin	dc8d10d068	core: limit process package version to 1.6.17	2023-12-21 10:54:54 +00:00
Evgeny Poberezkin	951245d33f	Merge branch 'master-ghc8107' into master-android	2023-12-21 10:00:28 +00:00
Evgeny Poberezkin	521b901cc9	Merge branch 'master' into master-ghc8107 (without changes for iPhone7)	2023-12-21 09:59:25 +00:00
Evgeny Poberezkin	6311ba451b	Merge branch 'master-ghc8107' into master-android	2023-12-21 00:45:32 +00:00
Evgeny Poberezkin	754c76d6fd	Merge branch 'master' into master-ghc8107	2023-12-21 00:45:10 +00:00
Evgeny Poberezkin	545f110fb8	nix: fix direct-sqlcipher content hash	2023-12-13 20:29:36 +00:00
Evgeny Poberezkin	4c6387c854	nix: fix script	2023-12-13 20:28:32 +00:00
Evgeny Poberezkin	aea7ff1c89	nix: fix script	2023-12-13 20:27:58 +00:00
Evgeny Poberezkin	77ac972e09	Merge branch 'master-ghc8107' into master-android	2023-12-13 12:36:06 +00:00
Evgeny Poberezkin	256f85024f	Merge branch 'master' into master-ghc8107	2023-12-13 12:35:37 +00:00
Evgeny Poberezkin	870f9e42dd	Merge branch 'master' into master-ghc8107	2023-12-12 20:09:39 +00:00
Evgeny Poberezkin	b3544cfbc3	Merge branch 'stable' into stable-android	2023-12-12 10:12:42 +00:00
Evgeny Poberezkin	0a4a3a24e1	Merge branch 'master-ghc8107' into master-android	2023-12-11 17:36:51 +00:00
Evgeny Poberezkin	8a66390a78	fix for GHC 8.10.7	2023-12-11 16:14:56 +00:00
Evgeny Poberezkin	3d48eded3d	Merge branch 'master-ghc8107' into master-android	2023-12-11 14:56:47 +00:00
Evgeny Poberezkin	6546426ec0	Merge branch 'master' into master-ghc8107	2023-12-11 14:56:25 +00:00
spaced4ndy	4a7ceb00fb	Merge branch 'master-ghc8107' into master-android	2023-12-11 17:53:08 +04:00
spaced4ndy	53560378bb	Merge branch 'master' into master-ghc8107	2023-12-11 17:52:48 +04:00
Evgeny Poberezkin	bfa8717ed4	Merge branch 'master-android' into stable-android	2023-12-09 20:43:21 +00:00
Evgeny Poberezkin	cdb3b6aafd	Merge branch 'master-ghc8107' into master-android	2023-12-07 15:12:49 +00:00
Evgeny Poberezkin	9f3d3e8ba4	Merge branch 'master' into master-ghc8107	2023-12-07 15:00:23 +00:00
Evgeny Poberezkin	047aad592e	Merge branch 'master-ghc8107' into master-android	2023-12-04 12:32:05 +00:00
Evgeny Poberezkin	087acd9180	changes to support GHC 8.10.7 (#3512 ) * Revert "raise lower bound on mtl to a real version (#3499)" This reverts commit `f94c0311c1`. * Revert "core: expand ranges to fit ghc 8.10 & 9.6 (#3496)" This reverts commit `9a1c7f41f7`. * update simplexmq * remove netword-transport fork * compatibility with GHC 8.10.7 * simplexmq * fix test * simplexmq, deps * update sqlcipher deps in sha256nix * fix index-state in cabal.project * index-state * remove import * add cabal.project.freeze * simplexmq * remove freeze * simplexmq * bytestring,simplexmq * template-haskell, simplexmq * simplexmq * simplexmq * simplexmq * mtl * simplexmq * remove duplicate index-state	2023-12-04 12:29:49 +00:00
Evgeny Poberezkin	0b822e4a5c	Merge branch 'master' into master-ghc8107	2023-12-04 10:07:16 +00:00
Evgeny Poberezkin	f8a469488e	Merge branch 'master' into master-ghc8107	2023-12-02 12:30:36 +00:00
Evgeny Poberezkin	3b5e806418	Merge branch 'master' into master-ghc8107	2023-12-01 17:46:12 +00:00
spaced4ndy	79e208193a	Merge branch 'master-ghc8107' into master-android	2023-11-30 21:11:25 +04:00
spaced4ndy	ef5c13b1c1	Merge branch 'master' into master-ghc8107	2023-11-30 21:10:51 +04:00
spaced4ndy	38533213d2	Merge branch 'master' into master-ghc8107	2023-11-30 20:56:51 +04:00
spaced4ndy	5f1aa6fa9d	Merge branch 'master-ghc8107' into master-android	2023-11-27 19:18:22 +04:00
spaced4ndy	b0002fe07d	Merge branch 'master' into master-ghc8107	2023-11-27 19:17:39 +04:00
Evgeny Poberezkin	ef21fd1d26	Merge branch 'master-ghc8107' into master-android	2023-11-26 19:59:46 +00:00
Evgeny Poberezkin	4a311b9578	fix for ghc 8.10.7	2023-11-26 19:34:39 +00:00
Evgeny Poberezkin	b8da5e225b	Merge branch 'master' into master-ghc8107	2023-11-26 18:53:40 +00:00
Evgeny Poberezkin	8b3300e197	Merge branch 'master-android' into stable-android	2023-11-26 13:14:27 +00:00
Evgeny Poberezkin	f27de052cf	Merge branch 'master' into master-android	2023-11-26 11:51:16 +00:00
Evgeny Poberezkin	5cc537f14c	Merge branch 'master' into master-ghc8107	2023-11-26 11:50:50 +00:00
Evgeny Poberezkin	dc8ca4cf89	Merge tag 'v5.4.0' into master-android	2023-11-25 11:23:23 +00:00
Evgeny Poberezkin	b62dd801f1	Merge branch 'master-ghc8107' into master-android	2023-11-24 20:02:05 +00:00
Evgeny Poberezkin	0c096e2c89	Merge branch 'master' into master-ghc8107	2023-11-24 19:00:30 +00:00
Evgeny Poberezkin	cc127e56fe	Merge branch 'master' into master-android	2023-11-23 16:23:02 +00:00
Evgeny Poberezkin	1781495ee3	Merge branch 'master' into master-ghc8107	2023-11-23 16:22:46 +00:00
Evgeny Poberezkin	831231d8e6	Merge branch 'master-ghc8107' into master-android	2023-11-21 21:16:04 +00:00
Evgeny Poberezkin	45102442f4	Merge branch 'master' into master-ghc8107	2023-11-21 21:15:10 +00:00
spaced4ndy	f323c8e112	Merge branch 'master-ghc8107' into master-android	2023-11-21 19:42:28 +04:00
spaced4ndy	3bdc6b5e28	Merge branch 'master' into master-ghc8107	2023-11-21 19:41:06 +04:00
Evgeny Poberezkin	d8373262bc	Merge branch 'master-ghc8107' into master-android	2023-11-21 00:01:20 +00:00
Evgeny Poberezkin	3597d34716	Merge branch 'master' into master-ghc8107	2023-11-21 00:00:59 +00:00
Evgeny Poberezkin	bd4259e89e	update hpack	2023-11-20 14:43:20 +00:00
Evgeny Poberezkin	55ead740cc	update hpack	2023-11-20 14:43:05 +00:00
Evgeny Poberezkin	5ef0eda2d7	Merge branch 'master-ghc8107' into master-android	2023-11-20 14:30:27 +00:00
Evgeny Poberezkin	49a9b0e7d6	update hpack version	2023-11-20 14:30:10 +00:00
Evgeny Poberezkin	45ada450a2	Merge branch 'master-ghc8107' into master-android	2023-11-20 13:24:07 +00:00
Evgeny Poberezkin	307a1b3c5e	fix for ghc 8.10.7	2023-11-20 13:23:45 +00:00
Evgeny Poberezkin	ed6b3bbead	Merge branch 'master' into master-ghc8107	2023-11-20 13:01:22 +00:00
spaced4ndy	901610eec5	Merge branch 'master-ghc8107' into master-android	2023-11-20 14:08:10 +04:00
spaced4ndy	7d4127c51d	Merge branch 'master' into master-ghc8107	2023-11-20 14:07:08 +04:00
Evgeny Poberezkin	13215d91d7	Merge branch 'master-ghc8107' into master-android	2023-11-20 00:07:12 +00:00
Evgeny Poberezkin	e1a8099474	fix for GHC 8.10.7	2023-11-20 00:06:45 +00:00
Evgeny Poberezkin	daa8d9bb21	Merge branch 'master' into master-ghc8107	2023-11-19 23:42:13 +00:00
Evgeny Poberezkin	5fcbade1bc	Merge branch 'master-ghc8107' into master-android	2023-11-17 11:49:35 +00:00
Evgeny Poberezkin	3937ffa9a6	Merge branch 'master' into master-ghc8107	2023-11-17 11:47:52 +00:00
Evgeny Poberezkin	80ddb50e1c	Merge branch 'master-ghc8107' into master-android	2023-11-16 18:55:17 +00:00
Evgeny Poberezkin	f6e66f1c53	Merge branch 'master' into master-ghc8107	2023-11-16 18:13:02 +00:00
Evgeny Poberezkin	0c23ff9ae3	Merge branch 'master-ghc8107' into master-android	2023-11-11 13:57:32 +00:00
Evgeny Poberezkin	1570bc2b99	Merge branch 'master' into master-ghc8107	2023-11-11 13:56:53 +00:00
Evgeny Poberezkin	1e2104cabf	Merge branch 'master-ghc8107' into master-android	2023-11-11 09:52:07 +00:00
Evgeny Poberezkin	f3014f258d	Merge branch 'master' into master-ghc8107	2023-11-11 09:51:42 +00:00
Evgeny Poberezkin	f0991cc0ba	Merge branch 'master-ghc8107' into master-android	2023-11-10 21:22:19 +00:00
Evgeny Poberezkin	74b78a8d7b	Merge branch 'master' into master-ghc8107	2023-11-10 21:11:08 +00:00
Evgeny Poberezkin	82cd70a75c	Merge branch 'master-ghc8107' into master-android	2023-11-10 21:08:11 +00:00
Evgeny Poberezkin	fe4eb7b5af	Merge branch 'master' into master-ghc8107 without changes, to skip update for ghc 9.6.3	2023-11-10 21:04:20 +00:00
Evgeny Poberezkin	c459e71d02	Merge branch 'master-ghc8107' into master-android	2023-11-06 11:26:40 +00:00
Evgeny Poberezkin	2516d5a393	Merge branch 'master' into master-ghc8107	2023-11-06 11:26:22 +00:00
spaced4ndy	477d98d75a	Merge branch 'master-ghc8107' into master-android	2023-11-06 11:42:39 +04:00
spaced4ndy	4253cd7fb9	Merge branch 'master' into master-ghc8107	2023-11-06 11:41:55 +04:00
Evgeny Poberezkin	ca78958667	Merge branch 'master-ghc8107' into master-android	2023-11-04 13:39:35 +00:00
Evgeny Poberezkin	1f5b80d560	fix for ghc8107	2023-11-04 13:37:25 +00:00
Evgeny Poberezkin	2de111e76c	Merge branch 'master' into master-ghc8107	2023-11-04 13:02:08 +00:00
spaced4ndy	8343285d93	Merge branch 'master-ghc8107' into master-android	2023-10-30 21:01:16 +04:00
spaced4ndy	5dbe2b2745	Merge branch 'master' into master-ghc8107	2023-10-30 21:00:11 +04:00
Evgeny Poberezkin	fb9485190d	Merge branch 'master-ghc8107' into master-android	2023-10-29 18:27:00 +00:00
Evgeny Poberezkin	6881600e06	Merge branch 'master' into master-ghc8107	2023-10-29 18:24:13 +00:00
spaced4ndy	9ed723bafa	Merge branch 'master-ghc8107' into master-android	2023-10-25 10:48:37 +04:00
spaced4ndy	9ded1c9821	Merge branch 'master' into master-ghc8107	2023-10-25 10:47:35 +04:00
spaced4ndy	bb374c68b1	Merge branch 'master-ghc8107' into master-android	2023-10-24 18:14:22 +04:00
spaced4ndy	c3e82a6a4e	Merge branch 'master' into master-ghc8107	2023-10-24 18:13:56 +04:00
spaced4ndy	7c12e82042	Merge branch 'master-ghc8107' into master-android	2023-10-24 17:41:19 +04:00
spaced4ndy	e7e66ff873	Merge branch 'master' into master-ghc8107	2023-10-24 17:40:55 +04:00
Evgeny Poberezkin	c4d7e5307c	Merge branch 'master-ghc8107' into master-android	2023-10-22 15:35:55 +01:00
Evgeny Poberezkin	d6b9a45a39	Merge branch 'master' into master-ghc8107	2023-10-22 15:10:33 +01:00
Evgeny Poberezkin	7fd3b4d6ba	Merge branch 'master-ghc8107' into master-android	2023-10-18 22:45:11 +01:00
Evgeny Poberezkin	4004aafbc5	Merge branch 'master' into master-ghc8107	2023-10-18 22:44:27 +01:00
spaced4ndy	95008eeeaf	Merge branch 'master-ghc8107' into master-android	2023-10-16 20:05:49 +04:00
spaced4ndy	c7a8992043	core: fix compilation for ghc 8.10.7	2023-10-16 20:05:13 +04:00
spaced4ndy	ea2b5f2ccf	Merge branch 'master-ghc8107' into master-android	2023-10-16 19:28:48 +04:00
spaced4ndy	ed9f277421	Merge branch 'master' into master-ghc8107	2023-10-16 19:28:06 +04:00
Evgeny Poberezkin	5c14c3b349	Merge branch 'master-ghc8107' into master-android	2023-10-15 18:54:16 +01:00
Evgeny Poberezkin	d8fb31f167	Merge branch 'master' into master-ghc8107	2023-10-15 18:53:23 +01:00
Evgeny Poberezkin	02db38ffd3	Merge branch 'master-ghc8107' into master-android	2023-10-11 21:58:16 +01:00
Evgeny Poberezkin	7692195bfa	core: fix for ghc 8.10.7	2023-10-11 21:57:53 +01:00
Evgeny Poberezkin	c435cbdc7b	Merge branch 'master-ghc8107' into master-android	2023-10-11 21:28:43 +01:00
Evgeny Poberezkin	effc281271	Merge branch 'master' into master-ghc8107	2023-10-11 21:27:21 +01:00
spaced4ndy	41eb2e5689	Merge branch 'master-ghc8107' into master-android	2023-10-11 13:22:30 +04:00
spaced4ndy	67d74a0a27	Merge branch 'master' into master-ghc8107	2023-10-11 13:21:46 +04:00
Evgeny Poberezkin	c60af078d7	Merge branch 'stable' into stable-android	2023-10-09 19:55:51 +01:00
Evgeny Poberezkin	f66405e79b	Merge branch 'master-ghc8107' into master-android	2023-10-09 17:31:56 +01:00
Evgeny Poberezkin	74d186af16	Merge branch 'master' into master-ghc8107	2023-10-09 17:31:27 +01:00
Evgeny Poberezkin	e4fbe66d95	Merge branch 'stable' into stable-android	2023-10-09 14:36:03 +01:00
Evgeny Poberezkin	187fef0c5a	Merge branch 'master-ghc8107' into master-android	2023-10-09 14:05:21 +01:00
Evgeny Poberezkin	4782cab507	Merge branch 'master' into master-ghc8107	2023-10-09 14:05:04 +01:00
Evgeny Poberezkin	cb52d75ff0	Merge branch 'stable' into stable-android	2023-10-08 17:31:23 +01:00
Evgeny Poberezkin	bcbee67709	Merge branch 'master-ghc8107' into master-android	2023-10-08 08:38:40 +01:00
Evgeny Poberezkin	2501cbe55d	Merge branch 'master' into master-ghc8107	2023-10-08 08:38:02 +01:00
Evgeny Poberezkin	2bd049db87	Merge branch 'master-ghc8107' into master-android	2023-10-07 21:10:22 +01:00
Evgeny Poberezkin	6b8b9ab4fd	Merge branch 'master' into master-ghc8107	2023-10-07 19:06:38 +01:00
Evgeny Poberezkin	30db24265e	Merge branch 'master-ghc8107' into master-android	2023-10-02 23:04:44 +01:00
Evgeny Poberezkin	316d605899	Merge branch 'master' into master-ghc8107	2023-10-02 23:04:13 +01:00
Evgeny Poberezkin	b4257f7767	Merge branch 'master-ghc8107' into master-android	2023-10-01 13:21:50 +01:00
Evgeny Poberezkin	a3f2d5c919	Merge branch 'master' into master-ghc8107	2023-10-01 13:20:06 +01:00
Evgeny Poberezkin	cf46469cd5	Merge branch 'master-ghc8107' into master-android	2023-10-01 11:19:50 +01:00
Evgeny Poberezkin	0312fde818	Merge branch 'master' into master-ghc8107	2023-10-01 11:19:27 +01:00
Evgeny Poberezkin	9defa44f0c	Merge branch 'master-ghc8107' into master-android	2023-09-29 13:15:23 +01:00
Evgeny Poberezkin	915b53054c	Merge branch 'master' into master-ghc8107	2023-09-29 13:14:57 +01:00
Evgeny Poberezkin	f81557b4fd	Merge branch 'master-ghc8107' into master-android	2023-09-27 22:10:06 +01:00
Evgeny Poberezkin	e273bd1239	Merge branch 'master' into master-ghc8107	2023-09-27 22:04:00 +01:00
spaced4ndy	a63caf4640	Merge branch 'master-ghc8107' into master-android	2023-09-27 20:38:36 +04:00
spaced4ndy	e7f0234134	Merge branch 'master' into master-ghc8107	2023-09-27 20:11:39 +04:00
Evgeny Poberezkin	340552321e	Merge branch 'master-ghc8107' into master-android	2023-09-27 16:07:24 +01:00
Evgeny Poberezkin	98a3fc214d	Merge branch 'master' into master-ghc8107	2023-09-27 16:04:25 +01:00
Evgeny Poberezkin	6a578cfe3c	Merge branch 'master-ghc8107' into master-android	2023-09-25 16:53:04 +01:00
Evgeny Poberezkin	dacc075fe8	Merge branch 'master' into master-ghc8107	2023-09-25 16:52:33 +01:00
spaced4ndy	55418e2bc0	Merge branch 'master-ghc8107' into master-android	2023-09-25 17:43:59 +04:00
spaced4ndy	f2b5c0f3a8	Merge branch 'master' into master-ghc8107	2023-09-25 17:43:37 +04:00
spaced4ndy	5ebdf5dba9	Merge branch 'master-ghc8107' into master-android	2023-09-25 17:07:14 +04:00
spaced4ndy	8e045764df	Merge branch 'master' into master-ghc8107	2023-09-25 16:40:08 +04:00
Evgeny Poberezkin	503d3d77e6	Merge branch 'master' into master-ghc8107	2023-09-23 08:47:28 +01:00
Evgeny Poberezkin	81bd7d97c5	Merge branch 'master' into master-ghc8107	2023-09-22 17:21:54 +01:00
Evgeny Poberezkin	8f57925067	compatibility with GHC 8.10.7	2023-09-22 14:01:25 +01:00
Evgeny Poberezkin	9bf99db82e	Merge branch 'master' into master-ghc8107	2023-09-22 13:46:50 +01:00
Evgeny Poberezkin	5615cdbf1a	Merge branch 'master' into master-android	2023-09-21 17:04:47 +01:00
Evgeny Poberezkin	d802ae0058	Merge branch 'master' into master-android	2023-09-21 12:06:10 +01:00
Evgeny Poberezkin	8f2278198c	Merge branch 'master' into master-android	2023-09-20 14:55:25 +01:00
spaced4ndy	10937a5a4e	Merge branch 'master' into master-android	2023-09-20 17:36:53 +04:00
Evgeny Poberezkin	6aff6e9804	Merge branch 'master-ghc9' into master-ghc8107	2023-09-18 21:56:35 +01:00
Evgeny Poberezkin	95477cae7e	core: use commit from simplexmq branch master-ghc8107	2023-09-18 21:45:50 +01:00