From be9bda4fa0588d398abf83feb424e0eb7100ef66 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Fri, 15 Jan 2021 14:50:31 +0100 Subject: [PATCH] mycli: 1.22.2 -> 1.23.0 --- pkgs/tools/admin/mycli/default.nix | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 01b82dde4d5..92752335d32 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -1,22 +1,30 @@ { lib , python3 , glibcLocales -, fetchpatch }: with python3.pkgs; buildPythonApplication rec { pname = "mycli"; - version = "1.22.2"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "1lq2x95553vdmhw13cxcgsd2g2i32izhsb7hxd4m1iwf9b3msbpv"; + sha256 = "sha256-k1UHpEoszThUvoL4h59vGZ71bAx26VJ0iT/YuVQk/Lk="; }; 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 ]; @@ -29,15 +37,6 @@ buildPythonApplication rec { --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 = '' substituteInPlace setup.py \ --replace "sqlparse>=0.3.0,<0.4.0" "sqlparse"