Merge pull request #51664 from erictapen/tlslite-ng-init

pythonPackages.tlslite-ng: init at 0.7.5, migrate tlslite references to it, delete tlslite
This commit is contained in:
edef 2018-12-10 13:03:27 +00:00 committed by GitHub
commit 995d224f44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 25 deletions

View file

@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
pysocks
qrcode
requests
tlslite
tlslite-ng
# plugins
keepkey

View file

@ -22,7 +22,7 @@ python2Packages.buildPythonApplication rec {
qrcode
requests
pyaes
tlslite
tlslite-ng
x11_hash
mnemonic
jsonrpclib

View file

@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec {
qdarkstyle
qrcode
requests
tlslite
tlslite-ng
typing
# plugins

View file

@ -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 ];
};
}

View file

@ -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;
};
}

View file

@ -4299,7 +4299,9 @@ 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 { };
qrcode = callPackage ../development/python-modules/qrcode { };