From 09991d40e636181d37953e941c7f771a9c2cad49 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Fri, 7 Dec 2018 15:28:55 +0100
Subject: [PATCH 1/2] pythonPackages.tlslite-ng: init at 0.7.5

---
 .../python-modules/tlslite-ng/default.nix     | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/tlslite-ng/default.nix

diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix
new file mode 100644
index 000000000000..ac68019d3695
--- /dev/null
+++ b/pkgs/development/python-modules/tlslite-ng/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, ecdsa
+}:
+
+buildPythonPackage rec {
+  pname = "tlslite-ng";
+  version = "0.7.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1aw7j50byzab0xwp50m5w5c14fzdzwk2law5a5bn6dn3i5fc6fw2";
+  };
+
+  buildInputs = [ ecdsa ];
+
+  meta = with stdenv.lib; {
+    description = "Pure python implementation of SSL and TLS.";
+    homepage = https://pypi.python.org/pypi/tlslite-ng;
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.erictapen ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1c1956fc3d44..557ef81d56ab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4293,6 +4293,8 @@ in {
 
   tlslite = callPackage ../development/python-modules/tlslite { };
 
+  tlslite-ng = callPackage ../development/python-modules/tlslite-ng { };
+
   qrcode = callPackage ../development/python-modules/qrcode { };
 
   traits = callPackage ../development/python-modules/traits { };

From 93bf0a02f559e4fecd2bfe2ebc36c0873fab1f2e Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Fri, 7 Dec 2018 15:29:24 +0100
Subject: [PATCH 2/2] pythonPackages.tlslite: delete, migrate refs to
 pythonPackages.tlslite-ng

tlslite has a test failure on Python 3.7 [0]. @tomato42, a commiter of
tlslite and author of tlslite-ng said, that tlslite is abandoned (last
commit 2015) and tlslite-ng should be used as a drop in replacement.

[0] https://github.com/trevp/tlslite/issues/121
---
 .../misc/electron-cash/default.nix            |  2 +-
 pkgs/applications/misc/electrum/dash.nix      |  2 +-
 pkgs/applications/misc/electrum/default.nix   |  2 +-
 .../python-modules/tlslite/default.nix        | 21 -------------------
 pkgs/top-level/python-packages.nix            |  2 +-
 5 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/development/python-modules/tlslite/default.nix

diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 8105f4d61bd8..170690cdad3a 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
     pysocks
     qrcode
     requests
-    tlslite
+    tlslite-ng
 
     # plugins
     keepkey
diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix
index c98efa547b39..98ed10b0c7cc 100644
--- a/pkgs/applications/misc/electrum/dash.nix
+++ b/pkgs/applications/misc/electrum/dash.nix
@@ -22,7 +22,7 @@ python2Packages.buildPythonApplication rec {
     qrcode
     requests
     pyaes
-    tlslite
+    tlslite-ng
     x11_hash
     mnemonic
     jsonrpclib
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 843257a74e55..9adcea837735 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec {
     qdarkstyle
     qrcode
     requests
-    tlslite
+    tlslite-ng
     typing
 
     # plugins
diff --git a/pkgs/development/python-modules/tlslite/default.nix b/pkgs/development/python-modules/tlslite/default.nix
deleted file mode 100644
index 75d622ef34f3..000000000000
--- a/pkgs/development/python-modules/tlslite/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
-  pname = "tlslite";
-  version = "0.4.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1fxx6d3nw5r1hqna1h2jvqhcygn9fyshlm0gh3gp0b1ji824gd6r";
-  };
-
-  meta = with stdenv.lib; {
-    description = "A pure Python implementation of SSL and TLS";
-    homepage = https://pypi.python.org/pypi/tlslite;
-    license = licenses.bsd3;
-  };
-
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 557ef81d56ab..0f3c25d17c9a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4291,7 +4291,7 @@ in {
     py = python.override{x11Support=true;};
   in callPackage ../development/python-modules/tkinter { py = py; };
 
-  tlslite = callPackage ../development/python-modules/tlslite { };
+  tlslite = throw "deprecated 2018-12-10; use pythonPackages.tlslite-ng instead";
 
   tlslite-ng = callPackage ../development/python-modules/tlslite-ng { };