Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2018-09-01 10:41:58 +02:00
34 changed files with 46485 additions and 49210 deletions

View File

@@ -0,0 +1,18 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "pyotp";
version = "2.2.6";
src = fetchPypi {
inherit pname version;
sha256 = "dd9130dd91a0340d89a0f06f887dbd76dd07fb95a8886dc4bc401239f2eebd69";
};
meta = with lib; {
description = "Python One Time Password Library";
homepage = https://github.com/pyotp/pyotp;
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View File

@@ -0,0 +1,21 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "PyQRCode";
version = "1.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "fdbf7634733e56b72e27f9bce46e4550b75a3a2c420414035cae9d9d26b234d5";
};
# No tests in PyPI tarball
doCheck = false;
meta = with lib; {
description = "A QR code generator written purely in Python with SVG, EPS, PNG and terminal output";
homepage = https://github.com/mnooner256/pyqrcode;
license = licenses.bsd3;
maintainers = with maintainers; [ dotlambda ];
};
}