From 976b1c919fad34795c3303f997c4536d848227c1 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Tue, 21 Jun 2022 19:27:30 +0100
Subject: [PATCH] revert tls to 1.5.7 and nix config changes (#746)

* Revert "nix: update nix for new tls version (#744)"

This reverts commit 7df8c23c81758efb1c67cc24691bb99d6b1ee44f.

* Revert "update flake.nix"

This reverts commit 4b263510eef4e4d609b1a9550c71a259ea27e522.

* Revert "update tls"

This reverts commit 2e34ae3b1c535fe1db2157499c217c9a92a1f6b8.

* update simplexmq
---
 cabal.project             |  2 +-
 flake.lock                | 11 ++++-------
 flake.nix                 |  7 +------
 scripts/nix/sha256map.nix |  2 +-
 stack.yaml                |  4 ++--
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/cabal.project b/cabal.project
index e02582e5ed..d72a77b02c 100644
--- a/cabal.project
+++ b/cabal.project
@@ -3,7 +3,7 @@ packages: .
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: 31c78e516dbc4fa2ca7cb61dd1838a3ed2028daa
+    tag: 5b61c6bccdce8563bca2041484054a28707d8e50
 
 source-repository-package
     type: git
diff --git a/flake.lock b/flake.lock
index 7c1fd19982..d2deeaa040 100644
--- a/flake.lock
+++ b/flake.lock
@@ -133,11 +133,11 @@
     "hackage": {
       "flake": false,
       "locked": {
-        "lastModified": 1655687627,
-        "narHash": "sha256-E1uyic0vWHC6gtz2FYtnFE3JWhvmmBj1TU93qoJSxdg=",
+        "lastModified": 1647047557,
+        "narHash": "sha256-6A7jjz77f53GkvFxqVmeuqqXyDWsU24rUtFtOg68CAg=",
         "owner": "input-output-hk",
         "repo": "hackage.nix",
-        "rev": "6634069475ef594a8a2be6c33301ba7e59149980",
+        "rev": "fc07d4d4f2597334caa96f455cec190bdcc931f4",
         "type": "github"
       },
       "original": {
@@ -155,9 +155,7 @@
         "cardano-shell": "cardano-shell",
         "flake-utils": "flake-utils_2",
         "ghc-8.6.5-iohk": "ghc-8.6.5-iohk",
-        "hackage": [
-          "hackage"
-        ],
+        "hackage": "hackage",
         "hpc-coveralls": "hpc-coveralls",
         "nix-tools": "nix-tools",
         "nixpkgs": [
@@ -317,7 +315,6 @@
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "hackage": "hackage",
         "haskellNix": "haskellNix",
         "nixpkgs": "nixpkgs"
       }
diff --git a/flake.nix b/flake.nix
index 2474dcbf78..6e13c24a64 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,13 +3,8 @@
   inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; #angerman/nixpkgs/patch-1"; # based on 21.11, still need this, until everything is merged into 21.11.
   inputs.haskellNix.url = "github:input-output-hk/haskell.nix?ref=angerman/try-no-libcharset";
   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, ... }:
+  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:
       let pkgs = haskellNix.legacyPackages.${system}; in
diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix
index 7f6f6969af..4dd6c80f63 100644
--- a/scripts/nix/sha256map.nix
+++ b/scripts/nix/sha256map.nix
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."31c78e516dbc4fa2ca7cb61dd1838a3ed2028daa" = "19fyq6570x4jmqyznnz4qx3nq6sfcpvil0m9iz9q1mi50nn6c6aj";
+  "https://github.com/simplex-chat/simplexmq.git"."5b61c6bccdce8563bca2041484054a28707d8e50" = "11bsndjrj0s2vwgz2lg6plj1c1hjg2wqrgwqfsy1w0hx19mv4c0m";
   "https://github.com/simplex-chat/aeson.git"."3eb66f9a68f103b5f1489382aad89f5712a64db7" = "0kilkx59fl6c3qy3kjczqvm8c3f4n3p0bdk9biyflf51ljnzp4yp";
   "https://github.com/simplex-chat/haskell-terminal.git"."f708b00009b54890172068f168bf98508ffcd495" = "0zmq7lmfsk8m340g47g5963yba7i88n4afa6z93sg9px5jv1mijj";
   "https://github.com/zw3rk/android-support.git"."3c3a5ab0b8b137a072c98d3d0937cbdc96918ddb" = "1r6jyxbim3dsvrmakqfyxbd6ms6miaghpbwyl0sr6dzwpgaprz97";
diff --git a/stack.yaml b/stack.yaml
index ac764b57ee..8ecd1c1f20 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -38,7 +38,7 @@ extra-deps:
   - cryptostore-0.2.1.0@sha256:9896e2984f36a1c8790f057fd5ce3da4cbcaf8aa73eb2d9277916886978c5b19,3881
   - network-3.1.2.7@sha256:e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568,4888
   - simple-logger-0.1.0@sha256:be8ede4bd251a9cac776533bae7fb643369ebd826eb948a9a18df1a8dd252ff8,1079
-  - tls-1.6.0@sha256:7ae39373fd2de27fb80e90f76d22aeeb9a074a0ddd120cbd02c9c52f516a9e55,6987
+  - tls-1.5.7@sha256:1cc30253a9696b65a9cafc0317fbf09f7dcea15e3a145ed6c9c0e28c632fa23a,6991
   # below hackage dependencies are to update Aeson to 2.0.3
   - OneTuple-0.3.1@sha256:a848c096c9d29e82ffdd30a9998aa2931cbccb3a1bc137539d80f6174d31603e,2262
   - attoparsec-0.14.4@sha256:79584bdada8b730cb5138fca8c35c76fbef75fc1d1e01e6b1d815a5ee9843191,5810
@@ -49,7 +49,7 @@ extra-deps:
   # - simplexmq-1.0.0@sha256:34b2004728ae396e3ae449cd090ba7410781e2b3cefc59259915f4ca5daa9ea8,8561
   # - ../simplexmq
   - github: simplex-chat/simplexmq
-    commit: 31c78e516dbc4fa2ca7cb61dd1838a3ed2028daa
+    commit: 5b61c6bccdce8563bca2041484054a28707d8e50
   # - terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977
   - github: simplex-chat/aeson
     commit: 3eb66f9a68f103b5f1489382aad89f5712a64db7