From d45e554457b934814a2306d96db7eee58887511b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 6 Sep 2017 16:52:41 +0200 Subject: [PATCH] mycli: move out of python-packages.nix and fix build --- pkgs/tools/admin/mycli/default.nix | 38 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 33 -------------------------- 3 files changed, 40 insertions(+), 33 deletions(-) create mode 100644 pkgs/tools/admin/mycli/default.nix diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix new file mode 100644 index 00000000000..bd0f051bd84 --- /dev/null +++ b/pkgs/tools/admin/mycli/default.nix @@ -0,0 +1,38 @@ +{ lib +, python +}: + +with python.pkgs; + +buildPythonApplication rec { + pname = "mycli"; + version = "1.6.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qg4b62kizyb16kk0cvpk70bfs3gg4q4hj2b15nnc7a3gqqfp67j"; + }; + + propagatedBuildInputs = [ + pymysql configobj sqlparse prompt_toolkit pygments click pycrypto + ]; + + postPatch = '' + substituteInPlace setup.py --replace "==" ">=" + ''; + + # No tests in archive. Newer versions do include tests + doCheck = false; + + meta = { + inherit version; + description = "Command-line interface for MySQL"; + longDescription = '' + Rich command-line interface for MySQL with auto-completion and + syntax highlighting. + ''; + homepage = http://mycli.net; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1fecd1b087..30a6625cf39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3351,6 +3351,8 @@ with pkgs; munge = callPackage ../tools/security/munge { }; + mycli = callPackage ../tools/admin/mycli { }; + mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { }; mysqltuner = callPackage ../tools/misc/mysqltuner { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c1386fea6f6..77c43d6f3d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15984,39 +15984,6 @@ in { }; }; - - mycli = buildPythonPackage rec { - name = "mycli-${version}"; - version = "1.6.0"; - disabled = isPy35; - - src = pkgs.fetchFromGitHub { - sha256 = "0vvl36gxawa0h36v119j47fdylj8k73ak6hv04s5cjqn5adcjjbh"; - rev = "v${version}"; - repo = "mycli"; - owner = "dbcli"; - }; - - propagatedBuildInputs = with self; [ - pymysql configobj sqlparse prompt_toolkit pygments click pycrypto - ]; - - postPatch = '' - substituteInPlace setup.py --replace "==" ">=" - ''; - - meta = { - inherit version; - description = "Command-line interface for MySQL"; - longDescription = '' - Rich command-line interface for MySQL with auto-completion and - syntax highlighting. - ''; - homepage = http://mycli.net; - license = licenses.bsd3; - }; - }; - pickleshare = buildPythonPackage rec { version = "0.7.4"; name = "pickleshare-${version}";