Merge pull request #109446 from jojosch/mycli-1.23.0

mycli: 1.22.2 -> 1.23.0
This commit is contained in:
Sandro 2021-01-15 18:33:03 +01:00 committed by GitHub
commit 0eb69dab67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,22 +1,30 @@
{ lib { lib
, python3 , python3
, glibcLocales , glibcLocales
, fetchpatch
}: }:
with python3.pkgs; with python3.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "mycli"; pname = "mycli";
version = "1.22.2"; version = "1.23.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1lq2x95553vdmhw13cxcgsd2g2i32izhsb7hxd4m1iwf9b3msbpv"; sha256 = "sha256-k1UHpEoszThUvoL4h59vGZ71bAx26VJ0iT/YuVQk/Lk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
paramiko pymysql configobj sqlparse prompt_toolkit pygments click pycrypto cli-helpers cli-helpers
click
configobj
paramiko
prompt_toolkit
pycrypto
pygments
pymysql
pyperclip
sqlparse
]; ];
checkInputs = [ pytest mock glibcLocales ]; checkInputs = [ pytest mock glibcLocales ];
@ -29,15 +37,6 @@ buildPythonApplication rec {
--ignore=mycli/packages/paramiko_stub/__init__.py --ignore=mycli/packages/paramiko_stub/__init__.py
''; '';
patches = [
# TODO: remove with next release (v1.22.3 or v1.23)
(fetchpatch {
url = "https://github.com/dbcli/mycli/commit/17f093d7b70ab2d9f3c6eababa041bf76f029aac.patch";
sha256 = "sha256-VwfbtzUtElV+ErH+NJb+3pRtSaF0yVK8gEWCvlzZNHI=";
excludes = [ "changelog.md" "mycli/AUTHORS" ];
})
];
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "sqlparse>=0.3.0,<0.4.0" "sqlparse" --replace "sqlparse>=0.3.0,<0.4.0" "sqlparse"